From 4f19d1638d97850a4b74ebb428e742561fcf690d Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Mon, 25 Mar 2024 14:57:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Reading/ClinicalData/ClinicalDataSetService.cs   | 2 ++
 .../Service/Reading/Dto/ClinicalDataServiceViewModel.cs      | 2 ++
 .../Service/Reading/Dto/ReadingQuestionViewModel.cs          | 5 ++++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs
index e05935740..799f3126f 100644
--- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs
@@ -272,8 +272,10 @@ namespace IRaCIS.Application.Services
         {
             await this.AddTrialClinicalDataTrialSet(inDto.TrialId);
 
+            
             var trialClinicalDataList = await _clinicalDataTrialSetRepository.AsQueryable()
                .Where(x => x.TrialId == inDto.TrialId)
+               .WhereIf(inDto.CriterionTypes!=null,x=>x.IsConfirm||x.SystemClinicalDataSetId==null||inDto.CriterionTypes.Intersect(x.CriterionEnumList).Count()>0)
                .WhereIf(inDto.ClinicalDataLevel != null, x => x.ClinicalDataLevel == inDto.ClinicalDataLevel)
                .WhereIf(inDto.ClinicalUploadType != null, x => x.ClinicalUploadType == inDto.ClinicalUploadType)
                .WhereIf(inDto.ClinicalDataSetName != String.Empty, x => x.ClinicalDataSetName.Contains(inDto.ClinicalDataSetName))
diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs
index fd279e1a1..4be0b57d8 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs
@@ -311,6 +311,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// 上传方式
         /// </summary>
         public ClinicalUploadType? ClinicalUploadType { get; set; }
+
+        public List<int>? CriterionTypes { get; set; }
     }
 
 
diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
index eca632b44..6914f6893 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
@@ -2201,7 +2201,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		public int ShowOrder { get; set; }
 
 
-
+		/// <summary>
+		/// 标准类型
+		/// </summary>
+		public CriterionType CriterionType { get; set; }
 
 
 		/// <summary>