diff --git a/IRaCIS.Core.Application/Resources/en-US.json b/IRaCIS.Core.Application/Resources/en-US.json index 7cb4b8ef1..b47836909 100644 --- a/IRaCIS.Core.Application/Resources/en-US.json +++ b/IRaCIS.Core.Application/Resources/en-US.json @@ -210,7 +210,7 @@ "ReadingImage_ClinicalRead": "Clinical data not read!", "ReadingImage_IDMust": "When there is no task Id, the standard Id must be passed", "ReadingImage_TaskFinish": "The current subject has completed all the task of reading the film!", - "ReadingImage_NeedRest": "You have read the video continuously for 2 hours. Please take a 20-minute rest before reading the video again.", + "ReadingImage_NeedRest": "You have read the video continuously for {0} hours, please rest for {1} minutes before continuing to read the video.", //ReadingJudgeTaskService "ReadingJudge_SouceIdNull": "The SouceId of the current referee global task is null", //ReadingOncologyTaskService @@ -218,6 +218,7 @@ "ReadingOncology_Abnormal": "Abnormal, the referee result is null", //ReadingCalculate "ReadingCalculate_Abnormal": "The PCWG3 standard configuration is abnormal!", + "ReadingCalculate_Questionable": "The lesions have the following problems:", "ReadingCalculate_NoMarker": "Lesion {0} no marker exists,", "ReadingCalculate_StatusIsEmpty": "Lesion {0} status is empty,", "ReadingCalculate_NoMarkerEmpty": "Lesion {0} is unmarked and the status is empty,", @@ -231,4 +232,5 @@ + } diff --git a/IRaCIS.Core.Application/Resources/zh-CN.json b/IRaCIS.Core.Application/Resources/zh-CN.json index c7c80ba5a..0e1f9ad28 100644 --- a/IRaCIS.Core.Application/Resources/zh-CN.json +++ b/IRaCIS.Core.Application/Resources/zh-CN.json @@ -195,40 +195,43 @@ //SystemAnonymizationService //ReadingGlobalTaskService - "ReadingGlobal_NotGlobal": "当前任务不是全局阅片任务", + "ReadingGlobal_NotGlobal": "系统调用错误，当前任务不是全局阅片任务。", //ReadingImageTaskService - "ReadingImage_NotVisit": "当前任务不是访视任务", - "ReadingImage_CantSplit": "当前是基线任务,无法拆分和合并病灶", - "ReadingImage_BeSigned": "当前任务已经签名！", - "ReadingImage_Beinvalid": "当前任务已失效！", + "ReadingImage_NotVisit": "系统调用错误，当前任务不是访视任务。", + "ReadingImage_CantSplit": "当前任务是基线任务,不能执行分裂病灶的操作。", + "ReadingImage_BeSigned": "当前任务已经签名，请勿重复提交。", + "ReadingImage_Beinvalid": "当前任务已失效，不能执行阅片。", "ReadingImage_NotaTask": "合并的病灶并非同一个访视任务", - "ReadingImage_DeleteError": "当前病灶分裂出其他病灶或者其他病灶合并到了当前病灶,删除失败", - "ReadingImage_Idnotcorrespond": "InstanceId和SeriesId不对应！", - "ReadingImage_Twice": "相同问题传入两次", - "ReadingImage_MaxQuestion": "当前提交问题最大问题数为{0}个！", - "ReadingImage_Maxlesion": "按照RECIST1.1的相关规则，同一器官的靶病灶数量不超过{0}个，请确认", - "ReadingImage_Maximum": "问题{0}最大相同问题数为{1},当前已存在{2}条", - "ReadingImage_RequiredQuestion": "必填问题{0}的答案为空或未保存", - "ReadingImage_ClinicalRead": "临床数据未阅读！", - "ReadingImage_IDMust": "当没有任务Id的时候，标准Id必传", - "ReadingImage_TaskFinish": "当前受试者此次阅片任务已全部完成！", - "ReadingImage_NeedRest": "您已连续阅片2个小时，请休息20分钟后，再继续阅片。", + "ReadingImage_DeleteError": "当前病灶分裂出其他病灶或者其他病灶合并到了当前病灶,删除失败。", + "ReadingImage_Idnotcorrespond": "病灶标记添加失败，影像的InstanceId和SeriesId不对应。", + "ReadingImage_Twice": "系统调用错误，提交的问题及答案重复。", + "ReadingImage_MaxQuestion": "按照《独立影像评估章程》的相关规则，当前病灶类型的病灶数量不超过{0}个。", + "ReadingImage_Maxlesion": "按照《独立影像评估章程》的相关规则，同一器官的靶病灶数量不超过{0}个，请确认", + "ReadingImage_Maximum": "\"{0}\"的重复次数限制为{1},目前已重复{2}次。", + "ReadingImage_RequiredQuestion": "\"{0}\"已设置为必填，当前答案为空或未保存。", + "ReadingImage_ClinicalRead": "临床数据未阅读，请确认！", + "ReadingImage_IDMust": "系统调用失败，当没有任务ID的时候，标准ID必传。", + "ReadingImage_TaskFinish": "当前受试者所有阅片任务已完成，请知悉。", + "ReadingImage_NeedRest": "您已连续阅片{0}个小时，请休息{1}分钟后，再继续阅片。", //ReadingJudgeTaskService - "ReadingJudge_SouceIdNull": "当前裁判的全局任务的SouceId为null", + "ReadingJudge_SouceIdNull": "系统调用失败，当前裁判的全局任务的SouceId为null。", //ReadingOncologyTaskService - "ReadingOncology_TaskError": "当前任务不是肿瘤学任务", - "ReadingOncology_Abnormal": "异常，裁判结果为null", + "ReadingOncology_TaskError": "系统调用错误，当前任务不是肿瘤学任务。", + "ReadingOncology_Abnormal": "系统调用异常，裁判结果为null。", //ReadingCalculate - "ReadingCalculate_Abnormal": "PCWG3标准配置异常!", - "ReadingCalculate_NoMarker": "病灶{0}不存在标记,", - "ReadingCalculate_StatusIsEmpty": "病灶{0}状态为空,", - "ReadingCalculate_NoMarkerEmpty": "病灶{0}未做标记，且状态为空,", - "ReadingCalculate_NoDeveloped": "当前标准计算未开发好!", + "ReadingCalculate_Abnormal": "PCWG3标准配置错误，数据验证失败。", + "ReadingCalculate_Questionable": "病灶存在以下问题：", + "ReadingCalculate_NoMarker": "病灶{0}缺少标记", + "ReadingCalculate_StatusIsEmpty": "病灶{0}状态为空", + "ReadingCalculate_NoMarkerEmpty": "病灶{0}未做标记，且状态为空", + "ReadingCalculate_NoDeveloped": "当前标准自动计算未完成开发，请知悉。", //ReadingMedicalReviewService - "MedicalReview_invalid": "该医学审核无效,操作失败", - "MedicalReview_SaveQuestion": "请先保存医学审核问题", - "MedicalReview_NeedSave": "请先保存问题和结论", - "MedicalReview_NotClosed": "对话未关闭" + "MedicalReview_invalid": "该医学审核任务已失效,操作失败。", + "MedicalReview_SaveQuestion": "无法执行当前操作，请先保存医学审核问题。", + "MedicalReview_NeedSave": "无法执行当前操作，请先保存医学审核问题和结论。", + "MedicalReview_NotClosed": "无法执行当前操作，当前医学质询对话未关闭。" + + } diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index 360718e95..67112c849 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -1610,7 +1610,7 @@ namespace IRaCIS.Application.Services int timespanMin = (DateTime.Now - cacheDate).Minutes; if (timespanMin > 120 && timespanMin < 140) { - throw new BusinessValidationFailedException(_localizer["ReadingImage_NeedRest"]); + throw new BusinessValidationFailedException(_localizer["ReadingImage_NeedRest",2,20]); } else if (timespanMin > 140) { diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs index fb1879d5a..acc6fe9a3 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs @@ -980,23 +980,24 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate if (measureDataList.Count() > 0) { - errorMassage += _localizer["ReadingCalculate_NoMarker", string.Join(',', measureDataList)]; + errorMassage += _localizer["ReadingCalculate_NoMarker", string.Join(',', measureDataList)]+","; } if (tableAnswerList.Count > 0) { - errorMassage += _localizer["ReadingCalculate_StatusIsEmpty", string.Join(',', stateIsNullList)] ; + errorMassage += _localizer["ReadingCalculate_StatusIsEmpty", string.Join(',', stateIsNullList)] + ","; } if (allExists.Count > 0) { - errorMassage += _localizer["ReadingCalculate_NoMarkerEmpty", string.Join(',', stateIsNullList)]; + errorMassage += _localizer["ReadingCalculate_NoMarkerEmpty", string.Join(',', stateIsNullList)] + ","; } if (errorMassage != string.Empty) { + errorMassage = _localizer["ReadingCalculate_Questionable"] + errorMassage; throw new BusinessValidationFailedException(errorMassage); } } diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs index 0bcedc00a..601f88caa 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs @@ -553,23 +553,24 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate if (measureDataList.Count() > 0) { - errorMassage += _localizer["ReadingCalculate_NoMarker", string.Join(',', measureDataList)]; + errorMassage += _localizer["ReadingCalculate_NoMarker", string.Join(',', measureDataList)] + ","; } if (tableAnswerList.Count > 0) { - errorMassage += _localizer["ReadingCalculate_StatusIsEmpty", string.Join(',', stateIsNullList)]; + errorMassage += _localizer["ReadingCalculate_StatusIsEmpty", string.Join(',', stateIsNullList)] + ","; } if (allExists.Count > 0) { - errorMassage += _localizer["ReadingCalculate_NoMarkerEmpty", string.Join(',', stateIsNullList)]; + errorMassage += _localizer["ReadingCalculate_NoMarkerEmpty", string.Join(',', stateIsNullList)] + ","; } if (errorMassage != string.Empty) { + errorMassage = _localizer["ReadingCalculate_Questionable"] + errorMassage; throw new BusinessValidationFailedException(errorMassage); } diff --git a/后端提示语.xlsx b/后端提示语.xlsx index 8da8f1256..b0d9748d9 100644 Binary files a/后端提示语.xlsx and b/后端提示语.xlsx differ