From 9a1ac447f8afbffbc533741e38f2561ac4f7cc15 Mon Sep 17 00:00:00 2001
From: "{872297557@qq.com}" <872297557@qq.com>
Date: Wed, 21 Dec 2022 13:02:52 +0800
Subject: [PATCH] =?UTF-8?q?IR=20=E7=94=B3=E8=AF=B7Global=20=E5=BD=B1?=
 =?UTF-8?q?=E5=83=8F=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Allocation/VisitTaskService.cs                 | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
index 0f087a579..b52091828 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@@ -1552,10 +1552,13 @@ namespace IRaCIS.Core.Application.Service.Allocation
                       );
                                     break;
 
+
+                                //不影响后续访视： (t.ReadingCategory == ReadingCategory.Visit && t.ReadingTaskState != ReadingTaskState.WaitReading) ||
                                 case ReadingCategory.Global:
 
                                     filterExpression = filterExpression.And(t => t.VisitTaskNum > origenalTask.VisitTaskNum &&
-                 ((t.DoctorUserId == origenalTask.DoctorUserId && ((t.ReadingCategory == ReadingCategory.Visit && t.ReadingTaskState != ReadingTaskState.WaitReading) || t.ReadingCategory == ReadingCategory.Global)) || (t.ReadingCategory == ReadingCategory.Oncology) || (t.ReadingCategory == ReadingCategory.Judge)) || t.Id == origenalTask.Id);
+                 ((t.DoctorUserId == origenalTask.DoctorUserId && t.ReadingCategory == ReadingCategory.Global) 
+                 || (t.ReadingCategory == ReadingCategory.Oncology) || (t.ReadingCategory == ReadingCategory.Judge)) || t.Id == origenalTask.Id);
                                     break;
 
                                 case ReadingCategory.Oncology:
@@ -2263,7 +2266,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
 
                                 filterExpression = filterExpression.And(t => t.VisitTaskNum > filterObj.VisitTaskNum &&
                                 (
-                                (t.DoctorUserId == filterObj.DoctorUserId && ((t.ReadingCategory == ReadingCategory.Visit && t.ReadingTaskState != ReadingTaskState.WaitReading) || t.ReadingCategory == ReadingCategory.Global))
+                                (t.DoctorUserId == filterObj.DoctorUserId && t.ReadingCategory == ReadingCategory.Global)
                                 || (t.ReadingCategory == ReadingCategory.Oncology)
                                 || (t.ReadingCategory == ReadingCategory.Judge)
                                 ) || t.Id == filterObj.Id);