diff --git a/20220103后端提示语.xlsx b/20220103后端提示语.xlsx deleted file mode 100644 index 396d4e638..000000000 Binary files a/20220103后端提示语.xlsx and /dev/null differ diff --git a/20220116后端提示语_v1.xlsx b/20220116后端提示语_v1.xlsx new file mode 100644 index 000000000..4416fc27a Binary files /dev/null and b/20220116后端提示语_v1.xlsx differ diff --git a/IRaCIS.Core.Application/Resources/en-US.json b/IRaCIS.Core.Application/Resources/en-US.json index fda9c5b8c..25cb1e6b1 100644 --- a/IRaCIS.Core.Application/Resources/en-US.json +++ b/IRaCIS.Core.Application/Resources/en-US.json @@ -193,48 +193,46 @@ //SystemAnonymizationService - //ReadingGlobalTaskService - "ReadingGlobal_NotGlobal": "System call error, the current task is not a global review task.", - //ReadingImageTaskService - "ReadingImage_NotVisit": "System call error, the current task is not the visit task.", - "ReadingImage_CantSplit": "The current task is a baseline task and is unable to split the lension at present.", - "ReadingImage_BeSigned": "The current task has been signed, please do not submit repeatedly.", - "ReadingImage_Beinvalid": "The current task is invalid and cannot be read.", - "ReadingImage_NotaTask": "The lesions to be combined are not from the same visit.", - "ReadingImage_DeleteError": "The current lesion is split into other lesions or combined with other lesions, and failed to delete it.", - "ReadingImage_Idnotcorrespond": "Failed to add lesion mark. the instanceId and SeriesId of the image did not match.", - "ReadingImage_Twice": "Incorrect system calls, duplicate submitted questions and answers.", - "ReadingImage_MaxQuestion": "According to Charter, the number of current lesion does not exceed {0}.", - "ReadingImage_Maxlesion": "According to Charter, the number of target lesion of same organ does not exceed {0} . Please confirm.", - "ReadingImage_Maximum": "The number of repeats of \"{0}\" is limited to {1} and it has been repeated {2} times at present.", - "ReadingImage_RequiredQuestion": "\"{0}\" is a required field, and the current input is empty or not saved.", - "ReadingImage_ClinicalRead": "The clinical data has not been read, please confirm!", - "ReadingImage_IDMust": "System call error. When there is no task ID, the standard ID must be submitted.", - "ReadingImage_TaskFinish": "Please note that all the film reading tasks of the current subjects have been completed.", - "ReadingImage_NeedRest": "You’ve been reading {0} hours in a row. Please take a break of {1} minutes before continuing reading.", + "ReadingImage_BeSigned": "The current read has already been signed off. Please do not submit it again.", + "ReadingImage_Beinvalid": "The current read has already been invalidated, and reading is not allowed anymore.", + "ReadingImage_NotaTask": "The coalesced lesions are not from the same timepoint. ", + "ReadingImage_DeleteError": "Other lesions have split from or coalesced into the current lesion. Deletion failed.", + "ReadingImage_Idnotcorrespond": "Failed to add the lesion mark. The Instance ID and Series ID of the image do not match.", + "ReadingImage_Twice": "System call error. Questions & answers submitted are duplicated.", + "ReadingImage_MaxQuestion": "According to the imaging charter, the number of the current type of lesion cannot exceed {0}.", + "ReadingImage_Maxlesion": "According to the imaging charter, the number of target lesions in the same organ cannot exceed {0}. Please confirm.", + "ReadingImage_Maximum": "\"{0}\" can only be repeated {1} times, and it has been repeated {2} times so far.", + "ReadingImage_RequiredQuestion": "Before submission, please fill in \"{0}\".", + "ReadingImage_ClinicalRead": "The clinical data has not been read. Please confirm!", + "ReadingImage_IDMust": "System call failed. When there is no Read ID, the standard ID must be passed.", + "ReadingImage_TaskFinish": "Please note that all reads of the current subject have been completed.", + "ReadingImage_NeedRest": "You have been continuously reading for {0} hours. Please take a break of {1} minutes before resumption.", //ReadingJudgeTaskService - "ReadingJudge_SouceIdNull": "System call error, the SouceId of the current global review ajudication is null.", + "ReadingJudge_SouceIdNull": "'System call failed. The Source ID of the global review which is being adjudicated currently is 'null'. '", //ReadingOncologyTaskService - "ReadingOncology_TaskError": "System call error, the current task is not an oncology task.", - "ReadingOncology_Abnormal": "System call error, the ajudication result is null.", + "ReadingOncology_TaskError": "System call error. The current read is not an oncology read.", + "ReadingOncology_Abnormal": "System call exception. The result of adjudication is null", //ReadingCalculate - "ReadingCalculate_Abnormal": "PCWG3 standard configuration error, data verification failed.", - "ReadingCalculate_questionable": "The problems with the lesions are as follows:", - "ReadingCalculate_NoMarker": "The lesion {0} lacks mark", - "ReadingCalculate_StatusIsEmpty": "The lesion {0} status is empty", - "ReadingCalculate_NoMarkerEmpty": "The lesion {0} is not marked and the status is empty.", + "ReadingCalculate_Abnormal": "Configuration error of PCWG3 criteria. Data verification failed.", + "ReadingCalculate_questionable": "Problems with the lesions are as follows:", + "ReadingCalculate_NoMarker": "Lesion {0} lacks mark.", + "ReadingCalculate_StatusIsEmpty": "The state of Lesion {0} is empty.", + "ReadingCalculate_NoMarkerEmpty": "Lesion {0} is not marked, and its state is empty.", "ReadingCalculate_NoDeveloped": "Please note that the current standard automatic calculation has not been developed.", //ReadingMedicalReviewService - "MedicalReview_invalid": "The medical review task has expired and the operation has failed.", - "MedicalReview_SaveQuestion": "Unable to perform the current operation, please save the medical review question first.", - "MedicalReview_NeedSave": "Unable to perform the current operation, please save the medical review questions and conclusions first.", - "MedicalReview_NotClosed": "The current operation cannot be performed, and the current medical inquiry conversation has not been closed.", - "MedicalReview_Finish": "The current medical review task has been completed", + "MedicalReview_invalid": "This medical review read has already been invalidated, and the operation failed.", + "MedicalReview_SaveQuestion": "Unable to perform the current operation. Please save the medical review questions first.", + "MedicalReview_NeedSave": "Unable to perform the current operation. Please save the medical review questions and conclusions first.", + "MedicalReview_NotClosed": "Unable to perform the current operation. The current medical inquiry conversation has not been closed.", + "MedicalReview_Finish": "The current medical review is the last one.", //UserService "User_CheckNameOrPw": "Please check the username or password.", //Repository - "Repository_UpdateError": "Update object not exist in db,Please check if the parameter Id is passed incorrectly.", - "Repository_DeleteError": "Delete object not exist in db,Please check if the parameter Id is passed incorrectly" + "Repository_UpdateError": "Updated data does not exist in the database. ", + "Repository_DeleteError": "Deleted data does not exist in the database." + + + diff --git a/IRaCIS.Core.Application/Resources/zh-CN.json b/IRaCIS.Core.Application/Resources/zh-CN.json index 249bde7f7..5e70b47f7 100644 --- a/IRaCIS.Core.Application/Resources/zh-CN.json +++ b/IRaCIS.Core.Application/Resources/zh-CN.json @@ -203,7 +203,7 @@ "ReadingImage_Beinvalid": "当前任务已失效，不能执行阅片。", "ReadingImage_NotaTask": "合并的病灶并非同一个访视任务", "ReadingImage_DeleteError": "当前病灶分裂出其他病灶或者其他病灶合并到了当前病灶,删除失败。", - "ReadingImage_Idnotcorrespond": "病灶标记添加失败，影像的InstanceId和SeriesId不对应。", + "ReadingImage_Idnotcorrespond": "病灶标记添加失败，影像的Instance ID和Series ID不对应。", "ReadingImage_Twice": "系统调用错误，提交的问题及答案重复。", "ReadingImage_MaxQuestion": "按照《独立影像评估章程》的相关规则，当前病灶类型的病灶数量不超过{0}个。", "ReadingImage_Maxlesion": "按照《独立影像评估章程》的相关规则，同一器官的靶病灶数量不超过{0}个，请确认", @@ -230,7 +230,7 @@ "MedicalReview_SaveQuestion": "无法执行当前操作，请先保存医学审核问题。", "MedicalReview_NeedSave": "无法执行当前操作，请先保存医学审核问题和结论。", "MedicalReview_NotClosed": "无法执行当前操作，当前医学质询对话未关闭。", - "MedicalReview_Finish": "当前医学审核已做完。", + "MedicalReview_Finish": "当前医学审核任务为最后一个任务。", //UserService "User_CheckNameOrPw": "请检查用户名或者密码。", //Repository @@ -248,5 +248,6 @@ + } diff --git a/IRaCIS.Core.Application/Service/Allocation/DTO/TaskMedicalReviewViewModel.cs b/IRaCIS.Core.Application/Service/Allocation/DTO/TaskMedicalReviewViewModel.cs index 2134f260e..0c0d9ab92 100644 --- a/IRaCIS.Core.Application/Service/Allocation/DTO/TaskMedicalReviewViewModel.cs +++ b/IRaCIS.Core.Application/Service/Allocation/DTO/TaskMedicalReviewViewModel.cs @@ -92,6 +92,11 @@ namespace IRaCIS.Core.Application.ViewModel public Guid TrialId { get; set; } public Guid? SiteId { get; set; } + /// + /// 传了Id 就不查询这条数据 + /// + public Guid? Id { get; set; } + public Guid? SubjectId { get; set; } diff --git a/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs b/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs index 4d95795ae..120215cf2 100644 --- a/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs @@ -143,6 +143,7 @@ namespace IRaCIS.Core.Application.Service TrialId = medicalReview.TrialId, IsGetBeRead = true, + Id=inDto.MedicalReviewId, SubjectId= medicalReview.VisitTask.SubjectId, TrialReadingCriterionId = medicalReview.VisitTask.TrialReadingCriterionId, PageIndex=1, @@ -159,7 +160,7 @@ namespace IRaCIS.Core.Application.Service TrialId = medicalReview.TrialId, IsGetBeRead = true, - + Id = inDto.MedicalReviewId, TrialReadingCriterionId = medicalReview.VisitTask.TrialReadingCriterionId, PageIndex = 1, PageSize = 1, @@ -192,6 +193,7 @@ namespace IRaCIS.Core.Application.Service .WhereIf(inQuery.SubjectId != null, t => t.VisitTask.SubjectId == inQuery.SubjectId) .WhereIf(inQuery.SiteId != null, t => t.VisitTask.Subject.SiteId == inQuery.SiteId) .WhereIf(!string.IsNullOrEmpty(inQuery.SubjectCode), t => t.VisitTask.Subject.Code.Contains(inQuery.SubjectCode)) + .WhereIf(inQuery.Id != null, t => t.Id != inQuery.Id) .WhereIf(inQuery.IsUrgent != null, t => t.VisitTask.IsUrgent == inQuery.IsUrgent) .WhereIf(inQuery.AuditState != null, t => t.AuditState == inQuery.AuditState) .WhereIf(inQuery.TaskState != null, t => t.VisitTask.TaskState == inQuery.TaskState) diff --git a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs index c5dd8bc76..c50c6a212 100644 --- a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs +++ b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs @@ -311,7 +311,7 @@ namespace IRaCIS.Core.Application.Service } var visitJudgeInfo = globalTask.Where(y => y.VisitTaskNum == x.VisitTaskNum + ReadingCommon.TaskNumDic[ReadingCategory.Judge]).FirstOrDefault(); - if (visitGlobalInfo != null) + if (visitJudgeInfo != null) { x.JudgeTaskId = visitJudgeInfo.Id; x.JudgeTaskName = visitJudgeInfo.TaskBlindName;