From 9d7256ff81001e226cab471efccf57d47994f222 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 28 Jul 2022 12:01:41 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=B8=80=E8=87=B4=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IRaCIS.Core.Application.xml | 30 +++++++++++++++++++ .../Allocation/TaskConsistentRuleService.cs | 5 ++-- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 0a2eef9d2..39b0d18f5 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -1638,6 +1638,36 @@ 项目Id + + + 审核建议 + + + + + 阅片人是否认同 + + + + + 是否关闭对话 + + + + + 是否有问题 + + + + + 医学审核对话关闭原因 + + + + + 无效的 为True无效 + + 医学审核对话关闭原因 diff --git a/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs b/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs index 897fc6a68..4cbabed3c 100644 --- a/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs @@ -363,13 +363,12 @@ namespace IRaCIS.Core.Application.Service if (filterObj.IsGenerateGlobalTask) { - var globalTask = (subject.SubjectTaskVisitList.Take(filterObj.PlanVisitCount).Last()).Clone(); + var globalTask = (subjectAddTaskList.Take(filterObj.PlanVisitCount).Last()).Clone(); globalTask.TaskName = (int)globalTask.VisitTaskNum + "Global"; globalTask.TaskBlindName = (int)globalTask.VisitTaskNum + "Global"; globalTask.ReadingCategory = ReadingCategory.Global; globalTask.VisitTaskNum += ReadingCommon.TaskNumDic[ReadingCategory.Global]; - globalTask.ArmEnum = Arm.GroupConsistentArm; - globalTask.DoctorUserId = needAddDoctorUserId; + globalTask.DoctorUserId =needAddDoctorUserId; subjectAddTaskList.Add(globalTask); }