From 0c92fcb011bb7cd86a069561186a6b0ec4a34973 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Sun, 7 Apr 2024 13:20:44 +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

---
 .../Reading/ClinicalData/ClinicalDataSetService.cs     |  6 +++++-
 IRaCIS.Core.Application/Service/Reading/_MapConfig.cs  | 10 +++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs
index 3305e04d3..c98dd91ba 100644
--- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs
@@ -298,7 +298,11 @@ namespace IRaCIS.Application.Services
                .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))
-               .ProjectTo<ClinicalDataTrialSetView>(_mapper.ConfigurationProvider).ToListAsync();
+               .ProjectTo<ClinicalDataTrialSetView>(_mapper.ConfigurationProvider, new
+			   {
+				   CriterionIds = inDto.CriterionIds
+
+			   }).ToListAsync();
             return trialClinicalDataList;
         }
 
diff --git a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
index 8ba19ef76..a9e207a55 100644
--- a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
@@ -17,8 +17,11 @@ namespace IRaCIS.Core.Application.Service
             //是否英文环境
             var isEn_Us=false;
 
-            #region 临床问题
-            CreateMap<TrialClinicalQuestion, TrialClinicalQuestionDto>()
+            //标准Id
+            List<Guid> CriterionIds = new List<Guid>();
+
+			#region 临床问题
+			CreateMap<TrialClinicalQuestion, TrialClinicalQuestionDto>()
                    .ForMember(d => d.GroupName, opt => opt.MapFrom(src => src.GroupQuestin.QuestionName))
                    .ForMember(d => d.GroupEnName, opt => opt.MapFrom(src => src.GroupQuestin.QuestionEnName));
 
@@ -123,7 +126,8 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<ClinicalDataSystemSet, ClinicalDataSystemSetAddOrEdit>().ReverseMap();
 
             CreateMap<ClinicalDataTrialSet, ClinicalDataTrialSetView>()
-                .ForMember(t => t.TrialCriterionNameList, u => u.MapFrom(c => c.TrialClinicalDataSetCriteriaList.Select(t => t.TrialReadingCriterion.CriterionName)))
+                .ForMember(t => t.TrialCriterionNameList, u => u.MapFrom(c => c.TrialClinicalDataSetCriteriaList.Where(x=>
+				CriterionIds.Contains(x.TrialReadingCriterionId) ).Select(t => t.TrialReadingCriterion.CriterionName)))
                     .ForMember(t => t.TrialCriterionIdList, u => u.MapFrom(c => c.TrialClinicalDataSetCriteriaList.Select(t => t.TrialReadingCriterion.Id)))
                     .ForMember(d => d.IsUsed, u => u.MapFrom(s => s.ReadingClinicalDataList.Count()>0));