From ff7bd240f3d2997eb80d270f8118284e4f3f1726 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Thu, 28 Jul 2022 15:48:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BD=B1=E5=93=8D=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IRaCIS.Core.Application.xml               |  7 -----
 .../Service/Allocation/VisitTaskService.cs    | 27 +++++++++----------
 2 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 39b0d18f5..8bcdb114c 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -5918,13 +5918,6 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.GlobalTriggerJudgeQuestion(System.Guid)">
-            <summary>
-            全局阅片裁判触发
-            </summary>
-            <param name="visitTaskId"></param>
-            <returns></returns>
-        </member>
         <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.TriggerJudgeQuestion(System.Guid)">
             <summary>
             触发裁判任务(新)
diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
index a7dacf9f7..23f06f3f9 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@@ -1572,20 +1572,19 @@ namespace IRaCIS.Core.Application.Service.Allocation
                             {
                                 case ReadingCategory.Visit:
                                     //影响后续访视已经读完的，未读的不做处理  以及其他类型任务
-
                                     filterExpression = filterExpression.And(t => t.VisitTaskNum >= origenalTask.VisitTaskNum &&
-                              ((t.DoctorUserId == origenalTask.DoctorUserId && ((t.ReadingCategory == ReadingCategory.Visit && t.ReadingTaskState == ReadingTaskState.HaveSigned) || t.ReadingCategory == ReadingCategory.Global || t.ReadingCategory == ReadingCategory.Oncology))
-                               ||
-                                 (t.ReadingCategory == ReadingCategory.Judge))
-                               )
-                                   ;
+                                                                  ((t.DoctorUserId == origenalTask.DoctorUserId && ((t.ReadingCategory == ReadingCategory.Visit && t.ReadingTaskState == ReadingTaskState.HaveSigned) || t.ReadingCategory == ReadingCategory.Global))
+                                                                   ||
+                                                                     t.ReadingCategory == ReadingCategory.Judge || t.ReadingCategory == ReadingCategory.Oncology)
+                                                                   )
+                                                                       ;
                                     break;
 
                                 case ReadingCategory.Global:
 
                                     //全局不影响后续访视任务
                                     filterExpression = filterExpression.And(t => t.VisitTaskNum >= origenalTask.VisitTaskNum &&
-                                  (t.DoctorUserId == origenalTask.DoctorUserId && (t.ReadingCategory == ReadingCategory.Global || t.ReadingCategory == ReadingCategory.Oncology) || (t.ReadingCategory == ReadingCategory.Judge)));
+                                ((t.DoctorUserId == origenalTask.DoctorUserId && t.ReadingCategory == ReadingCategory.Global) || (t.ReadingCategory == ReadingCategory.Oncology) || (t.ReadingCategory == ReadingCategory.Judge)));
                                     break;
 
                                 case ReadingCategory.Oncology:
@@ -1596,8 +1595,8 @@ namespace IRaCIS.Core.Application.Service.Allocation
 
                                 case ReadingCategory.Judge:
 
-                                    //裁判的影响自己  和后续肿瘤学阅片
-                                    filterExpression = filterExpression.And(t => (t.Id == origenalTask.Id) || t.VisitTaskNum > origenalTask.VisitTaskNum && t.DoctorUserId == origenalTask.DoctorUserId && t.ReadingCategory == ReadingCategory.Oncology);
+                                    //裁判的影响自己  和后续肿瘤学阅片（不是自己做的）
+                                    filterExpression = filterExpression.And(t => t.Id == filterObj.Id || t.VisitTaskNum > filterObj.VisitTaskNum && t.ReadingCategory == ReadingCategory.Oncology);
 
                                     break;
 
@@ -2274,9 +2273,9 @@ namespace IRaCIS.Core.Application.Service.Allocation
                                 //2、后续任务如果是全局、肿瘤学阅片任务，状态为阅片完成标记为重阅重置；若在阅片中，则标记为失效；若为待阅片，则标记为失效；
                                 //3、当前任务、后续访视任务或者全局任务触发了裁判任务，若裁判任务状态为阅片完成，则标记为重阅重置；若在阅片中或待阅片，则标记为失效
                                 filterExpression = filterExpression.And(t => t.VisitTaskNum >= filterObj.VisitTaskNum &&
-                               ((t.DoctorUserId == filterObj.DoctorUserId && ((t.ReadingCategory == ReadingCategory.Visit && t.ReadingTaskState == ReadingTaskState.HaveSigned) || t.ReadingCategory == ReadingCategory.Global || t.ReadingCategory == ReadingCategory.Oncology))
+                               ((t.DoctorUserId == filterObj.DoctorUserId && ((t.ReadingCategory == ReadingCategory.Visit && t.ReadingTaskState == ReadingTaskState.HaveSigned) || t.ReadingCategory == ReadingCategory.Global ))
                                 ||
-                                  (t.ReadingCategory == ReadingCategory.Judge))
+                                  t.ReadingCategory == ReadingCategory.Judge ||t.ReadingCategory==ReadingCategory.Oncology)
                                 )
                                     ;
                                 break;
@@ -2290,7 +2289,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
 
                                 //全局不影响后续访视任务
                                 filterExpression = filterExpression.And(t => t.VisitTaskNum >= filterObj.VisitTaskNum &&
-                                (t.DoctorUserId == filterObj.DoctorUserId && (t.ReadingCategory == ReadingCategory.Global || t.ReadingCategory == ReadingCategory.Oncology) || (t.ReadingCategory == ReadingCategory.Judge)));
+                                ((t.DoctorUserId == filterObj.DoctorUserId && t.ReadingCategory == ReadingCategory.Global) || (t.ReadingCategory == ReadingCategory.Oncology) || (t.ReadingCategory == ReadingCategory.Judge)));
                                 break;
 
                             //1、后续任务如果是访视任务、全局任务或裁判任务，均不处理； 
@@ -2306,8 +2305,8 @@ namespace IRaCIS.Core.Application.Service.Allocation
                                 // 1、后续任务如果是访视任务、全局任务，均不处理；  
                                 //2、后续若有肿瘤学阅片，若肿瘤学阅片任务状态为阅片完成，则标记为重阅重置；若为阅片中则标记为失效，如为待阅片，则取消分配
 
-                                //裁判的影响自己  和后续肿瘤学阅片
-                                filterExpression = filterExpression.And(t => t.Id == filterObj.Id || t.VisitTaskNum > filterObj.VisitTaskNum && t.DoctorUserId == filterObj.DoctorUserId && t.ReadingCategory == ReadingCategory.Oncology);
+                                //裁判的影响自己  和后续肿瘤学阅片（不是自己做的）
+                                filterExpression = filterExpression.And(t => t.Id == filterObj.Id || t.VisitTaskNum > filterObj.VisitTaskNum && t.ReadingCategory == ReadingCategory.Oncology);
 
                                 break;