diff --git a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs index d1e31a43..c9a9c242 100644 --- a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs +++ b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs @@ -284,7 +284,7 @@ namespace IRaCIS.Core.Application.Image.QA sv.CheckChallengeState = CheckChanllengeTypeEnum.CRCWaitPMReply; } - else if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager) + else if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager || _userInfo.UserTypeEnumInt != (int)UserTypeEnum.APM) { sv.CheckChallengeState = CheckChanllengeTypeEnum.PMWaitCRCReply; } @@ -339,7 +339,7 @@ namespace IRaCIS.Core.Application.Image.QA [TypeFilter(typeof(TrialResourceFilter))] public async Task SetCheckPass(SetCheckPassDt data) { - if (_userInfo.UserTypeEnumInt != (int)UserTypeEnum.ProjectManager) + if (_userInfo.UserTypeEnumInt != (int)UserTypeEnum.ProjectManager || _userInfo.UserTypeEnumInt != (int)UserTypeEnum.APM) { ResponseOutput.NotOk("您不是PM/APM,不允许设置一致性核查通过"); } @@ -417,7 +417,7 @@ namespace IRaCIS.Core.Application.Image.QA [HttpPut("{trialId:guid}/{subjectVisitId:guid}")] public async Task RejectCheckBack(Guid subjectVisitId) { - if (_userInfo.UserTypeEnumInt != (int)UserTypeEnum.ProjectManager) + if (_userInfo.UserTypeEnumInt != (int)UserTypeEnum.ProjectManager || _userInfo.UserTypeEnumInt != (int)UserTypeEnum.APM) { return ResponseOutput.NotOk(" 只有PM/APM具有操作权限!"); } @@ -449,7 +449,7 @@ namespace IRaCIS.Core.Application.Image.QA [UnitOfWork] public async Task CheckBack(Guid subjectVisitId) { - if (_userInfo.UserTypeEnumInt != (int)UserTypeEnum.ProjectManager) + if (_userInfo.UserTypeEnumInt != (int)UserTypeEnum.ProjectManager || _userInfo.UserTypeEnumInt != (int)UserTypeEnum.APM) { return ResponseOutput.NotOk("只有PM/APM具有操作权限!"); } @@ -521,7 +521,7 @@ namespace IRaCIS.Core.Application.Image.QA [TypeFilter(typeof(TrialResourceFilter))] public async Task UploadVisitCheckExcel(IFormFile file, Guid trialId) { - if (_userInfo.UserTypeEnumInt != (int)UserTypeEnum.ProjectManager) + if (_userInfo.UserTypeEnumInt != (int)UserTypeEnum.ProjectManager|| _userInfo.UserTypeEnumInt != (int)UserTypeEnum.APM) { return ResponseOutput.NotOk("只有PM/APM具有操作权限!"); } @@ -1488,14 +1488,14 @@ namespace IRaCIS.Core.Application.Image.QA else if (trialConfig.QCProcessEnum == TrialQCProcess.SingleAudit) { // 单审 - if (dbSubjectVisit.AuditState == AuditStateEnum.ToAudit) + if (dbSubjectVisit.AuditState == AuditStateEnum.InPrimaryQC) { dbSubjectVisit.AuditState = AuditStateEnum.QCFailed; } else { - return ResponseOutput.NotOk("项目配置影像质控为单审,当前审核状态不为 ToAudit,不能变更到 审核终止"); + return ResponseOutput.NotOk("项目配置影像质控为单审,当前审核状态不为 InPrimaryQC,不能变更到 审核终止"); } } else if (trialConfig.QCProcessEnum == TrialQCProcess.DoubleAudit)