Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api

IRaCIS.Core.Application/Resources/en-US.json

@@ -193,6 +193,11 @@
   //SystemAnonymizationService
 
 
+  //ReadingGlobalTaskService
+  "ReadingGlobal_NotGlobal": "System call error. The current read is not a global review read.",
+  //ReadingImageTaskService
+  "ReadingImage_NotVisit": "System call error. The current read is not a timepoint read.",
+  "ReadingImage_CantSplit": "The current read is a baseline read, and lesion split is allowed.",
   "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. ",
@@ -202,6 +207,7 @@
   "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_PCWGMaximum": "According to the imaging charter, the number of baseline lesions at the same location should enter only {0} time. Please confirm.",
   "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.",
@@ -249,4 +255,5 @@
 
 
 
+
 }

IRaCIS.Core.Application/Resources/zh-CN.json

@@ -208,6 +208,7 @@
   "ReadingImage_MaxQuestion": "按照《独立影像评估章程》的相关规则，当前病灶类型的病灶数量不超过{0}个。",
   "ReadingImage_Maxlesion": "按照《独立影像评估章程》的相关规则，同一器官的靶病灶数量不超过{0}个，请确认",
   "ReadingImage_Maximum": "\"{0}\"的重复次数限制为{1},目前已重复{2}次。",
+  "ReadingImage_PCWGMaximum": "按照《独立影像评估章程》的相关规则，同一部位的基线病灶只需录入{0}次，请确认。",
   "ReadingImage_RequiredQuestion": "提交前，请完成\"{0}\"",
   "ReadingImage_ClinicalRead": "临床数据未阅读，请确认！",
   "ReadingImage_IDMust": "系统调用失败，当没有任务ID的时候，标准ID必传。",
@@ -249,5 +250,6 @@
 
 
 
+
 }
 

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs

@@ -1425,6 +1425,8 @@ namespace IRaCIS.Application.Services
                         Dictionary<CriterionType, string> errorMsgDic = new Dictionary<CriterionType, string>()
                             {
                                {CriterionType.RECIST1Pointt1, _localizer["ReadingImage_Maxlesion", item.MaxRowCount.Value]},
+
+                                {CriterionType.PCWG3, _localizer["ReadingImage_PCWGMaximum", item.MaxRowCount.Value]},
                             };
                         var rowCount = 0;
                         if ((item.QuestionMark == QuestionMark.Part|| item.QuestionMark == QuestionMark.Organ) &&inDto.OrganInfoId!=null)