修改一致性核查通过任务生成分配逻辑

IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs

@@ -216,7 +216,7 @@ namespace IRaCIS.Core.Application.ViewModel
         public ReadingTaskState? ReadingTaskState { get; set; }
         public TaskAllocationState? TaskAllocationState { get; set; }
 
-
+        public TaskState? TaskState { get; set; }
         public DateTime? BeginAllocateDate { get; set; }
 
         public DateTime? EndAllocateDate { get; set; }

IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs

@@ -79,7 +79,7 @@ namespace IRaCIS.Core.Application.Service
             var trialId = generateTaskCommand.TrialId;
             var isAssignSubjectToDoctor = generateTaskCommand.IsAssignSubjectToDoctor;
 
-            var trialConfig = (await _trialRepository.Where(t => t.Id == trialId).Select(t => new { TrialId = t.Id, t.ReadingType, t.IsFollowVisitAutoAssign, t.IsFollowGlobalVisitAutoAssign, t.FollowGlobalVisitAutoAssignDefaultState, t.FollowVisitAutoAssignDefaultState, t.TaskAllocateObjEnum }).FirstOrDefaultAsync()).IfNullThrowException();
+            var trialConfig = (await _trialRepository.Where(t => t.Id == trialId).Select(t => new { TrialId = t.Id, t.ReadingType, t.IsFollowVisitAutoAssign, t.IsFollowGlobalVisitAutoAssign, t.FollowGlobalVisitAutoAssignDefaultState, t.FollowVisitAutoAssignDefaultState, t.TaskAllocateObjEnum,t.IsReadingTaskViewInOrder }).FirstOrDefaultAsync()).IfNullThrowException();
 
             var dbMaxCode = _visitTaskRepository.Where(t => t.TrialId == trialId).Select(t => t.Code).DefaultIfEmpty().Max();
 
@@ -157,16 +157,7 @@ namespace IRaCIS.Core.Application.Service
                                             throw new BusinessValidationFailedException("能参与读片的医生数量必须大于2,自动分配任务中止");
                                         }
 
-                                        //if (allocateSubjectArmList.GroupBy(t => t.DoctorUserId).Any(g => g.Count() == 2))
-                                        //{
-                                        //    throw new BusinessValidationFailedException("请确认是否改了配置，导致同一受试者 分配给同一个医生 在不同的Arm,无法完成自动分配");
-                                        //}
 
-                                        ////手动分配的时候  如果只分配了Arm1  没有分配Arm2 就会有问题
-                                        //if (!(allocateSubjectArmList.Any(t => t.ArmEnum == Arm.DoubleReadingArm1) && allocateSubjectArmList.Any(t => t.ArmEnum == Arm.DoubleReadingArm2)))
-                                        //{
-                                        //    throw new BusinessValidationFailedException("请确认是否改了配置，或者手动分配时，只分配了一个Arm ");
-                                        //}
 
                                         if (!(assignConfigList.Any(t => t.ArmEnum == Arm.DoubleReadingArm1) && allocateSubjectArmList.Any(t => t.ArmEnum == Arm.DoubleReadingArm2)))
                                         {
@@ -179,8 +170,22 @@ namespace IRaCIS.Core.Application.Service
                                         //并且配置了医生 
                                         if (assignConfigList.Count > 0 && trialConfig.IsFollowVisitAutoAssign)
                                         {
-                                            var defaultState = trialConfig.FollowVisitAutoAssignDefaultState == TaskAllocateDefaultState.InitAllocated ? TaskAllocationState.InitAllocated : TaskAllocationState.Allocated;
                                             
+                                            #region 后续访视 未分配的进行再次分配，重置的或者失效的 需要重新生成新的任务  (PM 有序退回  或者PM  有序 申请重阅)
+
+
+                                            if (trialConfig.IsReadingTaskViewInOrder)
+                                            {
+                                                //之前有回退的访视 那么当前访视一致性核查通过的时候，对后续访视不生成或者分配   当前访视生成但是不分配出去
+
+                                                var beforeBackVisitTask = await _visitTaskRepository.Where(t => t.TrialId == trialId && t.SubjectId == subjectVisit.SubjectId && t.VisitTaskNum < subjectVisit.VisitNum && t.ReadingCategory == ReadingCategory.Visit && t.SourceSubjectVisit.CheckState != CheckStateEnum.CVPassed).OrderBy(t => t.VisitTaskNum).FirstOrDefaultAsync();
+
+
+                                                if (beforeBackVisitTask == null)
+                                                {
+                                                    #region 访视2 PM 回退  基线回退  访视2先一致性核查通过，生成访视2任务，但是不分配
+
+                                                    var defaultState = trialConfig.FollowVisitAutoAssignDefaultState == TaskAllocateDefaultState.InitAllocated ? TaskAllocationState.InitAllocated : TaskAllocationState.Allocated;
 
                                                     task1.TaskAllocationState = defaultState;
                                                     task2.TaskAllocationState = defaultState;
@@ -192,9 +197,11 @@ namespace IRaCIS.Core.Application.Service
                                                     task1.AllocateTime = DateTime.Now;
                                                     task2.AllocateTime = DateTime.Now;
 
+                                                    #endregion
+
+
 
 
-                                            #region 后续访视 未分配的进行再次分配，重置的或者失效的 需要重新生成新的任务  (PM 有序退回  或者PM  有序 申请重阅)
 
                                                     var followBackVisitTask = await _visitTaskRepository.Where(t => t.TrialId == trialId && t.SubjectId == subjectVisit.SubjectId && t.VisitTaskNum > subjectVisit.VisitNum && t.ReadingCategory == ReadingCategory.Visit && t.SourceSubjectVisit.CheckState != CheckStateEnum.CVPassed).OrderBy(t => t.VisitTaskNum).FirstOrDefaultAsync();
 
@@ -295,6 +302,33 @@ namespace IRaCIS.Core.Application.Service
                                                         }
                                                     }
 
+                                                }
+                                                //之前有回退的    后续访视不生成或者分配   当前访视生成但是不分配出去
+                                                else
+                                                {
+                                                    //不用进行额外处理
+                                                }
+
+
+
+                                            }
+                                            //无序的时候    生成任务并分配出去
+                                            else
+                                            {
+                                                var defaultState = trialConfig.FollowVisitAutoAssignDefaultState == TaskAllocateDefaultState.InitAllocated ? TaskAllocationState.InitAllocated : TaskAllocationState.Allocated;
+
+                                                task1.TaskAllocationState = defaultState;
+                                                task2.TaskAllocationState = defaultState;
+
+                                                //分配给对应Arm的人
+                                                task1.DoctorUserId = assignConfigList.FirstOrDefault(t => t.ArmEnum == Arm.DoubleReadingArm1).DoctorUserId;
+                                                task2.DoctorUserId = assignConfigList.FirstOrDefault(t => t.ArmEnum == Arm.DoubleReadingArm2).DoctorUserId;
+
+                                                task1.AllocateTime = DateTime.Now;
+                                                task2.AllocateTime = DateTime.Now;
+                                            }
+
+
                                             #endregion
 
                                         }

IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs

@@ -111,6 +111,7 @@ namespace IRaCIS.Core.Application.Service
                 .WhereIf(queryVisitTask.ReadingCategory != null, t => t.ReadingCategory == queryVisitTask.ReadingCategory)
                 .WhereIf(queryVisitTask.ReadingCategory == null, t => t.ReadingCategory != ReadingCategory.Judge)
 
+                .WhereIf(queryVisitTask.TaskState != null, t => t.TaskState == queryVisitTask.TaskState)
                 .WhereIf(queryVisitTask.SiteId != null, t => t.Subject.SiteId == queryVisitTask.SiteId)
                 .WhereIf(queryVisitTask.SubjectId != null, t => t.SubjectId == queryVisitTask.SubjectId)
                 .WhereIf(queryVisitTask.IsUrgent != null, t => t.IsUrgent == queryVisitTask.IsUrgent)
@@ -145,6 +146,7 @@ namespace IRaCIS.Core.Application.Service
             var visitTaskQueryable = _visitTaskRepository.Where(t => t.TrialId == queryVisitTask.TrialId && t.IsAnalysisCreate == false)
                 .Where(t => t.ReadingCategory == ReadingCategory.Judge)
 
+                .WhereIf(queryVisitTask.TaskState != null, t => t.TaskState == queryVisitTask.TaskState)
                 .WhereIf(queryVisitTask.ReadingCategory != null, t => t.ReadingCategory == queryVisitTask.ReadingCategory)
                 .WhereIf(queryVisitTask.SiteId != null, t => t.Subject.SiteId == queryVisitTask.SiteId)
                 .WhereIf(queryVisitTask.SubjectId != null, t => t.SubjectId == queryVisitTask.SubjectId)
@@ -181,6 +183,7 @@ namespace IRaCIS.Core.Application.Service
             var visitTaskQueryable = _visitTaskRepository.Where(t => t.TrialId == queryVisitTask.TrialId && t.IsAnalysisCreate == false)
                 .Where(t => t.IsAnalysisCreate == false && t.DoctorUserId != null)
 
+                .WhereIf(queryVisitTask.TaskState != null, t => t.TaskState == queryVisitTask.TaskState)
                .WhereIf(queryVisitTask.SiteId != null, t => t.Subject.SiteId == queryVisitTask.SiteId)
                .WhereIf(queryVisitTask.SubjectId != null, t => t.SubjectId == queryVisitTask.SubjectId)
                .WhereIf(queryVisitTask.IsUrgent != null, t => t.IsUrgent == queryVisitTask.IsUrgent)
@@ -221,6 +224,7 @@ namespace IRaCIS.Core.Application.Service
                 .WhereIf(queryVisitTask.RootReReadingTaskId != null, t => t.RootReReadingTaskId == queryVisitTask.RootReReadingTaskId || t.OriginalReReadingTaskId == queryVisitTask.RootReReadingTaskId)
                 .WhereIf(!string.IsNullOrEmpty(queryVisitTask.TaskCode), t => t.OriginalReReadingTask.TaskCode.Contains(queryVisitTask.TaskCode) || t.RootReReadingTask.TaskCode.Contains(queryVisitTask.TaskCode))
                 .WhereIf(queryVisitTask.SiteId != null, t => t.OriginalReReadingTask.Subject.SiteId == queryVisitTask.SiteId)
+                .WhereIf(queryVisitTask.TaskState != null, t => t.OriginalReReadingTask.TaskState == queryVisitTask.TaskState)
                 .WhereIf(queryVisitTask.SubjectId != null, t => t.OriginalReReadingTask.SubjectId == queryVisitTask.SubjectId)
                 .WhereIf(queryVisitTask.IsUrgent != null, t => t.OriginalReReadingTask.IsUrgent == queryVisitTask.IsUrgent)
                 .WhereIf(queryVisitTask.DoctorUserId != null, t => t.OriginalReReadingTask.DoctorUserId == queryVisitTask.DoctorUserId)
@@ -254,6 +258,7 @@ namespace IRaCIS.Core.Application.Service
                 .Where(t => t.OriginalReReadingTask.TrialId == queryVisitTask.TrialId)
                 .WhereIf(queryVisitTask.RootReReadingTaskId != null, t => t.RootReReadingTaskId == queryVisitTask.RootReReadingTaskId || t.OriginalReReadingTaskId == queryVisitTask.RootReReadingTaskId)
                 .WhereIf(!string.IsNullOrEmpty(queryVisitTask.TaskCode), t => t.OriginalReReadingTask.TaskCode.Contains(queryVisitTask.TaskCode) || t.RootReReadingTask.TaskCode.Contains(queryVisitTask.TaskCode))
+                .WhereIf(queryVisitTask.TaskState != null, t => t.OriginalReReadingTask.TaskState == queryVisitTask.TaskState)
                 .WhereIf(queryVisitTask.SiteId != null, t => t.OriginalReReadingTask.Subject.SiteId == queryVisitTask.SiteId)
                 .WhereIf(queryVisitTask.SubjectId != null, t => t.OriginalReReadingTask.SubjectId == queryVisitTask.SubjectId)
                 .WhereIf(queryVisitTask.IsUrgent != null, t => t.OriginalReReadingTask.IsUrgent == queryVisitTask.IsUrgent)
@@ -284,6 +289,7 @@ namespace IRaCIS.Core.Application.Service
               .Where(t => t.OriginalReReadingTask.TrialId == queryVisitTask.TrialId)
               .WhereIf(queryVisitTask.RootReReadingTaskId != null, t => t.RootReReadingTaskId == queryVisitTask.RootReReadingTaskId || t.OriginalReReadingTaskId == queryVisitTask.RootReReadingTaskId)
               .WhereIf(!string.IsNullOrEmpty(queryVisitTask.TaskCode), t => t.OriginalReReadingTask.TaskCode.Contains(queryVisitTask.TaskCode) || t.RootReReadingTask.TaskCode.Contains(queryVisitTask.TaskCode))
+              .WhereIf(queryVisitTask.TaskState != null, t => t.OriginalReReadingTask.TaskState == queryVisitTask.TaskState)
               .WhereIf(queryVisitTask.SiteId != null, t => t.OriginalReReadingTask.Subject.SiteId == queryVisitTask.SiteId)
               .WhereIf(queryVisitTask.SubjectId != null, t => t.OriginalReReadingTask.SubjectId == queryVisitTask.SubjectId)
               .WhereIf(queryVisitTask.IsUrgent != null, t => t.OriginalReReadingTask.IsUrgent == queryVisitTask.IsUrgent)
@@ -1425,9 +1431,9 @@ namespace IRaCIS.Core.Application.Service
 
             var task = (await _visitTaskRepository.Where(t => t.Id == taskId).FirstOrDefaultAsync()).IfNullThrowException();
 
-            if (task.TaskState != TaskState.Effect || task.ReadingCategory != ReadingCategory.Visit || task.ReadingTaskState == ReadingTaskState.HaveSigned)
+            if (task.TaskState != TaskState.Effect || task.ReadingCategory != ReadingCategory.Visit || task.ReadingTaskState == ReadingTaskState.HaveSigned || task.TaskAllocationState==TaskAllocationState.NotAllocate)
             {
-                return ResponseOutput.NotOk("仅仅允许针对生效的未完成的访视任务进行退回操作，请刷新页面数据");
+                return ResponseOutput.NotOk("仅仅允许针对已分配、生效、未完成的访视任务进行退回操作，请刷新页面数据");
             }