diff --git a/IRaCIS.Core.Application/Resources/en-US.json b/IRaCIS.Core.Application/Resources/en-US.json index 94a5b6519..2107ff670 100644 --- a/IRaCIS.Core.Application/Resources/en-US.json +++ b/IRaCIS.Core.Application/Resources/en-US.json @@ -530,6 +530,10 @@ "FileStore_TemplateFileStoragePathInvalid": "No corresponding file was found on the storage path for the data template file of FileStoreHelper, please contact system maintenance personnel.", //SendEmailHelper "SendEmail_SendFail": "Failed to send email in SendEmailHelper. Your operation was unsuccessful, please check your email or contact maintenance personnel.", - "SendEmail_NoRecipient": "No recipient in SendEmailHelper." + "SendEmail_NoRecipient": "No recipient in SendEmailHelper.", + + // ------------------------------------------------------------IRaCIS.Core.Domain-------------------------------------------------------------------- + //Trial + "Trial_number": "The serial number consists of five digits. The first two digits are the center number and the last three digits are the serial number. The serial number must be the same as that recorded by the EDC" } diff --git a/IRaCIS.Core.Application/Resources/zh-CN.json b/IRaCIS.Core.Application/Resources/zh-CN.json index 52a7e105e..a2361cd83 100644 --- a/IRaCIS.Core.Application/Resources/zh-CN.json +++ b/IRaCIS.Core.Application/Resources/zh-CN.json @@ -530,6 +530,10 @@ "FileStore_TemplateFileStoragePathInvalid": "数据模板文件存储路径上未找对应文件,请联系系统运维人员。", //SendEmailHelper "SendEmail_SendFail": "邮件发送失败,您进行的操作未能成功,请检查邮箱或联系维护人员", - "SendEmail_NoRecipient": "没有收件人" + "SendEmail_NoRecipient": "没有收件人", + + // ------------------------------------------------------------IRaCIS.Core.Domain-------------------------------------------------------------------- + //Trial + "Trial_number": "编号由5位数字组成,前2位为中心编号,后3位为顺序号,请与EDC录入的编号保持一致" } diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs index 40c440e50..55f7c6ee5 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs @@ -1622,7 +1622,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate /// { /// 靶病灶疗效为 ICPD /// } - /// else if (上一访视评估为iUPD||本次访视SOD增加不小于5mm) + /// else if (上一访视评估为iUPD&&本次访视SOD增加不小于5mm) /// { /// 靶病灶疗效为 ICPD /// } @@ -1723,8 +1723,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate // 靶病灶疗效为 ICPD result = TargetAssessment.iCPD; } - // else if (上一访视评估为iUPD||本次访视SOD增加不小于5mm) - else if (resultData.LastTaskTarget.EqEnum(OverallAssessment.iUPD) || resultData.SODAddGreaterThan5) + // else if (上一访视评估为iUPD&&本次访视SOD增加不小于5mm) + else if (resultData.LastTaskTarget.EqEnum(OverallAssessment.iUPD) && resultData.SODAddGreaterThan5) { // 靶病灶疗效为 ICPD result = TargetAssessment.iCPD; diff --git a/IRaCIS.Core.Domain/Trial/Trial.cs b/IRaCIS.Core.Domain/Trial/Trial.cs index 30a19d510..b886867f2 100644 --- a/IRaCIS.Core.Domain/Trial/Trial.cs +++ b/IRaCIS.Core.Domain/Trial/Trial.cs @@ -152,7 +152,7 @@ namespace IRaCIS.Core.Domain.Models /// /// ߱ž /// - public string SubjectCodeRule { get; set; } = "5λɣǰ2λΪıţ3λΪ˳ţEDC¼ıűһ"; + public string SubjectCodeRule { get; set; } = StaticData.International("Trial_number"); /// /// Ƿ ߱Ź /// diff --git a/后端提示语.xlsx b/后端提示语.xlsx index bdba57b20..309ca6db0 100644 Binary files a/后端提示语.xlsx and b/后端提示语.xlsx differ