修改

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -242,6 +242,12 @@
             <param name="agreeReReadingCommand"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.VisitTaskService.PMSetTaskBack(System.Guid,System.Guid)">
+            <summary>
+            PM  设置任务 退回
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.VisitTaskService.GetReReadingInfluenceTaskList(System.Guid)">
             <summary>
             重阅影响提示列表

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

@@ -99,6 +99,7 @@ namespace IRaCIS.Core.Application.ViewModel
         public String TrialSiteCode { get; set; } = String.Empty;
         public string SubjectCode { get; set; } = String.Empty;
 
+        [JsonIgnore]
         public List<UserSimpleInfo> RelationDoctorUserList { get; set; }
 
         [JsonIgnore]

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

@@ -83,7 +83,7 @@ namespace IRaCIS.Core.Application.ViewModel
 
     public class ReadingTaskView : VisitTaskView
     {
-     
+      
         public ReadingTaskState ReadingTaskState { get; set; }
 
         public ReReadingApplyState ReReadingApplyState { get; set; }

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

@@ -278,7 +278,7 @@ namespace IRaCIS.Core.Application.Service
         [HttpPost]
         public async Task<PageOutput<ReReadingTaskView>> GetSPMReReadingTaskList(VisitTaskQuery queryVisitTask)
         {
-            var visitTaskQueryable = _visitTaskReReadingRepository.Where(t=>t.RequestReReadingType==RequestReReadingType.TrialGroupApply)
+            var visitTaskQueryable = _visitTaskReReadingRepository.Where(t => t.RequestReReadingType == RequestReReadingType.TrialGroupApply)
               .Where(t => t.OriginalReReadingTask.DoctorUserId == _userInfo.Id)
               .Where(t => t.OriginalReReadingTask.TrialId == queryVisitTask.TrialId)
               .WhereIf(queryVisitTask.RootReReadingTaskId != null, t => t.RootReReadingTaskId == queryVisitTask.RootReReadingTaskId || t.OriginalReReadingTaskId == queryVisitTask.RootReReadingTaskId)
@@ -1152,7 +1152,7 @@ namespace IRaCIS.Core.Application.Service
                                         await VisitBackAsync(origenalTask.SourceSubjectVisitId);
                                     }
                                     // 无序阅片没有 全局  肿瘤学
-                                   
+
 
                                 }
                             }
@@ -1212,7 +1212,7 @@ namespace IRaCIS.Core.Application.Service
                                             newTask.AllocateTime = DateTime.Now;
 
                                         }
-                                    });                                                                    
+                                    });
                                 }
                             }
                         }
@@ -1296,6 +1296,57 @@ namespace IRaCIS.Core.Application.Service
         }
 
 
+        /// <summary>
+        /// PM  设置任务 退回
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("{trialId:guid}/{taskId:guid}")]
+        public async Task<IResponseOutput> PMSetTaskBack(Guid trialId, Guid taskId)
+        {
+
+            var trialConfig = (await _trialRepository.Where(t => t.Id == trialId).Select(t => new { TrialId = t.Id, t.IsReadingTaskViewInOrder, t.ReadingType }).FirstOrDefaultAsync()).IfNullThrowException();
+
+            if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager)
+            {
+                //有序
+                if (trialConfig.IsReadingTaskViewInOrder)
+                {
+
+                }
+                //无序   无序阅片没有 全局  肿瘤学
+                else
+                {
+                    // 当前任务标为失效，后续任务不处理
+
+                    var task = (await _visitTaskRepository.FirstOrDefaultAsync(t => t.Id == taskId)).IfNullThrowException();
+                    task.TaskState = TaskState.Adbandon;
+
+
+                    //考虑该访视 另外一个阅片人的任务也同时退回
+                    var otherTask = await _visitTaskRepository.FirstOrDefaultAsync(t => t.SourceSubjectVisitId == task.SourceSubjectVisitId && t.Id != task.Id && t.TaskState == TaskState.Effect);
+
+                    if (otherTask.ReadingTaskState == ReadingTaskState.HaveSigned)
+                    {
+                        otherTask.TaskState = TaskState.HaveReturned;
+                    }
+                    else
+                    {
+                        otherTask.TaskState = TaskState.Adbandon;
+                    }
+
+                    //回退访视
+                    if (task.ReadingCategory == ReadingCategory.Visit)
+                    {
+                        //执行类似一致性核查回退流程
+                        await VisitBackAsync(task.SourceSubjectVisitId);
+                    }
+                }
+            }
+
+            await _visitTaskRepository.SaveChangesAsync();
+
+            return ResponseOutput.Ok();
+        }
 
 
         private async Task VisitBackAsync(Guid? subjectVisitId)

IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs

@@ -10,6 +10,7 @@ namespace IRaCIS.Core.Application.Contracts
     /// <summary> NoneDicomStudyView  列表视图模型 </summary>
     public class NoneDicomStudyView:NoneDicomStudyAddOrEdit
     {
+        public DateTime UpdateTime { get; set; }
         public string CodeView { get; set; }
    
         public int FileCount { get; set; }