diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 906800b7f..75c136afd 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -5212,21 +5212,6 @@ 来自于哪个标记 - - - InstanceId - - - - - SeriesId - - - - - StudyId - - 问题标识 diff --git a/IRaCIS.Core.Application/Service/Common/MailService.cs b/IRaCIS.Core.Application/Service/Common/MailService.cs index 186a04542..41cd0b2fc 100644 --- a/IRaCIS.Core.Application/Service/Common/MailService.cs +++ b/IRaCIS.Core.Application/Service/Common/MailService.cs @@ -59,7 +59,7 @@ namespace IRaCIS.Application.Services - public MailVerificationService(IRepository verificationCodeRepository, + public MailVerificationService(IRepository verificationCodeRepository, IRepository systemBasicDatarepository, IRepository userRepository, ITokenService tokenService, @@ -71,9 +71,6 @@ namespace IRaCIS.Application.Services _systemEmailConfig = systemEmailConfig.CurrentValue; _verificationCodeRepository = verificationCodeRepository; _systemBasicDatarepository = systemBasicDatarepository; - - - _tokenService = tokenService; _userRepository = userRepository; _trialRepository = trialRepository; @@ -81,9 +78,11 @@ namespace IRaCIS.Application.Services _userTypeRepository = userTypeRepository; _doctorTypeRepository = doctorTypeRepository; _distributedLockProvider = distributedLockProvider; + } + private string ReplaceCompanyName(string needDealtxt) { var str= needDealtxt.Replace("{company}", _userInfo.IsEn_Us ? _systemEmailConfig.CompanyName : _systemEmailConfig.CompanyNameCN) @@ -105,7 +104,7 @@ namespace IRaCIS.Application.Services messageToSend.To.Add(new MailboxAddress(userName, emailAddress)); //主题 //---[来自展影IRC] 关于重置邮箱的提醒 - messageToSend.Subject = _localizer["Mail_EmailResetReminder"]; + messageToSend.Subject = _localizer["Mail_EmailResetReminder", _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN]; var builder = new BodyBuilder(); @@ -171,7 +170,7 @@ namespace IRaCIS.Application.Services messageToSend.To.Add(new MailboxAddress(String.Empty, emailAddress)); //主题 //---[来自展影IRC] 关于重置密码的提醒 - messageToSend.Subject = _localizer["Mail_IRCResettingPassword"]; + messageToSend.Subject = _localizer["Mail_IRCResettingPassword", _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN]; @@ -239,7 +238,7 @@ namespace IRaCIS.Application.Services messageToSend.To.Add(new MailboxAddress(String.Empty, emailAddress)); //主题 //---[来自展影IRC]的提醒 - messageToSend.Subject = _localizer["Mail_ImagingIRCReminder"]; + messageToSend.Subject = _localizer["Mail_ImagingIRCReminder", _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN]; @@ -258,9 +257,9 @@ namespace IRaCIS.Application.Services builder.HtmlBody = string.Format(ReplaceCompanyName(templateInfo), - "", + "Sir or Madam", //---您正在参与展影医疗IRC项目 - _localizer["Mail_IRCProject"], + _localizer["Mail_IRCProject", _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN], verificationCode ); } @@ -305,7 +304,7 @@ namespace IRaCIS.Application.Services messageToSend.To.Add(new MailboxAddress(String.Empty, emailAddress)); //主题 //$"[来自展影IRC] [{researchProgramNo}] 关于中心调研的提醒"; - messageToSend.Subject = _localizer["Mail_ProjectParticipationReminder", researchProgramNo]; + messageToSend.Subject = _localizer["Mail_ProjectParticipationReminder", _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN, researchProgramNo]; @@ -325,9 +324,9 @@ namespace IRaCIS.Application.Services builder.HtmlBody = string.Format(ReplaceCompanyName(templateInfo), - "", + "Sir or Madam", //---您正在参与展影医疗IRC项目中心调研工作 - _localizer["Mail_CenterResearchReminder"], + _localizer["Mail_CenterResearchReminder", _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN], verificationCode ); } @@ -385,7 +384,7 @@ namespace IRaCIS.Application.Services messageToSend.To.Add(new MailboxAddress(sysUserInfo.FullName, sysUserInfo.EMail)); //主题 //---[来自展影IRC] 关于创建账户的提醒 - messageToSend.Subject = _localizer["Mail_AccountCreationReminder"]; + messageToSend.Subject = _localizer["Mail_AccountCreationReminder", _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN]; @@ -441,7 +440,7 @@ namespace IRaCIS.Application.Services messageToSend.To.Add(new MailboxAddress(sysUserInfo.FullName, sysUserInfo.EMail)); //主题 //---[来自展影IRC] 关于重置账户密码的提醒 - messageToSend.Subject = _localizer["Mail_AccountPasswordResetReminder"]; + messageToSend.Subject = _localizer["Mail_AccountPasswordResetReminder", _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN]; @@ -491,7 +490,7 @@ namespace IRaCIS.Application.Services messageToSend.To.Add(new MailboxAddress(sysUserInfo.FullName, sysUserInfo.EMail)); //主题 // $"[来自展影IRC] [{trialInfo.ResearchProgramNo}]邀请信"; - messageToSend.Subject = _localizer["Mail_InvitationEmail", trialInfo.ResearchProgramNo]; + messageToSend.Subject = _localizer["Mail_InvitationEmail", _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN, trialInfo.ResearchProgramNo]; @@ -555,7 +554,7 @@ namespace IRaCIS.Application.Services messageToSend.To.Add(new MailboxAddress(String.Empty, sysUserInfo.EMail)); //主题 // $"[来自展影IRC] [{trialInfo.ResearchProgramNo}]邀请信"; - messageToSend.Subject = _localizer["Mail_InvitationEmail", trialInfo.ResearchProgramNo]; + messageToSend.Subject = _localizer["Mail_InvitationEmail", _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN,trialInfo.ResearchProgramNo]; var builder = new BodyBuilder(); @@ -670,7 +669,7 @@ namespace IRaCIS.Application.Services messageToSend.To.Add(new MailboxAddress(doctor.FullName, doctor.EMail)); //主题 // $"[来自展影IRC] [{trialInfo.ResearchProgramNo}]邀请信"; - messageToSend.Subject = _localizer["Mail_InvitationEmail", trialInfo.ResearchProgramNo]; + messageToSend.Subject = _localizer["Mail_InvitationEmail", _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN, trialInfo.ResearchProgramNo]; var builder = new BodyBuilder(); diff --git a/IRaCIS.Core.Application/Service/Management/UserTypeService.cs b/IRaCIS.Core.Application/Service/Management/UserTypeService.cs index c3553372b..d1c443800 100644 --- a/IRaCIS.Core.Application/Service/Management/UserTypeService.cs +++ b/IRaCIS.Core.Application/Service/Management/UserTypeService.cs @@ -151,7 +151,7 @@ namespace IRaCIS.Core.Application.Contracts var query = _userTypeRepository.Where(x => x.UserTypeEnum != UserTypeEnum.SuperAdmin) .WhereIf(userTypeSelectEnum != UserTypeSelectEnum.None, t => userTypeEnums.Contains(t.UserTypeEnum)) - .OrderBy(t => t.Order).ProjectTo(_mapper.ConfigurationProvider); + .OrderBy(t => t.UserTypeShortName).ProjectTo(_mapper.ConfigurationProvider); return await query.ToListAsync(); } @@ -168,7 +168,7 @@ namespace IRaCIS.Core.Application.Contracts { var query = _userTypeRepository.Where(x => x.UserTypeEnum != UserTypeEnum.SuperAdmin) .Where(t => !t.UserTypeGroupList.Any(t=> t.Group.Code=="3")) - .OrderBy(t => t.Order).ProjectTo(_mapper.ConfigurationProvider); + .OrderBy(t => t.UserTypeShortName).ProjectTo(_mapper.ConfigurationProvider); return await query.ToListAsync(); } diff --git a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs index 6403d929a..7033ada86 100644 --- a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs +++ b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs @@ -21,6 +21,7 @@ using DocumentFormat.OpenXml.Spreadsheet; using IRaCIS.Core.Domain.Models; using IRaCIS.Core.Application.ViewModel; using Medallion.Threading; +using Microsoft.Extensions.Options; namespace IRaCIS.Core.Application.Contracts { @@ -40,10 +41,13 @@ namespace IRaCIS.Core.Application.Contracts private readonly ITokenService _tokenService; private readonly IMailVerificationService _mailVerificationService; + private readonly SystemEmailSendConfig _systemEmailConfig; + + public TrialSiteSurveyService(IRepository trialSiteSurveyRepository, IRepository trialUserRepository, IRepository trialSiteUserSurveyRepository, IRepository userRepository, IRepository trialSiteRepository, ITokenService tokenService, - IMailVerificationService mailVerificationService, IRepository trialSiteUserRepository, IDistributedLockProvider distributedLockProvider) + IMailVerificationService mailVerificationService, IRepository trialSiteUserRepository, IDistributedLockProvider distributedLockProvider, IOptionsMonitor systemEmailConfig) { _trialSiteSurveyRepository = trialSiteSurveyRepository; _trialSiteUserSurveyRepository = trialSiteUserSurveyRepository; @@ -54,6 +58,9 @@ namespace IRaCIS.Core.Application.Contracts _mailVerificationService = mailVerificationService; _trialSiteUserRepository = trialSiteUserRepository; _distributedLockProvider = distributedLockProvider; + + _systemEmailConfig = systemEmailConfig.CurrentValue; + } @@ -607,7 +614,7 @@ namespace IRaCIS.Core.Application.Contracts //主题 // $"[来自展影IRC] [{trialInfo.ResearchProgramNo}] 关于中心调研审批的提醒"; - messageToSend.Subject = _localizer["TrialSiteSurvey_IRCNotification", trialInfo.ResearchProgramNo]; + messageToSend.Subject = _localizer["TrialSiteSurvey_IRCNotification", _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN, trialInfo.ResearchProgramNo]; var pathToFile = _hostEnvironment.WebRootPath + Path.DirectorySeparatorChar.ToString() diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs index 224094ec1..e1452059b 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs @@ -215,8 +215,8 @@ namespace IRaCIS.Application.Services await _repository.AddAsync(new TrialPaymentPrice() { TrialId = trial.Id }); //添加访视 - await _repository.AddAsync(new VisitStage { TrialId = trial.Id, VisitNum = 0, BlindName = "B" + 0.ToString("D3"), VisitDay = 0, VisitName = "Baseline", IsBaseLine = true }); - await _repository.AddAsync(new VisitStage { TrialId = trial.Id, VisitNum = 1, BlindName = "B" + 10.ToString("D3"), VisitDay = 30, VisitName = "Visit 1" }); + await _repository.AddAsync(new VisitStage { TrialId = trial.Id, VisitNum = 0, BlindName = "B" + 0.ToString("D3"), VisitDay = 0, VisitName = "Baseline", IsBaseLine = true,VisitWindowLeft=-28,VisitWindowRight=0 }); + await _repository.AddAsync(new VisitStage { TrialId = trial.Id, VisitNum = 1, BlindName = "B" + 10.ToString("D3"), VisitDay = 30, VisitName = "Visit 1", VisitWindowLeft = -3, VisitWindowRight = 3 }); var success = await _repository.SaveChangesAsync();