From a1479420c8ecab4a862829aad18554bcac65ed4f Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Fri, 22 Nov 2024 14:53:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89doctorid=E5=8C=B9=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ReadingImageTask/ReadingImageTaskService.cs    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index ab27fc0e1..0a5e74e85 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -515,7 +515,7 @@ namespace IRaCIS.Core.Application.Service
            (x.TrialId == taskInfo.TrialId &&
            x.SubjectId == taskInfo.SubjectId &&
            x.ArmEnum == taskInfo.ArmEnum &&
-           x.DoctorUserId == taskInfo.DoctorUserId &&
+           //x.DoctorUserId == taskInfo.DoctorUserId &&
 
            x.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId &&
            x.TaskState == TaskState.Effect &&
@@ -630,7 +630,7 @@ namespace IRaCIS.Core.Application.Service
               x.VisitTaskNum < taskInfo.VisitTaskNum &&
               x.ArmEnum == taskInfo.ArmEnum &&
               x.Id != inDto.VisitTaskId &&
-              x.DoctorUserId == taskInfo.DoctorUserId &&
+              //x.DoctorUserId == taskInfo.DoctorUserId &&
               x.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId &&
               x.ReadingTaskState == ReadingTaskState.HaveSigned &&
               x.TaskState == TaskState.Effect &&
@@ -2130,7 +2130,7 @@ namespace IRaCIS.Core.Application.Service
                         .Where(x => x.IsAnalysisCreate == taskinfo.IsAnalysisCreate &&
                         x.SubjectId == taskinfo.SubjectId &&
                             x.ReadingCategory == taskinfo.ReadingCategory &&
-                            x.DoctorUserId == taskinfo.DoctorUserId &&
+                            //x.DoctorUserId == taskinfo.DoctorUserId &&
                             x.ArmEnum == taskinfo.ArmEnum &&
                             x.TrialReadingCriterionId == taskinfo.TrialReadingCriterionId &&
                             x.ReadingTaskState == ReadingTaskState.HaveSigned &&
@@ -3281,7 +3281,7 @@ namespace IRaCIS.Core.Application.Service
               x.SubjectId == taskInfo.SubjectId &&
               x.VisitTaskNum < taskInfo.VisitTaskNum &&
               x.ArmEnum == taskInfo.ArmEnum &&
-              x.DoctorUserId == taskInfo.DoctorUserId &&
+              //x.DoctorUserId == taskInfo.DoctorUserId &&
               x.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId &&
               x.ReadingTaskState == ReadingTaskState.HaveSigned &&
               x.TaskState == TaskState.Effect &&
@@ -3299,7 +3299,7 @@ namespace IRaCIS.Core.Application.Service
                     x.SubjectId == taskInfo.SubjectId &&
                     x.VisitTaskNum <= taskInfo.VisitTaskNum &&
                     x.ArmEnum == taskInfo.ArmEnum &&
-                    x.DoctorUserId == taskInfo.DoctorUserId &&
+                    //x.DoctorUserId == taskInfo.DoctorUserId &&
                     x.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId &&
                     x.ReadingTaskState == ReadingTaskState.HaveSigned &&
                     (x.TaskState == TaskState.Effect || x.TaskState == TaskState.Freeze) &&
@@ -3322,7 +3322,7 @@ namespace IRaCIS.Core.Application.Service
                     x.IsAnalysisCreate == taskInfo.IsAnalysisCreate &&
                     x.ArmEnum == taskInfo.ArmEnum &&
                     x.IsSelfAnalysis == taskInfo.IsSelfAnalysis &&
-                    x.DoctorUserId == taskInfo.DoctorUserId &&
+                    //x.DoctorUserId == taskInfo.DoctorUserId &&
                     x.TaskState == TaskState.Effect && x.VisitTaskNum <= taskInfo.VisitTaskNum).Select(x => x.Id).ToListAsync();
                         break;
                     case ReadingCategory.Oncology:
@@ -3350,7 +3350,7 @@ namespace IRaCIS.Core.Application.Service
                                 x.ArmEnum == taskInfo.ArmEnum &&
                                 x.IsSelfAnalysis == taskInfo.IsSelfAnalysis &&
                                 x.BlindSubjectCode == taskInfo.BlindSubjectCode &&
-                                x.DoctorUserId == taskInfo.DoctorUserId &&
+                                //x.DoctorUserId == taskInfo.DoctorUserId &&
                                 x.TaskState == TaskState.Effect && x.Id != taskInfo.Id).Select(x => x.Id).ToListAsync();
 
                             break;