From aa15145765f0ddf7b37115ff5f8c8142d45ead29 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Tue, 30 May 2023 11:21:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=8D=E9=98=85=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=20=E4=B8=8D=E7=AC=A6=E5=90=88=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=E4=BB=A5=E5=BC=82=E5=B8=B8=E7=9A=84=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=E6=8A=9B=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Allocation/VisitTaskService.cs | 9 ++++----- .../Reading/MedicalAudit/ReadingMedicalReviewService.cs | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs index 059bd6e24..bc7c9e0f0 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs @@ -1340,7 +1340,7 @@ namespace IRaCIS.Core.Application.Service.Allocation && t.OriginalReReadingTask.ReadingTaskState == ReadingTaskState.HaveSigned && t.RequestReReadingType == RequestReReadingType.DocotorApply && t.RequestReReadingResultEnum == RequestReReadingResult.Default)) { //---当前为有序阅片，该受试者已有访视已申请重阅还未处理，暂不能继续申请重阅 - return ResponseOutput.NotOk(_localizer["VisitTask_SequentialReading"]); + throw new BusinessValidationFailedException(_localizer["VisitTask_SequentialReading"]); } @@ -1358,7 +1358,7 @@ namespace IRaCIS.Core.Application.Service.Allocation .AnyAsync(t => t.VisitTaskNum == task.VisitTaskNum)) { //---当前为有序阅片，影像存在问题，项目组已申请回退,暂不能申请重阅 - return ResponseOutput.NotOk(_localizer["VisitTask_ImageProblem"]); + throw new BusinessValidationFailedException(_localizer["VisitTask_ImageProblem"]); } } @@ -2236,11 +2236,10 @@ namespace IRaCIS.Core.Application.Service.Allocation Expression> filterExpression = t => t.TrialId == trialId && t.SubjectId == task.SubjectId && (t.TaskState == TaskState.Effect || t.TaskState == TaskState.Freeze) && t.TaskAllocationState == TaskAllocationState.Allocated; - - //附加评估 IR 和PM 看到的影响列表不一样 + if (criterionConfig.CriterionType == CriterionType.RECIST1Point1 && criterionConfig.IsAdditionalAssessment) { - + //影像退回，必定影响两个标准的任务 filterExpression = filterExpression.And(t => t.TrialReadingCriterionId == task.TrialReadingCriterionId || t.TrialReadingCriterion.CriterionType == CriterionType.RECIST1Pointt1_MB); diff --git a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs index 7819c196b..6c41c6688 100644 --- a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs +++ b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs @@ -585,10 +585,11 @@ namespace IRaCIS.Core.Application.Service TrialId = inDto.TrialId, TaskIdList = new List() { - visitTaskId - + visitTaskId } }); + + await _taskMedicalReviewRepository.UpdatePartialFromQueryAsync(x => !x.IsClosedDialog && x.Id == inDto.TaskMedicalReviewId, x => new TaskMedicalReview() { IsClosedDialog = true, @@ -598,9 +599,7 @@ namespace IRaCIS.Core.Application.Service IsApplyHeavyReading = true, FileName = inDto.FileName, ImagePath = JsonConvert.SerializeObject(inDto.FileList), - DisagreeReason = inDto.DisagreeReason, - - + DisagreeReason = inDto.DisagreeReason, }); }