From 1c40859e725e37c5116bef592eb6d3c58db830de Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Mon, 25 Jul 2022 14:07:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20IsPMSetBack?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Allocation/DTO/VisitTaskViewModel.cs | 2 ++ .../Service/Allocation/VisitTaskService.cs | 23 +++++++++++-------- IRaCIS.Core.Domain/Allocation/VisitTask.cs | 5 +++- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs index d0e172aa4..18a46b11e 100644 --- a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs @@ -49,6 +49,8 @@ namespace IRaCIS.Core.Application.ViewModel public String TrialSiteCode { get; set; } = String.Empty; public string SubjectCode { get; set; } = String.Empty; + public bool IsPMSetBack { get; set; } + } diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs index 58a12f996..16c94b2c0 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs @@ -1926,17 +1926,20 @@ namespace IRaCIS.Core.Application.Service.Allocation foreach (var influenceTask in influenceTaskList) { - - ////同意的访视 因为要记录具体的操作,所以废弃 - //if (influenceTask.Id == task.Id) - //{ - // influenceTaskList.ForEach(t => - // { - // //记录实际影像的任务 - // influenceTask.TaskInfluenceList.Add(new TaskInfluence() { InfluenceTaskId = t.Id }); - // }); - //} + //同意的访视 因为要记录具体的操作,所以废弃 + if (influenceTask.Id == task.Id) + { + //influenceTaskList.ForEach(t => + //{ + // //记录实际影像的任务 + + // influenceTask.TaskInfluenceList.Add(new TaskInfluence() { InfluenceTaskId = t.Id }); + //}); + + + influenceTask.IsPMSetBack = true; + } //申请的访视 要不是重阅重置,要不就是失效 不会存在取消分配 if (influenceTask.ReadingCategory == ReadingCategory.Visit && influenceTask.VisitTaskNum != task.VisitTaskNum) diff --git a/IRaCIS.Core.Domain/Allocation/VisitTask.cs b/IRaCIS.Core.Domain/Allocation/VisitTask.cs index 0a9025fc1..d4c387760 100644 --- a/IRaCIS.Core.Domain/Allocation/VisitTask.cs +++ b/IRaCIS.Core.Domain/Allocation/VisitTask.cs @@ -132,7 +132,10 @@ namespace IRaCIS.Core.Domain.Models /// public bool IsReReadingCreate { get; set; } - + /// + /// PM 对该任务进行了回退 影响的任务不设置 + /// + public bool IsPMSetBack { get; set; } /// 裁判结果的任务ID