From c55ee17729d75a93bc0987f1ec5005f9d78ff413 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Thu, 29 Sep 2022 17:13:28 +0800
Subject: [PATCH] x

---
 .../Service/Allocation/VisitTaskService.cs        | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
index 4f9545af0..d78730f43 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@@ -1452,7 +1452,12 @@ namespace IRaCIS.Core.Application.Service.Allocation
 
 
 
+                    //if(visitTaskReReadingAppply.RequestReReadingType)
+
+
                     #region PM 申请双重阅片    同一访视  其他已申请的任务也修改为同意  
+
+
                     await _visitTaskReReadingRepository.BatchUpdateNoTrackingAsync(t => t.OriginalReReadingTask.SubjectId == origenalTask.SubjectId &&
                     t.OriginalReReadingTask.ReReadingApplyState == ReReadingApplyState.TrialGroupHaveApplyed &&
                     //t.RequestReReadingResultEnum==RequestReReadingResult.Default &&
@@ -1682,6 +1687,8 @@ namespace IRaCIS.Core.Application.Service.Allocation
                     //IR申请  PM 审批  注意这里有一致性分析的申请同意  不会回退访视，在此要生成影响的访视任务
                     else if (visitTaskReReadingAppply.RequestReReadingType == RequestReReadingType.DocotorApply && _userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager)
                     {
+
+
                         //影响申请标准的任务
                         filterExpression = filterExpression.And(t => t.TrialReadingCriterionId==origenalTask.TrialReadingCriterionId);
 
@@ -1706,8 +1713,8 @@ namespace IRaCIS.Core.Application.Service.Allocation
 
                                 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)));
+                                    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);
                                     break;
 
                                 case ReadingCategory.Oncology:
@@ -2427,12 +2434,12 @@ namespace IRaCIS.Core.Application.Service.Allocation
                                 //((t.DoctorUserId == filterObj.DoctorUserId && ((t.ReadingCategory == ReadingCategory.Visit && t.ReadingTaskState == ReadingTaskState.HaveSigned) || t.ReadingCategory == ReadingCategory.Global)) || (t.ReadingCategory == ReadingCategory.Oncology) || (t.ReadingCategory == ReadingCategory.Judge)));
 
 
-                                filterExpression = filterExpression.And(t => t.VisitTaskNum >= filterObj.VisitTaskNum &&
+                                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.ReadingCategory == ReadingCategory.Oncology)
                                 || (t.ReadingCategory == ReadingCategory.Judge)
-                                ));
+                                )  ||t.Id==filterObj.Id);
 
                                 break;