From b38239b926aa188c62b9e6a14f0e7e4686a1ef8a Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 31 Aug 2022 14:07:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9QC=20=20=E4=B8=8D=E9=80=9A?= =?UTF-8?q?=E8=BF=87bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Service/QC/QCOperationService.cs | 7 ++++++- .../Service/Reading/ReadingImageTaskService.cs | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs index 3942d912c..bf81cfe4d 100644 --- a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs +++ b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs @@ -1380,11 +1380,16 @@ namespace IRaCIS.Core.Application.Image.QA else if (trialConfig.QCProcessEnum == TrialQCProcess.DoubleAudit) { // 双审 - if (dbSubjectVisit.AuditState == AuditStateEnum.InPrimaryQC || dbSubjectVisit.AuditState == AuditStateEnum.InSecondaryQC) + if (dbSubjectVisit.AuditState == AuditStateEnum.InPrimaryQC ) { dbSubjectVisit.AuditState = AuditStateEnum.QCFailed; dbSubjectVisit.PreliminaryAuditUserId = _userInfo.Id; } + else if( dbSubjectVisit.AuditState == AuditStateEnum.InSecondaryQC) + { + dbSubjectVisit.AuditState = AuditStateEnum.QCFailed; + dbSubjectVisit.ReviewAuditUserId = _userInfo.Id; + } else { return ResponseOutput.NotOk($"项目配置影像质控为双审，当前审核状态为 {dbSubjectVisit.AuditState}，不能变更到 审核终止"); diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs index 1ced56eb2..e0827eeda 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs @@ -1946,6 +1946,7 @@ namespace IRaCIS.Application.Services && x.ReadingTaskState == ReadingTaskState.HaveSigned && !x.IsAnalysisCreate ).CountAsync() == (int)readingType)) { + finishReading = true; } else if(judgeVisitTaskId!=null&& (await _visitTaskRepository.AnyAsync(x=>x.Id== judgeVisitTaskId.Value&&x.ReadingTaskState== ReadingTaskState.HaveSigned)))