修改

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

@@ -201,8 +201,23 @@ namespace IRaCIS.Core.Application.ViewModel
 
 
         public UserSimpleInfo DoctorUser { get; set; }
+
+        public ReReadingOrBackOptType OPtType { get; set; }
     }
 
+    public enum ReReadingOrBackOptType
+    {
+        //取消分配
+        CancelAssign=0,
+
+       //失效
+       Abandon=1,
+
+       //重阅重置
+
+       Return=2,
+
+    }
     public class VisitTaskSimpleView
     {
         public Guid Id { get; set; }

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

@@ -451,6 +451,8 @@ namespace IRaCIS.Core.Application.Service
                     SubjectId = c.SubjectId,
                     VisitTaskNum = c.VisitTaskNum,
                     TrialId = c.TrialId,
+                    SourceSubjectVisitId=c.SourceSubjectVisitId,
+                    SouceReadModuleId=c.SouceReadModuleId,
 
                     //自身一致性才有意义
                     //IsHaveGeneratedTask = c.Subject.SubjectVisitTaskList.Any(t => t.ConsistentAnalysisOriginalTaskId == c.Id),
@@ -468,7 +470,8 @@ namespace IRaCIS.Core.Application.Service
                         SubjectId = c.SubjectId,
                         VisitTaskNum = c.VisitTaskNum,
                         TrialId = c.TrialId,
-
+                        SourceSubjectVisitId = c.SourceSubjectVisitId,
+                        SouceReadModuleId = c.SouceReadModuleId,
                     }).ToList(),
 
                 }).OrderBy(t => t.VisitTaskNum).ToList()

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

@@ -1922,6 +1922,85 @@ namespace IRaCIS.Core.Application.Service.Allocation
 
             var list = await _visitTaskRepository.Where(filterExpression).OrderBy(t => t.VisitTaskNum).ProjectTo<InfluenceTaskInfo>(_mapper.ConfigurationProvider).ToListAsync();
 
+            foreach (var influenceTask in list)
+            {
+
+                if (isReReading)
+                {
+                    //有序
+                    if (trialConfig.IsReadingTaskViewInOrder)
+                    {
+
+                        if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager)
+                        {
+
+                        }
+                        if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.SPM|| _userInfo.UserTypeEnumInt == (int)UserTypeEnum.CPM)
+                        {
+
+                        }
+                    }
+                    //无序
+                    else
+                    {
+                        if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager)
+                        {
+
+                        }
+                        if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.SPM || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.CPM)
+                        {
+
+                        }
+                    }
+                }
+                //PM退回
+                else
+                {
+                    //有序
+                    if (trialConfig.IsReadingTaskViewInOrder)
+                    {
+                        //申请的访视  要不是重阅重置，要不就是失效 不会存在取消分配
+                        if (influenceTask.ReadingCategory == ReadingCategory.Visit && influenceTask.VisitTaskNum != filterObj.VisitTaskNum)
+                        {
+                            //后续访视处理访视
+                            if (influenceTask.ReadingTaskState == ReadingTaskState.HaveSigned)
+                            {
+                                influenceTask.OPtType = ReReadingOrBackOptType.Return;
+                            }
+                            else if (influenceTask.ReadingTaskState == ReadingTaskState.Reading)
+                            {
+                                influenceTask.OPtType = ReReadingOrBackOptType.Abandon;
+                            }
+                            else
+                            {
+                                influenceTask.OPtType = ReReadingOrBackOptType.CancelAssign;
+                            }
+                        }
+                        else
+                        {
+                            //申请的访视   全局肿瘤学
+
+                            if (influenceTask.ReadingTaskState == ReadingTaskState.HaveSigned)
+                            {
+                                influenceTask.OPtType = ReReadingOrBackOptType.Return;
+                            }
+                            else
+                            {
+                                influenceTask.OPtType = ReReadingOrBackOptType.Abandon;
+                            }
+                        }
+                    }
+                    //无序
+                    else
+                    {
+                        //重阅重置或者失效
+                        influenceTask.OPtType = influenceTask.ReadingTaskState == ReadingTaskState.HaveSigned ? ReReadingOrBackOptType.Return : ReReadingOrBackOptType.Abandon;
+                    }
+                }
+
+               
+            }
+
             return list;
 
         }