From ef642356da2113339dcc27315470057ccce35006 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Mon, 16 Jan 2023 16:02:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Reading/Dto/ReadingImageTaskViewModel.cs      |  2 ++
 .../ReadingImageTask/ReadingGlobalTaskService.cs  | 15 +++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
index 0d36e7cd9..f7ed34f7b 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
@@ -996,6 +996,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public Guid? OtherGlobalTaskId { get; set; }
 
+        public Guid? JudgeTaskId { get; set; }
+
         public ReadingTaskState ReadingTaskState { get; set; }
 
         public string GlobalUpdateType { get; set; }
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs
index 95072a758..146fb1168 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs
@@ -140,6 +140,21 @@ namespace IRaCIS.Application.Services
             result.OtherGlobalTaskId = await _visitTaskRepository.Where(x => x.SouceReadModuleId == taskInfo.SouceReadModuleId && x.IsAnalysisCreate == taskInfo.IsAnalysisCreate
               && x.IsSelfAnalysis == taskInfo.IsSelfAnalysis && x.TaskState == TaskState.Effect && x.DoctorUserId != taskInfo.DoctorUserId
             ).Select(x => x.Id).FirstOrDefaultAsync();
+
+            result.JudgeTaskId = await _visitTaskRepository.Where(x =>
+                           x.SubjectId == taskInfo.SubjectId
+                         && x.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId
+                         && x.TaskState == TaskState.Effect
+                         && x.ArmEnum == taskInfo.ArmEnum
+                         && x.ReadingCategory == ReadingCategory.Judge
+                        && x.IsAnalysisCreate == taskInfo.IsAnalysisCreate
+                        && x.IsSelfAnalysis == taskInfo.IsSelfAnalysis
+                        && x.DoctorUserId == taskInfo.DoctorUserId
+                        && x.ReadingTaskState == ReadingTaskState.HaveSigned
+                        && x.VisitTaskNum == taskInfo.VisitTaskNum + ReadingCommon.TaskNumDic[ReadingCategory.Judge]
+                        && x.ReReadingApplyState != ReReadingApplyState.Agree)
+                .Select(x => x.Id).FirstOrDefaultAsync();
+
             // 一致性分析按照doctorId 其他按照分组
 
             result.TaskList = await _visitTaskRepository.Where(x => x.ReadingCategory == ReadingCategory.Visit &&