diff --git a/IRaCIS.Core.Application/BusinessFilter/ProjectExceptionFilter.cs b/IRaCIS.Core.Application/BusinessFilter/ProjectExceptionFilter.cs index 39e359524..76384daa1 100644 --- a/IRaCIS.Core.Application/BusinessFilter/ProjectExceptionFilter.cs +++ b/IRaCIS.Core.Application/BusinessFilter/ProjectExceptionFilter.cs @@ -31,7 +31,7 @@ namespace IRaCIS.Core.Application.Filter } else if(context.Exception.GetType() == typeof(QueryBusinessObjectNotExistException)) { - context.Result = new JsonResult(ResponseOutput.NotOk( context.Exception.Message), ApiResponseCodeEnum.DataNotExist); + context.Result = new JsonResult(ResponseOutput.NotOk( context.Exception.Message, ApiResponseCodeEnum.DataNotExist)); } else { diff --git a/IRaCIS.Core.Application/Service/QC/QCListService.cs b/IRaCIS.Core.Application/Service/QC/QCListService.cs index 3af2253c0..6b1b5369b 100644 --- a/IRaCIS.Core.Application/Service/QC/QCListService.cs +++ b/IRaCIS.Core.Application/Service/QC/QCListService.cs @@ -608,14 +608,7 @@ namespace IRaCIS.Core.Application.Image.QA public async Task GetVisitQCInfo(Guid subjectVisitId, [FromRoute] TrialQCProcess trialQCProcess, [FromRoute] CurrentQC currentQCType) { var sv = (await _subjectVisitRepository.FirstOrDefaultAsync(t => t.Id == subjectVisitId)).IfNullThrowException(); - - - if (_userInfo.Id != sv.CurrentActionUserId) - { - throw new BusinessValidationFailedException("您不是该质控任务当前领取人,没有操作权限!"); - } - - + var temp = await GetVisitQCStudyAndSeriesList(subjectVisitId); var qacheckList = await GetQCQuestionAnswerList(subjectVisitId, sv.TrialId, trialQCProcess, currentQCType); diff --git a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs index 0bcb06d9c..0af626305 100644 --- a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs +++ b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs @@ -946,6 +946,12 @@ namespace IRaCIS.Core.Application.Image.QA #endregion + [HttpGet] + public async Task IsCanQCOpt(Guid sujectVisitId) + { + await VerifyIsCanQCAsync(null,sujectVisitId); + } + private async Task VerifyIsCanQCAsync(SubjectVisit? subjectVisit, Guid? sujectVisitId = null) { @@ -972,7 +978,7 @@ namespace IRaCIS.Core.Application.Image.QA if (dbSubjectVisit.CurrentActionUserId == null && dbSubjectVisit.IsTake==false) { - return ResponseOutput.NotOk("当前访视已被释放,不允许替换", ApiResponseCodeEnum.NeedTips); + return ResponseOutput.NotOk("当前访视的影像质控任务已被原领取人释放。您可以通过“领取”获得", ApiResponseCodeEnum.NeedTips); } diff --git a/IRaCIS.Core.Application/TestService.cs b/IRaCIS.Core.Application/TestService.cs index cf2fb654a..2c7f11dff 100644 --- a/IRaCIS.Core.Application/TestService.cs +++ b/IRaCIS.Core.Application/TestService.cs @@ -19,11 +19,6 @@ namespace IRaCIS.Application.Services _trialRepository = trialRepository; } - public string Get() - { - return String.Empty; - } - [HttpPost]