diff --git a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs index a58d864f8..ca144f0c6 100644 --- a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs +++ b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs @@ -730,7 +730,8 @@ namespace IRaCIS.Core.Application.Service.Common if (criterion.CriterionType != CriterionType.RECIST1Point1) { - throw new Exception("当前标准导出还未支持"); + //---当前标准导出还未支持 + throw new Exception(_localizer["ExcelExport_UnsupportedExport"]); } //产生一致性分析的Subject @@ -811,7 +812,8 @@ namespace IRaCIS.Core.Application.Service.Common if (criterion.CriterionType != CriterionType.RECIST1Point1) { - throw new Exception("当前标准导出还未支持"); +//---当前标准导出还未支持 + throw new Exception(_localizer["ExcelExport_UnsupportedExport"]); } //产生组间一致性分析的Subject @@ -978,7 +980,8 @@ namespace IRaCIS.Core.Application.Service.Common if (criterion.CriterionType != CriterionType.RECIST1Point1 && criterion.CriterionType != CriterionType.PCWG3) { - throw new Exception("当前标准导出还未支持"); +//---当前标准导出还未支持 + throw new Exception(_localizer["ExcelExport_UnsupportedExport"]); } var list = await _repository.Where(t => t.TrialId == queryVisitTask.TrialId && t.TaskState == TaskState.Effect && t.IsAnalysisCreate == false && t.ReadingTaskState == ReadingTaskState.HaveSigned) @@ -1068,7 +1071,8 @@ namespace IRaCIS.Core.Application.Service.Common else { - throw new Exception("当前标准导出还未支持"); +//---当前标准导出还未支持 + throw new Exception(_localizer["ExcelExport_UnsupportedExport"]); } @@ -1184,7 +1188,8 @@ namespace IRaCIS.Core.Application.Service.Common else { - throw new Exception("当前标准导出还未支持"); +//---当前标准导出还未支持 + throw new Exception(_localizer["ExcelExport_UnsupportedExport"]); } diff --git a/IRaCIS.Core.Application/Service/Common/MailService.cs b/IRaCIS.Core.Application/Service/Common/MailService.cs index cdd1685d2..2fb174888 100644 --- a/IRaCIS.Core.Application/Service/Common/MailService.cs +++ b/IRaCIS.Core.Application/Service/Common/MailService.cs @@ -37,7 +37,7 @@ namespace IRaCIS.Application.Services } - public class MailVerificationService : IMailVerificationService + public class MailVerificationService : BaseService, IMailVerificationService { private readonly IRepository _verificationCodeRepository; @@ -100,7 +100,8 @@ namespace IRaCIS.Application.Services //收件地址 messageToSend.To.Add(new MailboxAddress(userName, emailAddress)); //主题 - messageToSend.Subject = "[来自展影IRC] 关于重置邮箱的提醒"; + //---[来自展影IRC] 关于重置邮箱的提醒 + messageToSend.Subject = _localizer["Mail_EmailResetReminder"]; var builder = new BodyBuilder(); @@ -117,8 +118,11 @@ namespace IRaCIS.Application.Services builder.HtmlBody = string.Format(templateInfo, - $" 尊敬的 {userName} , ", - "您正在进行邮箱重置操作", + + //---尊敬的 + _localizer["Mail_Dear", userName], + //---您正在进行邮箱重置操作 + _localizer["Mail_ResettingEmail"], verificationCode ); } @@ -161,7 +165,8 @@ namespace IRaCIS.Application.Services //收件地址 messageToSend.To.Add(new MailboxAddress(String.Empty, emailAddress)); //主题 - messageToSend.Subject = "[来自展影IRC] 关于重置密码的提醒"; + //---[来自展影IRC] 关于重置密码的提醒 + messageToSend.Subject = _localizer["Mail_IRCResettingPassword "]; @@ -180,7 +185,8 @@ namespace IRaCIS.Application.Services builder.HtmlBody = string.Format(templateInfo, "", - "您正在进行邮箱重置密码操作", + //---您正在进行邮箱重置密码操作 + _localizer["Mail_ResettingPassword "], verificationCode ); } @@ -226,7 +232,8 @@ namespace IRaCIS.Application.Services //收件地址 messageToSend.To.Add(new MailboxAddress(String.Empty, emailAddress)); //主题 - messageToSend.Subject = $"[来自展影IRC]的提醒"; + //---[来自展影IRC]的提醒 + messageToSend.Subject = _localizer["Mail_ImagingIRCReminder"]; @@ -246,7 +253,8 @@ namespace IRaCIS.Application.Services builder.HtmlBody = string.Format(templateInfo, "", - "您正在参与展影医疗IRC项目", + //---您正在参与展影医疗IRC项目 + _localizer["Mail_IRCProject"], verificationCode ); } @@ -290,7 +298,8 @@ namespace IRaCIS.Application.Services //收件地址 messageToSend.To.Add(new MailboxAddress(String.Empty, emailAddress)); //主题 - messageToSend.Subject = $"[来自展影IRC] [{researchProgramNo}] 关于中心调研的提醒"; + //$"[来自展影IRC] [{researchProgramNo}] 关于中心调研的提醒"; + messageToSend.Subject = _localizer["Mail_ProjectParticipationReminder", researchProgramNo]; @@ -310,7 +319,8 @@ namespace IRaCIS.Application.Services builder.HtmlBody = string.Format(templateInfo, "", - "您正在参与展影医疗IRC项目中心调研工作", + //---您正在参与展影医疗IRC项目中心调研工作 + _localizer["Mail_CenterResearchReminder"], verificationCode ); } @@ -367,7 +377,8 @@ namespace IRaCIS.Application.Services //收件地址 messageToSend.To.Add(new MailboxAddress(sysUserInfo.FullName, sysUserInfo.EMail)); //主题 - messageToSend.Subject = "[来自展影IRC] 关于创建账户的提醒"; + //---[来自展影IRC] 关于创建账户的提醒 + messageToSend.Subject = _localizer["Mail_AccountCreationReminder"]; @@ -421,7 +432,8 @@ namespace IRaCIS.Application.Services //收件地址 messageToSend.To.Add(new MailboxAddress(sysUserInfo.FullName, sysUserInfo.EMail)); //主题 - messageToSend.Subject = "[来自展影IRC] 关于重置账户密码的提醒"; + //---[来自展影IRC] 关于重置账户密码的提醒 + messageToSend.Subject = _localizer["Mail_AccountPasswordResetReminder"]; @@ -469,7 +481,8 @@ namespace IRaCIS.Application.Services //收件地址 messageToSend.To.Add(new MailboxAddress(sysUserInfo.FullName, sysUserInfo.EMail)); //主题 - messageToSend.Subject = $"[来自展影IRC] [{trialInfo.ResearchProgramNo}]邀请信"; + // $"[来自展影IRC] [{trialInfo.ResearchProgramNo}]邀请信"; + messageToSend.Subject = _localizer["Mail_InvitationEmail", trialInfo.ResearchProgramNo]; @@ -532,7 +545,8 @@ namespace IRaCIS.Application.Services //收件地址 messageToSend.To.Add(new MailboxAddress(String.Empty, sysUserInfo.EMail)); //主题 - messageToSend.Subject = $"[来自展影IRC] [{trialInfo.ResearchProgramNo}]邀请信"; + // $"[来自展影IRC] [{trialInfo.ResearchProgramNo}]邀请信"; + messageToSend.Subject = _localizer["Mail_InvitationEmail", trialInfo.ResearchProgramNo]; var builder = new BodyBuilder(); @@ -644,7 +658,8 @@ namespace IRaCIS.Application.Services //收件地址 messageToSend.To.Add(new MailboxAddress(doctor.FullName, doctor.EMail)); //主题 - messageToSend.Subject = $"[来自展影IRC] [{trialInfo.ResearchProgramNo}]邀请信"; + // $"[来自展影IRC] [{trialInfo.ResearchProgramNo}]邀请信"; + messageToSend.Subject = _localizer["Mail_InvitationEmail", trialInfo.ResearchProgramNo]; var builder = new BodyBuilder(); @@ -701,4 +716,4 @@ namespace IRaCIS.Application.Services } -} \ No newline at end of file +} diff --git a/IRaCIS.Core.Application/Service/Doctor/DoctorService.cs b/IRaCIS.Core.Application/Service/Doctor/DoctorService.cs index 1244af694..2cd00e8eb 100644 --- a/IRaCIS.Core.Application/Service/Doctor/DoctorService.cs +++ b/IRaCIS.Core.Application/Service/Doctor/DoctorService.cs @@ -431,7 +431,8 @@ namespace IRaCIS.Application.Services .Select(u => u.Type).ToListAsync(); if (auditResumeParam.ResumeStatus == ResumeStatusEnum.Pass && ((!attachmentList.Contains("Resume")) || (!attachmentList.Contains("Consultant Agreement")))) { - return ResponseOutput.NotOk("Resume & Consultant Agreement must be upload "); + //---Resume & Consultant Agreement must be upload + return ResponseOutput.NotOk(_localizer["Doctor_RequiredDocumentsError"]); } var success = await _doctorRepository.BatchUpdateNoTrackingAsync(o => o.Id == auditResumeParam.Id, u => new Doctor() { diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs index 8cf435bfd..2828e69ec 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs @@ -784,6 +784,15 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate QuestionMark.State, }; + if (taskinfo.IsConvertedTask) + { + notNeedCopyMarks = new List() + { + QuestionMark.MajorAxis, + QuestionMark.ShortAxis, + }; + } + var tableAnswers = copyTableAnswers.Select(x => new ReadingTableQuestionAnswer { Id = NewId.NextGuid(),