From 7ec682668ca4d8b9cadf0d801b030addbf024dd7 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Fri, 21 Jul 2023 13:43:32 +0800
Subject: [PATCH] S-92

---
 .../IRaCIS.Core.Application.xml                 |  8 ++++++++
 .../ClinicalData/ReadingClinicalDataService.cs  | 17 +++++++++--------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 5f2106e63..e9489d018 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -10838,6 +10838,14 @@
             <param name="_subjectVisitRepository"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.PersonalWorkstation.GetImageClinicalDataToBeConfirmList(IRaCIS.Core.Application.Contracts.ImageClinicalDataToBeDoneQuery,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial})">
+            <summary>
+            临床数据  --CRC 待确认
+            </summary>
+            <param name="inQuery"></param>
+            <param name="_subjectVisitRepository"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.PersonalWorkstation.GetCRCImageQuestionToBeDoneList(IRaCIS.Core.Application.Contracts.ImageQuestionToBeDoneQuery,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial})">
             <summary>
             CRC影像质疑待处理  --CRC 待办
diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
index cee7930b8..009ce9af4 100644
--- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
@@ -735,10 +735,10 @@ namespace IRaCIS.Application.Services
                 
                 }).ToListAsync();
 
-                var setIds = moduleCriterionFromList.Select(x=>x.ClinicalDataTrialSetId).Distinct().ToList();
-                var clinicalresult = await _clinicalDataTrialSetRepository.Where(x => x.UploadRole == UploadRole.CRC && (x.ClinicalDataLevel == ClinicalLevel.OncologyRead || x.ClinicalDataLevel == ClinicalLevel.ImageRead))
-                    .Where(x => setIds.Contains(x.Id))
-                 
+
+                var clinicalresult = await _clinicalDataTrialSetRepository.Where(x => x.UploadRole == UploadRole.CRC && x.ClinicalUploadType == ClinicalUploadType.Structuring)
+                    .WhereIf(readModule.ReadingSetType == ReadingSetType.ImageReading, x => x.ClinicalDataLevel == ClinicalLevel.ImageRead)
+                       .WhereIf(readModule.ReadingSetType == ReadingSetType.TumorReading, x => x.ClinicalDataLevel == ClinicalLevel.OncologyRead)
                   .Select(x => new GetReadingClinicalDataListOutDto()
                   {
 
@@ -905,10 +905,11 @@ namespace IRaCIS.Application.Services
 
 				}).ToListAsync();
 
-				var setIds = moduleCriterionFromList.Select(x => x.ClinicalDataTrialSetId).Distinct().ToList();
-				var clinicalresult = await _clinicalDataTrialSetRepository.Where(x => x.UploadRole == UploadRole.CRC && (x.ClinicalDataLevel == ClinicalLevel.OncologyRead || x.ClinicalDataLevel == ClinicalLevel.ImageRead))
-					.Where(x => setIds.Contains(x.Id))
-				  .Select(x => new GetReadingClinicalDataListOutDto()
+			
+				var clinicalresult = await _clinicalDataTrialSetRepository.Where(x => x.UploadRole == UploadRole.CRC&&x.ClinicalUploadType== ClinicalUploadType.Structuring)
+                    .WhereIf(readModule.ReadingSetType == ReadingSetType.ImageReading,x=>x.ClinicalDataLevel== ClinicalLevel.ImageRead)
+                       .WhereIf(readModule.ReadingSetType == ReadingSetType.TumorReading, x => x.ClinicalDataLevel == ClinicalLevel.OncologyRead)
+                  .Select(x => new GetReadingClinicalDataListOutDto()
 				  {
 
 					  ClinicalDataLevel = x.ClinicalDataLevel,