From 2d1325ca5216dcd3bccb28ea2dd755542aa3b554 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Mon, 5 Aug 2024 13:32:13 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
index 9a620aaed..d146af56b 100644
--- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
@@ -1134,6 +1134,7 @@ namespace IRaCIS.Application.Services
                 TrialId = inDto.TrialId,
                 SelectIsSign = false,
                 IsGetAllConsistencyAnalysis = false,
+                VisitTaskId=inDto.VisitTaskId,
             });
         
             return (result,true);

From 97a5eda8f8f410d7b2f06c701f6e2f0bfd433405 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Mon, 5 Aug 2024 13:51:20 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=80=E8=87=B4=E6=80=A7=E5=88=86?=
 =?UTF-8?q?=E6=9E=90=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
index d146af56b..cb6ef0f19 100644
--- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
@@ -843,6 +843,7 @@ namespace IRaCIS.Application.Services
 
             var resultQuery = _readingClinicalDataRepository.Where(x=>1==1).Select(x=> new GetReadingClinicalDataListOutDto() { });
             bool isSelfAnalysis = false;
+            var otherIsSelfAnalysisList=new  List<GetReadingClinicalDataListOutDto>();
             if (inDto.ReadingId == null)
             {
                 var visitTask = await _visitTaskRepository.FirstOrDefaultAsync(x => x.Id == inDto.VisitTaskId);
@@ -893,10 +894,10 @@ namespace IRaCIS.Application.Services
                });
 
                 // 是否获取所有一致性分析的数据
-                if(!inDto.IsGetAllConsistencyAnalysis)
+                if(inDto.IsGetAllConsistencyAnalysis)
                 {
                     // 原来的非PDF
-                    var otherQuesy = _readingClinicalDataRepository.Where(x => x.SubjectId == inDto.SubjectId)
+                    otherIsSelfAnalysisList =await _readingClinicalDataRepository.Where(x => x.SubjectId == inDto.SubjectId)
                   .WhereIf(inDto.ReadingClinicalDataId != null, x => x.Id == inDto.ReadingClinicalDataId)
                       .WhereIf(inDto.ClinicalDataTrialSetId != null, x => x.ClinicalDataTrialSetId == inDto.ClinicalDataTrialSetId)
                   .WhereIf(inDto.SelectIsSign, x => x.IsSign == true)
@@ -929,9 +930,9 @@ namespace IRaCIS.Application.Services
                           Path = y.Path,
                           CreateTime = y.CreateTime,
                       }).ToList(),
-                  });
+                  }).ToListAsync();
 
-                    resultQuery = resultQuery.Union(otherQuesy);
+                
                 }
             
             }
@@ -980,6 +981,7 @@ namespace IRaCIS.Application.Services
             if (!inDto.IsOnlyGetCRCReadModule)
             {
                 result = await resultQuery.ToListAsync();
+                result.AddRange(otherIsSelfAnalysisList);
             }
 
             var readingIds = result.Select(x => x.ReadingId).ToList();