diff --git a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs index 97381a15a..c83ed469f 100644 --- a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs +++ b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs @@ -254,9 +254,9 @@ namespace IRaCIS.Core.Application.Image.QA [HttpPut] public async Task RequestImageBack(Guid subjectVisitId) { - if (!_subjectVisitRepository.Any(t => t.Id == subjectVisitId && t.CheckState < CheckStateEnum.CVPassed && t.SubmitState == SubmitStateEnum.Submitted)) + if (!_subjectVisitRepository.Any(t => t.Id == subjectVisitId && !t.VisitTaskList.Any() && t.SubmitState == SubmitStateEnum.Submitted)) { - //一致性核查通过前已提交的影像才允许进行回退 + //已提交未生成任务的才允许申请 throw new BusinessValidationFailedException(_localizer["QCOperation_ShouldBeforeCheckPassed"]); } @@ -294,15 +294,15 @@ namespace IRaCIS.Core.Application.Image.QA if (isAgree) { - if (sv.SubmitState == SubmitStateEnum.Submitted && sv.CheckState < CheckStateEnum.CVPassed) + if (sv.SubmitState == SubmitStateEnum.Submitted && _subjectVisitRepository.Any(t => t.Id == subjectVisitId && !t.VisitTaskList.Any())) { sv.ImageBackState = ImageBackStateEnum.PMAgreeBack; - + } else { - //一致性核查通过前已提交的影像才允许进行回退 + //已提交未生成任务的才允许申请 throw new BusinessValidationFailedException(_localizer["QCOperation_ShouldBeforeCheckPassed"]); }