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

---
 IRaCIS.Core.API/Controllers/InspectionController.cs      | 2 ++
 IRaCIS.Core.Application/IRaCIS.Core.Application.xml      | 9 ++++++++-
 .../Service/Allocation/TaskConsistentRuleService.cs      | 2 +-
 .../Service/Allocation/VisitTaskService.cs               | 5 +----
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/IRaCIS.Core.API/Controllers/InspectionController.cs b/IRaCIS.Core.API/Controllers/InspectionController.cs
index 53b7fc450..9ef78f85c 100644
--- a/IRaCIS.Core.API/Controllers/InspectionController.cs
+++ b/IRaCIS.Core.API/Controllers/InspectionController.cs
@@ -366,5 +366,7 @@ namespace IRaCIS.Core.API.Controllers
             await _inspectionService.CompletedSign(singid, result);
             return result;
         }
+
+
     }
 }
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index be3fa7010..b876da844 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -278,6 +278,12 @@
             <param name="applyReReadingCommand"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.ReReadingTaskTrackingDeal(IRaCIS.Core.Domain.Models.VisitTask,IRaCIS.Core.Application.ViewModel.ConfirmReReadingCommand)">
+            <summary>
+            重阅原任务跟踪处理  
+            </summary>
+            <param name="origenalTask"></param>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.ConfirmReReading(IRaCIS.Core.Application.ViewModel.ConfirmReReadingCommand,IRaCIS.Core.Application.Service.IVisitTaskHelpeService)">
             <summary>
             确认重阅与否  1同意 2 拒绝
@@ -296,7 +302,8 @@
             影响提示列表  重阅仅仅针对已完成的任务申请   退回针对的是未完成的(退回仅仅针对是访视类型的)
             </summary>
             <param name="taskId"></param>
-            <param name="isReReading"></param>
+            <param name="isReReading">  重阅还是直接回退</param>
+            <param name="applyId"> 申请记录的Id</param>
             <returns></returns>
         </member>
         <member name="T:IRaCIS.Core.Application.Service.CommonDocumentService">
diff --git a/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs b/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs
index 43df9f4cf..6f64737c6 100644
--- a/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs
@@ -130,7 +130,7 @@ namespace IRaCIS.Core.Application.Service
 
                         int.TryParse(maxCodeStr, out maxCodeInt);
 
-                        blindSubjectCode = (maxCodeInt + 1).ToString($"D{filterObj.BlindSubjectNumberOfPlaces}");
+                        blindSubjectCode = filterObj.BlindTrialSiteCode + (maxCodeInt + 1).ToString($"D{filterObj.BlindSubjectNumberOfPlaces}");
                     }
 
                     subject.VisitTaskList = subject.VisitTaskList.Take(filterObj.PlanVisitCount).ToList();
diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
index 7dc5b7a22..7272bbf03 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@@ -1215,10 +1215,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
                         //有序阅片
                         if (trialConfig.IsReadingTaskViewInOrder)
                         {
-                            Expression<Func<VisitTask, bool>> filterExpression = t => t.TrialId == trialId && t.SubjectId == origenalTask.SubjectId && t.TaskState == TaskState.Effect;
-
-                            //是否是一致性分析任务
-                            filterExpression = filterExpression.And(t => t.IsAnalysisCreate == origenalTask.IsAnalysisCreate);
+   
 
                             //访视影响当前以及当前之后的  两个阅片人的
                             filterExpression = filterExpression.And(t => t.VisitTaskNum > origenalTask.VisitTaskNum && t.DoctorUserId == origenalTask.DoctorUserId || t.VisitTaskNum >= origenalTask.VisitTaskNum && t.DoctorUserId != origenalTask.DoctorUserId);