diff --git a/IRaCIS.Core.Application/Resources/en-US.json b/IRaCIS.Core.Application/Resources/en-US.json index 593aa01..f6bab3e 100644 --- a/IRaCIS.Core.Application/Resources/en-US.json +++ b/IRaCIS.Core.Application/Resources/en-US.json @@ -21,6 +21,15 @@ "ProjectException_ConcurrentUpdateNotAllowed": "Concurrent update, operation not allowed at this time.", "Project_ExceptionContactDeveloper": "Your current operation failed, please contact the developer to check the system log for troubleshooting. ", + //StudyService + "Study_VisitAfterVisitOverError": "The current study batch check time {0} cannot be later than the subject study over time {1} .Please check whether the check data is correct.", + "Study_VisitBeforePrevError": "The current study batch check time {0} cannot be earlier than the previous study batch check time {1}. Please check whether the check data is correct.", + "Study_VisitAfterSubseqError": "The current study batch check time {0} cannot be later than the study batch check time {1} .Please check whether the check data is correct.", + "Study_UploadArchiving": "Someone is currently uploading and archiving this study !", + "Study_VisitEndedNotAllowed": "Subject study is over, and uploading is not allowed!", + "Study_ImgAlreadyUploaded": "Uploading is not allowed above here.The current image check has been uploaded to {1} of subject {0}", + + "User_UsernameExist": "The user name already exists.", "User_PhoneDup": "A user with the same phone number already exists in this user type.", "User_EmailDup": "A user with the same email already exists in this user type.", diff --git a/IRaCIS.Core.Application/Resources/zh-CN.json b/IRaCIS.Core.Application/Resources/zh-CN.json index df27ca1..31fbf5f 100644 --- a/IRaCIS.Core.Application/Resources/zh-CN.json +++ b/IRaCIS.Core.Application/Resources/zh-CN.json @@ -22,6 +22,12 @@ "ProjectException_ConcurrentUpdateNotAllowed": "并发更新，当前不允许该操作", "Project_ExceptionContactDeveloper": "您当前的操作失败，请联系开发人员查看系统日志排查", + "Study_VisitAfterVisitOverError": "当前检查批次检查时间{0}不能晚于该患者检查结束时间{1}，请核对检查数据是否有误", + "Study_VisitBeforePrevError": "当前检查批次检查时间{0}不能早于前序检查批次检查时间{1}，请核对检查数据是否有误", + "Study_VisitAfterSubseqError": "当前检查批次检查时间{0}不能晚于该检查批次之后的检查时间{1}，请核对检查数据是否有误", + "Study_UploadArchiving": "当前有人正在上传归档该检查!", + "Study_VisitEndedNotAllowed": "患者检查结束，不允许上传!", + "Study_ImgAlreadyUploaded": "此处不可以上传。当前影像检查已经上传给患者{0}的{1}", "User_UsernameExist": "用户名已经存在。", diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs index e6a4afd..7e6c12e 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs @@ -421,7 +421,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc if(visitOverTime!= null && waitUploadItem.StudyDate != null && waitUploadItem.StudyDate> visitOverTime) { - result.Add(new VerifyStudyUploadResult() { ErrorMesseage = $"当前检查批次检查时间{waitUploadItem.StudyDate?.ToString("yyyy-MM-dd")}不能晚于患者访视检查结束日期{visitOverTime?.ToString("yyyy-MM-dd")}，请核对检查数据是否有误", StudyInstanceUid = waitUploadItem.StudyInstanceUid }); + //$"当前检查批次检查时间{waitUploadItem.StudyDate?.ToString("yyyy-MM-dd")}不能晚于患者访视检查结束日期{visitOverTime?.ToString("yyyy-MM-dd")}，请核对检查数据是否有误" + result.Add(new VerifyStudyUploadResult() { ErrorMesseage = _localizer["Study_VisitAfterVisitOverError", waitUploadItem.StudyDate?.ToString("yyyy-MM-dd"), visitOverTime?.ToString("yyyy-MM-dd")], StudyInstanceUid = waitUploadItem.StudyInstanceUid }); return; } @@ -430,7 +431,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc if (before != null && waitUploadItem.StudyDate != null && before > waitUploadItem.StudyDate) { - result.Add(new VerifyStudyUploadResult() { ErrorMesseage = $"当前检查批次检查时间{waitUploadItem.StudyDate?.ToString("yyyy-MM-dd")}不能早于前序检查批次检查时间{before?.ToString("yyyy-MM-dd")}，请核对检查数据是否有误", StudyInstanceUid = waitUploadItem.StudyInstanceUid }); + //$"当前检查批次检查时间{waitUploadItem.StudyDate?.ToString("yyyy-MM-dd")}不能早于前序检查批次检查时间{before?.ToString("yyyy-MM-dd")}，请核对检查数据是否有误" + result.Add(new VerifyStudyUploadResult() { ErrorMesseage = _localizer["Study_VisitBeforePrevError", waitUploadItem.StudyDate?.ToString("yyyy-MM-dd"), before?.ToString("yyyy-MM-dd")], StudyInstanceUid = waitUploadItem.StudyInstanceUid }); return; } @@ -439,7 +441,9 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc if (after != null && waitUploadItem.StudyDate != null && after < waitUploadItem.StudyDate) { - result.Add(new VerifyStudyUploadResult() { ErrorMesseage = $"当前检查批次检查时间{waitUploadItem.StudyDate?.ToString("yyyy-MM-dd")}不能晚于该检查批次之后的检查时间{after?.ToString("yyyy-MM-dd")}，请核对检查数据是否有误", StudyInstanceUid = waitUploadItem.StudyInstanceUid }); + // $"当前检查批次检查时间{waitUploadItem.StudyDate?.ToString("yyyy-MM-dd")}不能晚于该检查批次之后的检查时间{after?.ToString("yyyy-MM-dd")}，请核对检查数据是否有误" + result.Add(new VerifyStudyUploadResult() { ErrorMesseage = _localizer["Study_VisitAfterSubseqError", waitUploadItem.StudyDate?.ToString("yyyy-MM-dd"), after?.ToString("yyyy-MM-dd")] + , StudyInstanceUid = waitUploadItem.StudyInstanceUid }); return; } @@ -467,7 +471,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc result.AllowReUpload = false; result.StudyInstanceUid = studyInstanceUid; - result.ErrorMesseage = "当前有人正在上传归档该检查!"; + //"当前有人正在上传归档该检查!" + result.ErrorMesseage = _localizer["Study_UploadArchiving"]; return result; } @@ -478,7 +483,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc result.AllowReUpload = false; result.StudyInstanceUid = studyInstanceUid; - result.ErrorMesseage = "患者检查批次结束，不允许上传!"; + //"患者检查批次结束，不允许上传!" + result.ErrorMesseage = _localizer["Study_VisitEndedNotAllowed"]; return result; } @@ -512,7 +518,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc result.AllowReUpload = false; - result.ErrorMesseage = $"此处不可以上传。当前影像检查已经上传给患者{verifyStudyInfo.SubjectCode}的{verifyStudyInfo.VisitName}"; + //$"此处不可以上传。当前影像检查已经上传给患者{verifyStudyInfo.SubjectCode}的{verifyStudyInfo.VisitName}" + result.ErrorMesseage = _localizer["Study_ImgAlreadyUploaded", verifyStudyInfo.SubjectCode, verifyStudyInfo.VisitName] ; } } result.StudyInstanceUid = studyInstanceUid; diff --git a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs index 9f1a62f..198a4cd 100644 --- a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs +++ b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs @@ -1063,7 +1063,7 @@ namespace IRaCIS.Core.Application.Image.QA { if (nameList.Count() > 0) - { + { return ResponseOutput.NotOk($"当前检查批次要求进行疾病进展确认。请在提交当前检查批次前，先处理未提交的前序检查批次：{string.Join('、', nameList)}。", 1, ApiResponseCodeEnum.NeedTips); } } @@ -1120,7 +1120,7 @@ namespace IRaCIS.Core.Application.Image.QA if (dbSubjectVisitList.Any(t => t.SubmitState == SubmitStateEnum.None)) { - return ResponseOutput.NotOk("有检查批次未上传任何Dicom/非Dicom影像数据，不允许提交"); + return ResponseOutput.NotOk("有检查批次未上传任何影像数据，不允许提交"); } //单个提交提示信息 @@ -1372,9 +1372,6 @@ namespace IRaCIS.Core.Application.Image.QA } } - - - } }