diff --git a/IRaCIS.Core.Application/Resources/zh-CN.json b/IRaCIS.Core.Application/Resources/zh-CN.json index 9ac64f043..023b8ba50 100644 --- a/IRaCIS.Core.Application/Resources/zh-CN.json +++ b/IRaCIS.Core.Application/Resources/zh-CN.json @@ -439,4 +439,3 @@ "SubjectVisit_CannotSetAsLastVisit": "该受试者已有后续访视已上传影像或已提交，当前访视不允许设置为末次访视。" } - diff --git a/IRaCIS.Core.Application/Service/Allocation/TaskAllocationRuleService.cs b/IRaCIS.Core.Application/Service/Allocation/TaskAllocationRuleService.cs index 980d36b28..2695eb31f 100644 --- a/IRaCIS.Core.Application/Service/Allocation/TaskAllocationRuleService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/TaskAllocationRuleService.cs @@ -72,7 +72,8 @@ namespace IRaCIS.Core.Application.Service if (enrollId == Guid.Empty) { - return ResponseOutput.NotOk("错误，未在入组表中找到该医生得账号Id"); + //"错误，未在入组表中找到该医生得账号Id" + return ResponseOutput.NotOk(_localizer["TaskAllocation_DoctorIdNotFound"]); } addOrEditTaskAllocationRule.EnrollId = enrollId; @@ -80,7 +81,8 @@ namespace IRaCIS.Core.Application.Service var verifyExp1 = new EntityVerifyExp() { VerifyExp = t => t.DoctorUserId == addOrEditTaskAllocationRule.DoctorUserId && t.TrialId == addOrEditTaskAllocationRule.TrialId, - VerifyMsg = "已有该医生配置，不允许继续增加" + // "已有该医生配置，不允许继续增加" + VerifyMsg = _localizer["TaskAllocation_DoctorConfigExists"] }; var entity = await _taskAllocationRuleRepository.InsertOrUpdateAsync(addOrEditTaskAllocationRule, true, verifyExp1); @@ -96,7 +98,8 @@ namespace IRaCIS.Core.Application.Service { if (await _taskAllocationRuleRepository.Where(t => t.Id == taskAllocationRuleId).AnyAsync(t => t.DoctorUser.VisitTaskList.Where(u => u.TrialId == t.TrialId).Any())) { - return ResponseOutput.NotOk("已分配任务给该医生，不允许删除"); + //"已分配任务给该医生，不允许删除" + return ResponseOutput.NotOk(_localizer["TaskAllocation_TaskAssigned"]); } var success = await _taskAllocationRuleRepository.DeleteFromQueryAsync(t => t.Id == taskAllocationRuleId, true); diff --git a/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs b/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs index 1a07a8802..1f8480a21 100644 --- a/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs @@ -337,7 +337,8 @@ namespace IRaCIS.Core.Application.Service if (needAddDoctorUserIdList.Count == 0) { - throw new BusinessValidationFailedException("请配置一致性分析的医生"); + //"请配置一致性分析的医生" + throw new BusinessValidationFailedException(_localizer["TaskConsistent_ConsistencyConfigExists"]); } @@ -732,12 +733,14 @@ namespace IRaCIS.Core.Application.Service var verifyExp1 = new EntityVerifyExp() { VerifyExp = t => t.TrialId == addOrEditTaskConsistentRule.TrialId && t.IsSelfAnalysis == addOrEditTaskConsistentRule.IsSelfAnalysis && t.TrialReadingCriterionId==addOrEditTaskConsistentRule.TrialReadingCriterionId, - VerifyMsg = "已有该项目配置，不允许继续增加" + //"已有该项目配置，不允许继续增加" + VerifyMsg = _localizer["TaskConsistent_TaskGenerated"] }; if (await _visitTaskRepository.AnyAsync(t => t.IsSelfAnalysis == addOrEditTaskConsistentRule.IsSelfAnalysis && t.TrialId == addOrEditTaskConsistentRule.TrialId && t.TrialReadingCriterionId == addOrEditTaskConsistentRule.TrialReadingCriterionId)) { - return ResponseOutput.NotOk("该标准已有Subject 生成了任务，不允许修改配置"); + //"该标准已有Subject 生成了任务，不允许修改配置" + return ResponseOutput.NotOk(_localizer["TaskConsistent_MedicalAuditTaskExists"]); } var entity = await _taskConsistentRuleRepository.InsertOrUpdateAsync(addOrEditTaskConsistentRule, true, verifyExp1); @@ -756,7 +759,8 @@ namespace IRaCIS.Core.Application.Service if (await _visitTaskRepository.AnyAsync(t => t.IsAnalysisCreate && t.TrialId == config.TrialId && t.IsSelfAnalysis == config.IsSelfAnalysis && t.TrialReadingCriterionId==config.TrialReadingCriterionId)) { - throw new BusinessValidationFailedException("该标准已产生一致性分析任务，不允许删除"); + //"该标准已产生一致性分析任务，不允许删除" + throw new BusinessValidationFailedException(_localizer["TaskConsistent_SignedTaskCannotBeInvalidated"]); } diff --git a/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewRuleService.cs b/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewRuleService.cs index fae808336..8b27e8f75 100644 --- a/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewRuleService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewRuleService.cs @@ -48,8 +48,10 @@ namespace IRaCIS.Core.Application.Service { var verifyExp1 = new EntityVerifyExp() { + VerifyExp = t => t.DoctorUserId == addOrEditTaskTaskMedicalReviewRule.DoctorUserId && t.TrialId == addOrEditTaskTaskMedicalReviewRule.TrialId, - VerifyMsg = "已有该医生配置，不允许继续增加" + //"已有该医生配置，不允许继续增加" + VerifyMsg = _localizer["TaskMedicalRule_TaskAlreadyAssigned"] }; var entity = await _taskMedicalReviewRuleRepository.InsertOrUpdateAsync(addOrEditTaskTaskMedicalReviewRule, true, verifyExp1); @@ -67,7 +69,8 @@ namespace IRaCIS.Core.Application.Service if(await _taskMedicalReviewRuleRepository.Where(t=>t.Id== taskMedicalReviewRuleId).AnyAsync(t => t.TaskMedicalReviewList.Any())) { - return ResponseOutput.NotOk("已产生医学审核任务"); + //"已产生医学审核任务" + return ResponseOutput.NotOk(_localizer["TaskMedicalRule_TaskStarted"]); } var success = await _taskMedicalReviewRuleRepository.DeleteFromQueryAsync(t => t.Id == taskMedicalReviewRuleId,true); diff --git a/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs b/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs index 120215cf2..af28806fe 100644 --- a/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs @@ -225,7 +225,8 @@ namespace IRaCIS.Core.Application.Service if (await _taskMedicalReviewRepository.Where(t => command.MedicalReviewIdList.Contains(t.Id)).AnyAsync(t => t.AuditState == MedicalReviewAuditState.HaveSigned)) { - return ResponseOutput.NotOk("已签名的不允许设置为失效"); + //"已签名的不允许设置为失效" + return ResponseOutput.NotOk(_localizer["TaskMedical_DirtyData"]); } await _taskMedicalReviewRepository.UpdatePartialFromQueryAsync(t => command.MedicalReviewIdList.Contains(t.Id), c => new TaskMedicalReview() { IsInvalid = true },true); @@ -258,7 +259,8 @@ namespace IRaCIS.Core.Application.Service { if (task.MedicalManagerUserId != null && task.MedicalManagerUserId != command.MedicalManagerUserId) { - throw new BusinessValidationFailedException("当前有任务已分配给其他人，不允许分配,请刷新列表"); + //"当前有任务已分配给其他人，不允许分配,请刷新列表" + throw new BusinessValidationFailedException(_localizer["TaskMedical_SubjectInOtherArm"]); } task.MedicalManagerUserId = command.MedicalManagerUserId; diff --git a/后端提示语.xlsx b/后端提示语.xlsx index 6827edfd3..9ab2e17c8 100644 Binary files a/后端提示语.xlsx and b/后端提示语.xlsx differ