From c0cb7144c7b7f6e416c6258ecdc8440b4352a785 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Tue, 2 Aug 2022 09:40:17 +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

---
 .../Service/Reading/ReadingImageTaskService.cs             | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
index 6186b51d..586ae5ab 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
@@ -1080,12 +1080,13 @@ namespace IRaCIS.Application.Services
             x.TrialId == taskInfo.TrialId &&
             x.SubjectId == taskInfo.SubjectId && 
             x.ArmEnum== taskInfo.ArmEnum && 
-            x.Id != inDto.VisitTaskId && 
+            x.Id != inDto.VisitTaskId &&
+            x.ReadingCategory == taskInfo.ReadingCategory &&
+            x.DoctorUserId == taskInfo.DoctorUserId &&
             x.ReadingTaskState == ReadingTaskState.HaveSigned&&
             x.TaskState==TaskState.Effect&&
             x.IsAnalysisCreate == taskInfo.IsAnalysisCreate)
-                .WhereIf(taskInfo.ReadingCategory==ReadingCategory.Visit,x=>x.ReadingCategory==ReadingCategory.Visit||x.ReadingCategory==ReadingCategory.Global)
-                .WhereIf(taskInfo.ReadingCategory != ReadingCategory.Visit,x=>x.ReadingCategory==taskInfo.ReadingCategory)
+           
             .ProjectTo<GetReadingPastResultListOutDto>(_mapper.ConfigurationProvider).OrderBy(x=>x.VisitTaskNum).ToListAsync();
             return readingPastResultList;
         }