diff --git a/IRaCIS.Core.Application/BackGroundJob/IRaCISCHangfireJob.cs b/IRaCIS.Core.Application/BackGroundJob/IRaCISCHangfireJob.cs index 278631030..49f697756 100644 --- a/IRaCIS.Core.Application/BackGroundJob/IRaCISCHangfireJob.cs +++ b/IRaCIS.Core.Application/BackGroundJob/IRaCISCHangfireJob.cs @@ -121,7 +121,7 @@ namespace IRaCIS.Application.Services.BackGroundJob { if (!File.Exists(filePath)) { - throw new BusinessValidationFailedException("国际化Json文件不存在"); + throw new BusinessValidationFailedException(StaticData.International("IRaCISCHangfireJob_FileNotFound")); } FileSystemWatcher watcher = new FileSystemWatcher(Path.GetDirectoryName(filePath), Path.GetFileName(filePath)); diff --git a/IRaCIS.Core.Application/Helper/InternationalizationHelper.cs b/IRaCIS.Core.Application/Helper/InternationalizationHelper.cs index 882a71448..e2d3d218e 100644 --- a/IRaCIS.Core.Application/Helper/InternationalizationHelper.cs +++ b/IRaCIS.Core.Application/Helper/InternationalizationHelper.cs @@ -22,7 +22,7 @@ namespace IRaCIS.Core.Application.Helper if (!Directory.Exists(JsonFileFolder) || !Directory.GetFiles(JsonFileFolder).Any(filePath => Path.GetExtension(filePath).Equals(".json", StringComparison.OrdinalIgnoreCase))) { - throw new BusinessValidationFailedException("国际化Json文件目录有误"); + throw new BusinessValidationFailedException(StaticData.International("InternationalizationHelper_PathError")); } } diff --git a/IRaCIS.Core.Application/Service/Common/PublishLogService.cs b/IRaCIS.Core.Application/Service/Common/PublishLogService.cs index 5afb3aaf8..a58dcc7c1 100644 --- a/IRaCIS.Core.Application/Service/Common/PublishLogService.cs +++ b/IRaCIS.Core.Application/Service/Common/PublishLogService.cs @@ -48,7 +48,7 @@ namespace IRaCIS.Core.Application.Service if (!Version.TryParse(addOrEditPublishLog.Version, out version)) { - return ResponseOutput.NotOk("版本号不符合要求"); + return ResponseOutput.NotOk(_localizer["PublishLog_VersionNotMatch"]); } var verifyExp1 = new EntityVerifyExp() diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalQuestionService.cs index 2b1a77e52..e1f4d06b5 100644 --- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalQuestionService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalQuestionService.cs @@ -240,12 +240,12 @@ namespace IRaCIS.Core.Application.Service if (await _trialClinicalQuestionRepository.AnyAsync(x => x.TrialClinicalId == inDto.TrialClinicalId && x.Id != inDto.Id && x.ShowOrder == inDto.ShowOrder)) { - return ResponseOutput.NotOk("问题序号存在重复！"); + return ResponseOutput.NotOk(_localizer["ClinicalQuestion_DuplicateId"]); } if (await _trialClinicalQuestionRepository.AnyAsync(x => x.TrialClinicalId == inDto.TrialClinicalId && x.Id != inDto.Id && x.IsCheckDate == inDto.IsCheckDate&&inDto.IsCheckDate)) { - return ResponseOutput.NotOk("已经添加过类型为检查日期的问题！"); + return ResponseOutput.NotOk(_localizer["ClinicalQuestion_DuplicateType"]); } var entity = await _trialClinicalQuestionRepository.InsertOrUpdateAsync(inDto, true); @@ -338,11 +338,11 @@ namespace IRaCIS.Core.Application.Service if (await _systemClinicalQuestionRepository.AnyAsync(x => x.SystemClinicalId == inDto.SystemClinicalId && x.Id != inDto.Id && x.ShowOrder == inDto.ShowOrder)) { - return ResponseOutput.NotOk("问题序号存在重复！"); + return ResponseOutput.NotOk(_localizer["ClinicalQuestion_DuplicateId"]); } if (await _systemClinicalQuestionRepository.AnyAsync(x => x.SystemClinicalId == inDto.SystemClinicalId && x.Id != inDto.Id && x.IsCheckDate == inDto.IsCheckDate && inDto.IsCheckDate)) { - return ResponseOutput.NotOk("已经添加过类型为检查日期的问题！"); + return ResponseOutput.NotOk(_localizer["ClinicalQuestion_DuplicateType"]); } var entity = await _systemClinicalQuestionRepository.InsertOrUpdateAsync(inDto, true); return ResponseOutput.Ok(entity.Id.ToString()); @@ -435,7 +435,7 @@ namespace IRaCIS.Core.Application.Service if (await _systemClinicalTableQuestionRepository.AnyAsync(x => x.QuestionId == inDto.QuestionId && x.Id != inDto.Id && x.ShowOrder == inDto.ShowOrder)) { - return ResponseOutput.NotOk("问题序号存在重复!"); + return ResponseOutput.NotOk(_localizer["ClinicalQuestion_DuplicateId"]); } var entity = await _systemClinicalTableQuestionRepository.InsertOrUpdateAsync(inDto, true); @@ -498,7 +498,7 @@ namespace IRaCIS.Core.Application.Service if (await _trialClinicalTableQuestionRepository.AnyAsync(x => x.QuestionId == inDto.QuestionId && x.Id != inDto.Id && x.ShowOrder == inDto.ShowOrder)) { - return ResponseOutput.NotOk("问题序号存在重复!"); + return ResponseOutput.NotOk(_localizer["ClinicalQuestion_DuplicateId"]); } var entity = await _trialClinicalTableQuestionRepository.InsertOrUpdateAsync(inDto, true); diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index 69fafccdb..1059da1e1 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -666,7 +666,7 @@ namespace IRaCIS.Application.Services if (await _visitTaskRepository.AnyAsync(x => x.Id == visitTaskid && x.DoctorUserId != _userInfo.Id && x.SubjectCriterionClaimUserId != _userInfo.Id)) { - throw new BusinessValidationFailedException("当前任务领取人不是你，不允许提交签名"); + throw new BusinessValidationFailedException(_localizer["InternationalizationHelper_PathError"]); } if (await _visitTaskRepository.AnyAsync(x => x.Id == visitTaskid && x.TaskState != TaskState.Effect)) @@ -2536,7 +2536,7 @@ namespace IRaCIS.Application.Services if (_visitTaskRepository.Any(t => t.Id == claimSubjectDto.SubejctId && t.TrialReadingCriterionId == claimSubjectDto.TrialReadingCriterionId && t.SubjectCriterionClaimUserId != _userInfo.Id && t.SubjectCriterionClaimUserId != null)) { - throw new BusinessValidationFailedException("当前任务已被其他人领取,请进行其他的阅片任务"); + throw new BusinessValidationFailedException(_localizer["ReadingImageTask_TaskTaken"]); } else { @@ -2580,7 +2580,7 @@ namespace IRaCIS.Application.Services { if (_visitTaskRepository.Any(t => t.Id == claimSubjectDto.VisitTaskId && t.DoctorUserId != _userInfo.Id && t.DoctorUserId != null)) { - throw new BusinessValidationFailedException("当前任务已被其他人领取,请进行其他的阅片任务"); + throw new BusinessValidationFailedException(_localizer["ReadingImageTask_TaskTaken"]); } else { diff --git a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteEquipmentSurveyService.cs b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteEquipmentSurveyService.cs index 16486d477..50aa51e45 100644 --- a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteEquipmentSurveyService.cs +++ b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteEquipmentSurveyService.cs @@ -43,7 +43,7 @@ namespace IRaCIS.Core.Application.Contracts if (await _trialSiteSurveyRepository.AnyAsync(t => t.Id == addOrEditTrialSiteEquipmentSurvey.TrialSiteSurveyId && (t.IsDeleted == true ||t.State==TrialSiteSurveyEnum.PMCreatedAndLock), true)) { - return ResponseOutput.NotOk("当前调研表已废除，或者调研表状态已锁定，不允许操作"); + return ResponseOutput.NotOk(_localizer["TrialSiteEquipment_Invalid"]); } diff --git a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs index 83a311319..350349ecf 100644 --- a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs +++ b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs @@ -291,7 +291,7 @@ namespace IRaCIS.Core.Application.Contracts if (currentLatest == null) { - return ResponseOutput.NotOk("当前site没有调研表可以更新，请确认"); + return ResponseOutput.NotOk(_localizer["TrialSite_NoSurveyToUpdate"]); } if (currentLatest.Email != userInfo.ReplaceUserEmailOrPhone) @@ -702,7 +702,7 @@ namespace IRaCIS.Core.Application.Contracts if (trialSiteSurvey.IsDeleted == true || trialSiteSurvey.State == TrialSiteSurveyEnum.PMCreatedAndLock) { - throw new BusinessValidationFailedException("当前调研表已废除，或者调研表状态已锁定，不允许操作"); + throw new BusinessValidationFailedException(_localizer["TrialSiteSurvey_Invalid"]); } @@ -728,13 +728,13 @@ namespace IRaCIS.Core.Application.Contracts if (!currentUserList.Any(t => t.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator) || !currentUserList.Any(t => t.UserTypeEnum == UserTypeEnum.SR)) { - throw new BusinessValidationFailedException("本次提交，生成账号必须要有CRC和SR"); + throw new BusinessValidationFailedException(_localizer["TrialSiteSurvey_MissingAccount"]); } if(currentUserList.GroupBy(t=>new {t.UserTypeId,t.Email}) .Any(g => g.Count() > 1)) { - throw new BusinessValidationFailedException("同一邮箱同一用户类型,生成账号的数据只允许存在一条！"); + throw new BusinessValidationFailedException(_localizer["TrialSiteSurvey_DuplicateEmail"]); } diff --git a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteUserSurveyService.cs b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteUserSurveyService.cs index e11d4e531..04a1e35db 100644 --- a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteUserSurveyService.cs +++ b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteUserSurveyService.cs @@ -48,7 +48,7 @@ namespace IRaCIS.Core.Application.Contracts if (await _trialSiteSurveyRepository.AnyAsync(t => t.Id == addOrEditTrialSiteUserSurvey.TrialSiteSurveyId && (t.IsDeleted == true || t.State == TrialSiteSurveyEnum.PMCreatedAndLock), true)) { //当前调研表已废除，或者调研表状态已锁定，不允许操作 - return ResponseOutput.NotOk("当前调研表已废除，或者调研表状态已锁定，不允许操作"); + return ResponseOutput.NotOk(_localizer["TrialSiteUserSurvey_Invalid"]); }