diff --git a/IRaCIS.Core.Application/Resources/en-US.json b/IRaCIS.Core.Application/Resources/en-US.json index 56a8038..f876492 100644 --- a/IRaCIS.Core.Application/Resources/en-US.json +++ b/IRaCIS.Core.Application/Resources/en-US.json @@ -6,10 +6,10 @@ "TrialService_ExistPN": "The same Project ID already exists", "SubjectService_ExistSubjectCode": "A patient with the relevant patient ID already exists.", - "SubjectService_ExistImage": "The patient already has an imaging batch uploaded, and deletion is not allowed.", + "SubjectService_ExistImage": "An image study has been uploaded for this patiemt, and the deletion of this patient is not allowed.", "SubjectVisitServiece_ExistOtherInCurrent": "In the patient's study batch, there is an unplanned study batch after the previous study, please re-select the previous study.", - "SubjectVisitServiece_ExistName": "This patient's study batch already contains a study with the same name.", + "SubjectVisitServiece_ExistName": "Same study batch name has already existed.", "SubjectVisitServiece_ExistImage": "Images have already been uploaded in the current study batch, and deletion is not allowed.", "SubjectVisitServiece_HaveSetBeforeBatch": "The current study batch has been set to the previous study of another study and cannot be deleted.", "TrialResource_InterceptedProjectStatusRule": "This request is blocked by the configuration rule: The operation is allowed only when the project status is Ongoing.", @@ -22,7 +22,7 @@ "Project_ExceptionContactDeveloper": "Your request is failed, and please contact the developer to solve it.", //StudyService - "Study_VisitAfterVisitOverError": "The scan time {0} of current study batch cannot be later than the end time {1} of this patien's study.Please check whether the study data is correct.", + "Study_VisitAfterVisitOverError": "The scan date ofthis study ({0}) cannot be earlier than that of any previous study of the same patient.", "Study_VisitBeforePrevError": "The scan time {0} of current study batch cannot be earlier than that {1} of the previous study batch. Please check whether the study data is correct.", "Study_VisitAfterSubseqError": "The scan time {0} of current study batch cannot be later than the that {1} of the next study batch. Please check whether the study data is correct.", "Study_UploadArchiving": "Someone is currently uploading and archiving the images of this study batch!", @@ -33,7 +33,7 @@ "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.", - "User_NewOldPwdSame": "The new password is the same as the old one.", + "User_NewOldPwdSame": "The new password is the same as the lasted old one.", "User_OldPwdInvalid": "Failed to verify the old password.", "User_LegalEmail": "Please input a legal email.", "User_VerificationCodeError": "The verification code is wrong.", diff --git a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs index e9093e1..3a46a8e 100644 --- a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs +++ b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs @@ -16,6 +16,7 @@ using IRaCIS.Core.Application.Helper; using IRaCIS.Core.Application.ViewModel; using IRaCIS.Core.Domain.Models; using IRaCIS.Core.Application.Service; +using Spire.Pdf.Exporting.XPS.Schema; namespace IRaCIS.Core.Application.Image.QA { @@ -1072,7 +1073,10 @@ namespace IRaCIS.Core.Application.Image.QA if (nameList.Count() > 0) { - return ResponseOutput.NotOk($"After submitted the current study batch, please process the unsubmitted previous study batches as soon as possible :{string.Join('、', nameList)}。", 0, ApiResponseCodeEnum.NeedTips); + var thisname = dbSubjectVisitList.Select(x => x.VisitName).ToList(); + + return ResponseOutput.NotOk($"After submitting images of the current study batch({string.Join('、', thisname)}), please submit unsubmitted images of antecedent study batches({string.Join('、', nameList)}) as soon as possible.", 0, ApiResponseCodeEnum.NeedTips); + //return ResponseOutput.NotOk($"After submitting the curent batch, please submit unsubmitted earlier batches as soon as possible: :{string.Join('、', nameList)}.", 0, ApiResponseCodeEnum.NeedTips); } } }