From 79da2c0adcaf6b4ba9bce754dabfae59b1162c3f Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Fri, 21 Jul 2023 13:49:22 +0800
Subject: [PATCH] S-93

---
 .../Service/Reading/ClinicalData/ReadingClinicalDataService.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
index 009ce9af4..de0d9d0b3 100644
--- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
@@ -8,6 +8,7 @@ using Panda.DynamicWebApi.Attributes;
 using Microsoft.Extensions.DependencyInjection;
 using System.Linq.Expressions;
 using IRaCIS.Core.Infrastructure;
+using System.Linq.Dynamic.Core;
 
 namespace IRaCIS.Application.Services
 {
@@ -739,6 +740,7 @@ namespace IRaCIS.Application.Services
                 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)
+                       .Where(x=>x.TrialClinicalDataSetCriteriaList.Any(y=>y.TrialReadingCriterionId==readModule.TrialReadingCriterionId))
                   .Select(x => new GetReadingClinicalDataListOutDto()
                   {
 
@@ -909,6 +911,7 @@ namespace IRaCIS.Application.Services
 				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)
+                        .Where(x => x.TrialClinicalDataSetCriteriaList.Any(y => y.TrialReadingCriterionId == readModule.TrialReadingCriterionId))
                   .Select(x => new GetReadingClinicalDataListOutDto()
 				  {