From 8fbbc0a4e2eec271eb05d6593c5e9ec2b150c22a Mon Sep 17 00:00:00 2001 From: "{872297557@qq.com}" <872297557@qq.com> Date: Thu, 8 Dec 2022 16:53:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20Follow=20Up=200?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Allocation/VisitTaskHelpeService.cs | 34 +++++++++++++++---- .../Common/AuditingData.cs | 4 +-- 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs index 16b405353..d98c22b69 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs @@ -110,14 +110,24 @@ namespace IRaCIS.Core.Application.Service { var blindTaskName = string.Empty; - if (trialReadingCriterionConfig.IsReadingTaskViewInOrder) + + + if (visitNumList.IndexOf(subjectVisit.VisitNum) == 0) { - blindTaskName = AppSettings.BlindTaskPrefix + visitNumList.IndexOf(subjectVisit.VisitNum); - } + blindTaskName = "Baseline"; + } else { - blindTaskName = AppSettings.BlindTaskPrefix; + if (trialReadingCriterionConfig.IsReadingTaskViewInOrder) + { + blindTaskName = AppSettings.BlindTaskPrefix + visitNumList.IndexOf(subjectVisit.VisitNum); + } + else + { + blindTaskName = AppSettings.BlindTaskPrefix; + } } + if (trialReadingCriterionConfig.ReadingType == ReadingMethod.Double) { @@ -280,15 +290,25 @@ namespace IRaCIS.Core.Application.Service var blindTaskName = string.Empty; - if (trialReadingCriterionConfig.IsReadingTaskViewInOrder) + + if (visitNumList.IndexOf(subjectVisit.VisitNum) == 0) { - blindTaskName = AppSettings.BlindTaskPrefix + visitNumList.IndexOf(subjectVisit.VisitNum); + blindTaskName = "Baseline"; } else { - blindTaskName = AppSettings.BlindTaskPrefix; + if (trialReadingCriterionConfig.IsReadingTaskViewInOrder) + { + blindTaskName = AppSettings.BlindTaskPrefix + visitNumList.IndexOf(subjectVisit.VisitNum); + } + else + { + blindTaskName = AppSettings.BlindTaskPrefix; + } } + + if (trialReadingCriterionConfig.ReadingType == ReadingMethod.Double) { diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index 8092cd640..9411c7372 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs @@ -492,8 +492,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common #region 裁判、肿瘤学、全局 都是通用的 - //裁判任务 - if (entity.JudgeResultTaskId != null && (_userInfo.RequestUrl == "ReadingImageTask/SaveJudgeVisitTaskResult" || _userInfo.RequestUrl == "ReadingImageTask/saveJudgeVisitTaskResult")) + //裁判任务 结果的保存 和签名提交 + if (entity.JudgeResultTaskId != null && (_userInfo.RequestUrl == "ReadingImageTask/SaveJudgeVisitTaskResult" || _userInfo.RequestUrl == "ReadingImageTask/SubmitJudgeVisitTaskResult")) { var list = await _dbContext.VisitTask.Where(t => t.TaskState == TaskState.Effect && t.SubjectId == entity.SubjectId && t.VisitTaskNum == entity.VisitTaskNum).Select(t => new { t.Id, t.DoctorUser.FullName, t.ArmEnum }).OrderBy(t => t.ArmEnum).ToListAsync();