From 2c541e68e1742ef6a2ff758709c888cbdc50323b Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Wed, 12 Jul 2023 18:11:18 +0800
Subject: [PATCH] S-55

---
 .../Reading/ClinicalData/ReadingClinicalDataService.cs        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
index 86afe83b0..b378c0d9d 100644
--- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
@@ -701,7 +701,7 @@ namespace IRaCIS.Application.Services
             var clinical = await _clinicalFormRepository.Where(x => readingIds.Contains(x.ReadingId??default(Guid))).ToListAsync();
             result.Where(x => x.ClinicalUploadType == ClinicalUploadType.Structuring).ForEach(x => {
 
-                x.ClinicalFromList = clinical.Where(y => y.ReadingId == x.ReadingId).Select(y => new ClinicalFromData()
+                x.ClinicalFromList = clinical.Where(y => y.ReadingId == x.ReadingId&&y.ClinicalDataTrialSetId==x.ClinicalDataTrialSetId).Select(y => new ClinicalFromData()
                 {
                     CheckDate = y.CheckDate,
                     ClinicalFormId = y.Id
@@ -874,7 +874,7 @@ namespace IRaCIS.Application.Services
             var clinical = await _clinicalFormRepository.Where(x => readingIds.Contains(x.ReadingId ?? default(Guid))).ToListAsync();
             result.Where(x => x.ClinicalUploadType == ClinicalUploadType.Structuring).ForEach(x => {
 
-                x.ClinicalFromList = clinical.Where(y => y.ReadingId == x.ReadingId).Select(y => new ClinicalFromData()
+                x.ClinicalFromList = clinical.Where(y => y.ReadingId == x.ReadingId && y.ClinicalDataTrialSetId == x.ClinicalDataTrialSetId).Select(y => new ClinicalFromData()
                 {
                     CheckDate = y.CheckDate,
                     ClinicalFormId = y.Id