diff --git a/IRaCIS.Core.API/Startup.cs b/IRaCIS.Core.API/Startup.cs index 62313ac7b..6fafd9402 100644 --- a/IRaCIS.Core.API/Startup.cs +++ b/IRaCIS.Core.API/Startup.cs @@ -83,12 +83,10 @@ namespace IRaCIS.Core.API if (_configuration.GetSection("BasicSystemConfig").GetValue("OpenLoginLimit")) { options.Filters.Add(); - } }) - .AddNewtonsoftJsonSetup(); // NewtonsoftJson л services.AddOptions().Configure( _configuration.GetSection("SystemEmailSendConfig")); diff --git a/IRaCIS.Core.API/wwwroot/EmailTemplate.rar b/IRaCIS.Core.API/wwwroot/EmailTemplate.rar new file mode 100644 index 000000000..947adef16 Binary files /dev/null and b/IRaCIS.Core.API/wwwroot/EmailTemplate.rar differ diff --git a/IRaCIS.Core.API/wwwroot/EmailTemplate.zip b/IRaCIS.Core.API/wwwroot/EmailTemplate.zip new file mode 100644 index 000000000..39ac004c0 Binary files /dev/null and b/IRaCIS.Core.API/wwwroot/EmailTemplate.zip differ diff --git a/IRaCIS.Core.Application/Resources/en-US.json b/IRaCIS.Core.Application/Resources/en-US.json index 79ffad22a..35ed4b063 100644 --- a/IRaCIS.Core.Application/Resources/en-US.json +++ b/IRaCIS.Core.Application/Resources/en-US.json @@ -443,7 +443,7 @@ "TrialSiteSurvey_ViewAndConfirm": "Check and confirm", //TrialSiteUserSurveyService "TrialSiteUser_Locked": "Locked and not allowed to operate.", - "TrialSiteUser_InconsistentInfo": "The user's account name in the system is{0}, and there are inconsistent items with the information filled in. Now modify the interface information to be consistent with the system and save it.", + "TrialSiteUser_InconsistentInfo": "The corresponding user of this email address is {0}, and the phone number is {1}. Please modify the inputted information and make it consistent with that already in the system, and then save.", "TrialSiteUser_NoTestUserForFormal": "Formal and training triala are not allowed to add test users.", "TrialSiteUser_NoFormalUserForTest": "It is the test project that regular users are not allowed in.", @@ -465,7 +465,7 @@ "TrialConfig_UnconfirmedUNACKD": "This trial’s project configuration, & visit management have not been all confirmed, and its status cannot be changed", "TrialConfig_ProjectNotStarted": "This trial status is not “Ongoing”, and cannot be set to Stoped or Completed.", //TrialExternalUserService - "TrialExternalUser_Inconsistency": "The user's account name in the system is{0}, and there are inconsistent items with the filled information. Now modify the interface information to be consistent with the system and save it.", + "TrialExternalUser_Inconsistency": "The corresponding user of this email address is {0}, and the phone number is {1}. Please modify the inputted information and make it consistent with that already in the system, and then save.", "TrialExternalUser_EmailTypeDuplicate": "Please confirm that the system already has an account with the same email address and user type as the one entered in the list.", "TrialExternalUser_TestUserNotAllowed": "Formal and training trials are not allowed to add test users.", "TrialExternalUser_FormalUserNotAllowed": "It is a training trial that regular users are not allowed in.", @@ -571,14 +571,14 @@ // ------------------------------------------------------------Helper-------------------------------------------------------------------- //FileStoreHelper "FileStore_TemplateFileNotFound": "Database did not find the corresponding data template file for FileStoreHelper, please contact system maintenance personnel.", - "FileStore_TemplateFileStoragePathInvalid": "No corresponding file was found on the storage path for the data template file of FileStoreHelper, please contact system maintenance personnel.", + "FileStore_TemplateFileStoragePathInvalid": "File doesn’t exist. Please contact the system administrator!", //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.", // ------------------------------------------------------------IRaCIS.Core.Domain-------------------------------------------------------------------- //Trial - "Trial_number": "Subject ID is composed of 5 digits. The first 2 is the Site ID, and the following 3 is the order number. Please ensure it is identical to the ID from the EDC system. ", + "Trial_number": "Subject ID is composed of 5 digits. The first 2 are the Site ID, and the following 3 are the order number. Please ensure it is identical to the ID from the EDC system. ", // ------------------------------------------------------------IRaCIS.Core.Infrastructure-------------------------------------------------------------------- //ResponseOutput diff --git a/IRaCIS.Core.Application/Resources/zh-CN.json b/IRaCIS.Core.Application/Resources/zh-CN.json index 339ed9903..81fcacdc3 100644 --- a/IRaCIS.Core.Application/Resources/zh-CN.json +++ b/IRaCIS.Core.Application/Resources/zh-CN.json @@ -443,7 +443,7 @@ "TrialSiteSurvey_ViewAndConfirm": "查看并确认", //TrialSiteUserSurveyService "TrialSiteUser_Locked": "已锁定,不允许操作", - "TrialSiteUser_InconsistentInfo": "该用户在系统中账户名为：{0} ，与填写信息存在不一致项, 现将界面信息修改为与系统一致，可进行保存", + "TrialSiteUser_InconsistentInfo": "该邮件地址在系统中所对应的用户为 {0}, 电话号码是 {1}。请将所输入的信息修改为与系统一致后，再保存。", "TrialSiteUser_NoTestUserForFormal": "正式类型 、培训类型的项目 不允许加入测试用户", "TrialSiteUser_NoFormalUserForTest": "测试项目 不允许加入正式用户", @@ -465,7 +465,7 @@ "TrialConfig_UnconfirmedUNACKD": "该项目的项目配置、访视管理中，有未确认项，无法变更项目状态。", "TrialConfig_ProjectNotStarted": "项目没有进入启动状态，不能设置为停止或完成状态", //TrialExternalUserService - "TrialExternalUser_Inconsistency": "该用户在系统中的用户名为：{0} 电话：{1}，与填写信息存在不一致项, 请将界面信息修改为与系统一致，再进行保存", + "TrialExternalUser_Inconsistency": "该邮件地址在系统中所对应的用户为 {0}, 电话号码是 {1}。请将所输入的信息修改为与系统一致后，再保存。", "TrialExternalUser_EmailTypeDuplicate": "系统已经存在与列表中填写的邮箱和用户类型相同的账户，请确认。", "TrialExternalUser_TestUserNotAllowed": "正式类型 、培训类型的项目 不允许加入测试用户 ", "TrialExternalUser_FormalUserNotAllowed": "测试项目 不允许加入正式用户 ", @@ -571,7 +571,7 @@ // ------------------------------------------------------------Helper-------------------------------------------------------------------- //FileStoreHelper "FileStore_TemplateFileNotFound": "数据库没有找到对应的数据模板文件,请联系系统运维人员。", - "FileStore_TemplateFileStoragePathInvalid": "数据模板文件存储路径上未找对应文件,请联系系统运维人员。", + "FileStore_TemplateFileStoragePathInvalid": "文件不存在，请联系系统管理员！", //SendEmailHelper "SendEmail_SendFail": "邮件发送失败，您进行的操作未能成功，请检查邮箱或联系维护人员", "SendEmail_NoRecipient": "没有收件人", diff --git a/IRaCIS.Core.Application/Service/Fixed/CriterionAdditionalAssessment.cs b/IRaCIS.Core.Application/Service/Fixed/CriterionAdditionalAssessment.cs index 79d1115aa..2cb4b236a 100644 --- a/IRaCIS.Core.Application/Service/Fixed/CriterionAdditionalAssessment.cs +++ b/IRaCIS.Core.Application/Service/Fixed/CriterionAdditionalAssessment.cs @@ -70,7 +70,7 @@ namespace IRaCIS.Core.Application.Service IsJudgeQuestion=false, IsShowInDicom=false, GlobalReadingShowType=GlobalReadingShowType.NotShow, - QuestionEnName="Brain metastases present", + QuestionEnName="Brain Metastasis Present", QuestionName="存在脑转移", Type="radio", QuestionGenre=TableQuestionType.Dictionary, diff --git a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteUserSurveyService.cs b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteUserSurveyService.cs index f4957fe77..033ba2159 100644 --- a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteUserSurveyService.cs +++ b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteUserSurveyService.cs @@ -56,7 +56,7 @@ namespace IRaCIS.Core.Application.Contracts if (existSysUser.LastName != addOrEditTrialSiteUserSurvey.LastName || existSysUser.FirstName != addOrEditTrialSiteUserSurvey.FirstName) { //$"该用户在系统中账户名为：{existSysUser.LastName + " / " + existSysUser.FirstName} ，与填写信息存在不一致项, 现将界面信息修改为与系统一致，可进行保存" - return ResponseOutput.NotOk(_localizer["TrialSiteUser_InconsistentInfo", existSysUser.LastName + " / " + existSysUser.FirstName], + return ResponseOutput.NotOk(_localizer["TrialSiteUser_InconsistentInfo", existSysUser.LastName + " / " + existSysUser.FirstName,existSysUser.Phone], new { existSysUser.LastName, existSysUser.FirstName, existSysUser.Phone,existSysUser.IsTestUser,existSysUser.IsZhiZhun }, ApiResponseCodeEnum.NeedTips); } diff --git a/后端提示语.xlsx b/后端提示语.xlsx index a297c71ff..d08783def 100644 Binary files a/后端提示语.xlsx and b/后端提示语.xlsx differ