From 3e462fa3b33fabddd1960add67183ea795084295 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Mon, 18 Jul 2022 16:27:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=8D=E9=98=85=E5=90=8C?=
 =?UTF-8?q?=E6=84=8F=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Allocation/VisitTaskHelpeService.cs       |  7 -------
 .../Service/Allocation/VisitTaskService.cs            | 11 +++++++++++
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
index daa51c80..d658c98b 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
@@ -344,16 +344,9 @@ namespace IRaCIS.Core.Application.Service
                                 }
 
 
-
                             }
                             #endregion
 
-
-
-
-
-
-
                         }
                         else if (trialConfig.ReadingType == ReadingMethod.Single)
                         {
diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
index 74362b7f..91960330 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@@ -1106,8 +1106,19 @@ namespace IRaCIS.Core.Application.Service
                 visitTaskReReadingAppply.RequestReReadingResultEnum = agreeReReadingCommand.RequestReReadingResultEnum;
                 visitTaskReReadingAppply.RequestReReadingRejectReason = agreeReReadingCommand.RequestReReadingRejectReason;
 
+              
+
                 if (agreeReReadingCommand.RequestReReadingResultEnum == RequestReReadingResult.Agree)
                 {
+                    //有序  如果先同意访视2  再同意访视3  把访视3改为同意
+                    if (trialConfig.IsReadingTaskViewInOrder)
+                    {
+                        await _visitTaskReReadingRepository.BatchUpdateNoTrackingAsync(t => t.OriginalReReadingTask.SubjectId == visitTaskReReadingAppply.OriginalReReadingTask.SubjectId && t.OriginalReReadingTask.VisitTaskNum > origenalTask.VisitTaskNum, u => new VisitTaskReReading()
+                        {
+                            RequestReReadingConfirmUserId = _userInfo.Id,
+                            RequestReReadingResultEnum = RequestReReadingResult.Agree,
+                        });
+                    }
 
                     //PM申请   SPM / CPM审批   回退访视，在此不生成访视任务
                     if (visitTaskReReadingAppply.RequestReReadingType == RequestReReadingType.TrialGroupApply && (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.SPM || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.CPM))