diff --git a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs index 8ed741ac5..d354f10ea 100644 --- a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs +++ b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs @@ -589,7 +589,7 @@ namespace IRaCIS.Core.Application.Image.QA }); - if (sv.RequestBackState == RequestBackStateEnum.NotRequest || sv.RequestBackState == RequestBackStateEnum.PM_NotAgree) + if (sv.RequestBackState != RequestBackStateEnum.CRC_RequestBack) { sv.RequestBackState = RequestBackStateEnum.CRC_RequestBack; @@ -663,16 +663,14 @@ namespace IRaCIS.Core.Application.Image.QA return ResponseOutput.NotOk(_localizer["QCOperation_CannotRollback"]); } - //sv.CheckChallengeState = (int)CheckChanllengeTypeEnum.None; - //sv.CheckState = CheckStateEnum.None; - //sv.ChallengeState = (int)ChallengeStateEnum.No; + sv.RequestBackState = RequestBackStateEnum.PM_AgressBack; sv.AuditState = AuditStateEnum.None; sv.SubmitState = SubmitStateEnum.ToSubmit; sv.ReadingStatus = ReadingStatusEnum.ImageNotSubmit; //回退后,回退状态恢复 - sv.RequestBackState = RequestBackStateEnum.NotRequest; + sv.IsCheckBack = true; sv.CheckBackTime = DateTime.Now; sv.CheckState = CheckStateEnum.None; @@ -1013,7 +1011,7 @@ namespace IRaCIS.Core.Application.Image.QA { var studyId = updateModalityCommand.Id; - var study = (await _dicomStudyRepository.FirstOrDefaultAsync(t => t.Id == studyId,true)).IfNullThrowException(); + var study = (await _dicomStudyRepository.FirstOrDefaultAsync(t => t.Id == studyId, true)).IfNullThrowException(); study.BodyPartForEdit = updateModalityCommand.BodyPart; @@ -1085,7 +1083,7 @@ namespace IRaCIS.Core.Application.Image.QA //---CRC已经提交,不允许删除。 return ResponseOutput.NotOk(_localizer["QCOperation_CrcNoDelete"]); } - var waitDeleteStudyList = await _dicomStudyRepository.Where(x => ids.Contains(x.Id),false,true).ToListAsync(); + var waitDeleteStudyList = await _dicomStudyRepository.Where(x => ids.Contains(x.Id), false, true).ToListAsync(); foreach (var study in waitDeleteStudyList) {