From 21d14636b6d715044c55a64f043afdc97bc85d0f Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Fri, 25 Nov 2022 17:17:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Reading/ClinicalData/ReadingClinicalDataService.cs   | 9 +++++++++
 .../Service/Reading/Dto/ReadingClinicalDataDto.cs        | 5 +++++
 2 files changed, 14 insertions(+)

diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
index a94ade196..8ae885964 100644
--- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
@@ -441,6 +441,7 @@ namespace IRaCIS.Application.Services
                      ClinicalDataTrialSetId = x.ClinicalDataTrialSetId,
                      IsSign = x.IsSign,
                      ClinicalUploadType = x.ClinicalDataTrialSet.ClinicalUploadType,
+                     CriterionEnumList= x.ClinicalDataTrialSet.CriterionEnumList,
                      Id = x.Id,
                      UploadRole = x.ClinicalDataTrialSet.UploadRole,
                      IsCRCUpload = x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC,
@@ -455,6 +456,14 @@ namespace IRaCIS.Application.Services
 
 
             var result = await resultQuery.ToListAsync();
+            // 根据标准
+            if (inDto.VisitTaskId != null)
+            {
+                var criterionType = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).Include(x=>x.TrialReadingCriterion).Select(x => x.TrialReadingCriterion.CriterionType).FirstNotNullAsync();
+                result = result.Where(x => x.CriterionEnumList.Contains((int)criterionType)).ToList();
+            }
+
+          
             result = result.Where(x => !(x.ClinicalUploadType == ClinicalUploadType.PDF && x.FileList.Count() == 0)).ToList();
             // 需要排除表格为空的数据
 
diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs
index 0ceff40cd..b218ed509 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs
@@ -317,6 +317,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public ClinicalUploadType ClinicalUploadType { get; set; }
 
+		/// <summary>
+		/// 标准枚举
+		/// </summary>
+		public List<int> CriterionEnumList { get; set; }
+
 		/// <summary>
 		/// 临床级别名称
 		/// </summary>