From 8964b65d87a3f00d13a1011f8b2e7f9cb06c1e4d Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Mon, 6 Feb 2023 14:51:52 +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       | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
index cff273466..5a8db49dd 100644
--- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
@@ -462,7 +462,7 @@ namespace IRaCIS.Application.Services
             keyValuePairs.Add(ModuleTypeEnum.Oncology, ClinicalLevel.OncologyRead);
 
 
-            var criterion = _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.TrialReadingCriterionId).FirstOrDefault();
+          
 
 
             var usedIdsQuery = _readingClinicalDataRepository.Where(x => x.ReadingId == inDto.ReadingId && x.Id != inDto.ReadingClinicalDataId).Select(x => x.ClinicalDataTrialSetId);
@@ -477,6 +477,7 @@ namespace IRaCIS.Application.Services
                 .WhereIf(inDto.IsVisit && !inDto.IsBaseLine, x => x.ClinicalDataLevel == ClinicalLevel.SubjectVisit)
                 .WhereIf(!inDto.IsVisit, x => x.ClinicalDataLevel == ClinicalLevel.ImageRead || x.ClinicalDataLevel == ClinicalLevel.OncologyRead)
                 .WhereIf(readModule != null, x => x.ClinicalDataLevel == keyValuePairs[readModule.ModuleType])
+                .WhereIf(inDto.TrialReadingCriterionId!=null,x=>x.TrialClinicalDataSetCriteriaList.Any(y=>y.TrialReadingCriterionId== inDto.TrialReadingCriterionId))
                 //.WhereIf(criterion!=null,x=>x.CriterionEnumListStr.Contains($"|{(int)criterion.CriterionType}|"))
                 .Select(x => new GetTrialClinicalDataSelectOutDto()
                 {
@@ -488,7 +489,7 @@ namespace IRaCIS.Application.Services
                     Id = x.Id,
                     CriterionEnumList = x.CriterionEnumList,
                 }).ToListAsync();
-            clinicalList = clinicalList.WhereIf(criterion != null, x => x.CriterionEnumList.Contains((int)criterion.CriterionType)).ToList();
+         
             return clinicalList;
         }