Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing Details

Uat_IRC_Net8
he 2025-04-09 15:03:58 +08:00
commit f118c48d0e
1 changed files with 5 additions and 5 deletions

View File

@ -254,9 +254,9 @@ namespace IRaCIS.Core.Application.Image.QA
[HttpPut] [HttpPut]
public async Task<IResponseOutput> RequestImageBack(Guid subjectVisitId) public async Task<IResponseOutput> 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"]); throw new BusinessValidationFailedException(_localizer["QCOperation_ShouldBeforeCheckPassed"]);
} }
@ -294,15 +294,15 @@ namespace IRaCIS.Core.Application.Image.QA
if (isAgree) 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; sv.ImageBackState = ImageBackStateEnum.PMAgreeBack;
} }
else else
{ {
//一致性核查通过前已提交的影像才允许进行回退 //已提交未生成任务的才允许申请
throw new BusinessValidationFailedException(_localizer["QCOperation_ShouldBeforeCheckPassed"]); throw new BusinessValidationFailedException(_localizer["QCOperation_ShouldBeforeCheckPassed"]);
} }