From a41824414e3c5e85011e82a95512cd8211ffc449 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Fri, 8 Mar 2024 13:37:21 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=82=AE=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Common/MailService.cs | 26 ++++++++++--------- .../SiteSurvey/TrialSiteSurveyService.cs | 11 ++++++-- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Common/MailService.cs b/IRaCIS.Core.Application/Service/Common/MailService.cs index 186a04542..52b13271d 100644 --- a/IRaCIS.Core.Application/Service/Common/MailService.cs +++ b/IRaCIS.Core.Application/Service/Common/MailService.cs @@ -57,9 +57,9 @@ namespace IRaCIS.Application.Services private readonly SystemEmailSendConfig _systemEmailConfig; + private string _companyShortName { get; set; } - - public MailVerificationService(IRepository verificationCodeRepository, + public MailVerificationService(IRepository verificationCodeRepository, IRepository systemBasicDatarepository, IRepository userRepository, ITokenService tokenService, @@ -81,6 +81,8 @@ namespace IRaCIS.Application.Services _userTypeRepository = userTypeRepository; _doctorTypeRepository = doctorTypeRepository; _distributedLockProvider = distributedLockProvider; + + _companyShortName = _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN; } @@ -105,7 +107,7 @@ namespace IRaCIS.Application.Services messageToSend.To.Add(new MailboxAddress(userName, emailAddress)); //主题 //---[来自展影IRC] 关于重置邮箱的提醒 - messageToSend.Subject = _localizer["Mail_EmailResetReminder"]; + messageToSend.Subject = _localizer["Mail_EmailResetReminder", _companyShortName]; var builder = new BodyBuilder(); @@ -171,7 +173,7 @@ namespace IRaCIS.Application.Services messageToSend.To.Add(new MailboxAddress(String.Empty, emailAddress)); //主题 //---[来自展影IRC] 关于重置密码的提醒 - messageToSend.Subject = _localizer["Mail_IRCResettingPassword"]; + messageToSend.Subject = _localizer["Mail_IRCResettingPassword", _companyShortName]; @@ -239,7 +241,7 @@ namespace IRaCIS.Application.Services messageToSend.To.Add(new MailboxAddress(String.Empty, emailAddress)); //主题 //---[来自展影IRC]的提醒 - messageToSend.Subject = _localizer["Mail_ImagingIRCReminder"]; + messageToSend.Subject = _localizer["Mail_ImagingIRCReminder", _companyShortName]; @@ -305,7 +307,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", _companyShortName, researchProgramNo]; @@ -325,7 +327,7 @@ namespace IRaCIS.Application.Services builder.HtmlBody = string.Format(ReplaceCompanyName(templateInfo), - "", + "Sir or Madam", //---您正在参与展影医疗IRC项目中心调研工作 _localizer["Mail_CenterResearchReminder"], verificationCode @@ -385,7 +387,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", _companyShortName]; @@ -441,7 +443,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", _companyShortName]; @@ -491,7 +493,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", _companyShortName, trialInfo.ResearchProgramNo]; @@ -555,7 +557,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", _companyShortName,trialInfo.ResearchProgramNo]; var builder = new BodyBuilder(); @@ -670,7 +672,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", _companyShortName, trialInfo.ResearchProgramNo]; var builder = new BodyBuilder(); diff --git a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs index 6403d929a..221d58fc7 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,14 @@ namespace IRaCIS.Core.Application.Contracts private readonly ITokenService _tokenService; private readonly IMailVerificationService _mailVerificationService; + private readonly SystemEmailSendConfig _systemEmailConfig; + + private string _companyShortName { get; set; } + 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 +59,8 @@ 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", _companyShortName, trialInfo.ResearchProgramNo]; var pathToFile = _hostEnvironment.WebRootPath + Path.DirectorySeparatorChar.ToString() From bba622da0ecf5c92d0b12f252e77f36bc650cc8d Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Fri, 8 Mar 2024 13:46:20 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IRaCIS.Core.Application.xml | 15 --------------- .../Service/Common/MailService.cs | 2 +- .../Service/SiteSurvey/TrialSiteSurveyService.cs | 2 ++ 3 files changed, 3 insertions(+), 16 deletions(-) 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 52b13271d..2478f958f 100644 --- a/IRaCIS.Core.Application/Service/Common/MailService.cs +++ b/IRaCIS.Core.Application/Service/Common/MailService.cs @@ -82,7 +82,7 @@ namespace IRaCIS.Application.Services _doctorTypeRepository = doctorTypeRepository; _distributedLockProvider = distributedLockProvider; - _companyShortName = _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN; + //_companyShortName = _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN; } diff --git a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs index 221d58fc7..f76a3ec50 100644 --- a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs +++ b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs @@ -61,6 +61,8 @@ namespace IRaCIS.Core.Application.Contracts _distributedLockProvider = distributedLockProvider; _systemEmailConfig = systemEmailConfig.CurrentValue; + + _companyShortName = _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN; } From bdcaf2f2be3bb10c438551a9e80cbbe38c92a9aa Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Fri, 8 Mar 2024 14:01:38 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=82=AE=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Common/MailService.cs | 22 +++++++++---------- .../SiteSurvey/TrialSiteSurveyService.cs | 4 +--- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Common/MailService.cs b/IRaCIS.Core.Application/Service/Common/MailService.cs index 2478f958f..a4f617d26 100644 --- a/IRaCIS.Core.Application/Service/Common/MailService.cs +++ b/IRaCIS.Core.Application/Service/Common/MailService.cs @@ -57,7 +57,7 @@ namespace IRaCIS.Application.Services private readonly SystemEmailSendConfig _systemEmailConfig; - private string _companyShortName { get; set; } + public MailVerificationService(IRepository verificationCodeRepository, IRepository systemBasicDatarepository, @@ -82,10 +82,10 @@ namespace IRaCIS.Application.Services _doctorTypeRepository = doctorTypeRepository; _distributedLockProvider = distributedLockProvider; - //_companyShortName = _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN; } + private string ReplaceCompanyName(string needDealtxt) { var str= needDealtxt.Replace("{company}", _userInfo.IsEn_Us ? _systemEmailConfig.CompanyName : _systemEmailConfig.CompanyNameCN) @@ -107,7 +107,7 @@ namespace IRaCIS.Application.Services messageToSend.To.Add(new MailboxAddress(userName, emailAddress)); //主题 //---[来自展影IRC] 关于重置邮箱的提醒 - messageToSend.Subject = _localizer["Mail_EmailResetReminder", _companyShortName]; + messageToSend.Subject = _localizer["Mail_EmailResetReminder", _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN]; var builder = new BodyBuilder(); @@ -173,7 +173,7 @@ namespace IRaCIS.Application.Services messageToSend.To.Add(new MailboxAddress(String.Empty, emailAddress)); //主题 //---[来自展影IRC] 关于重置密码的提醒 - messageToSend.Subject = _localizer["Mail_IRCResettingPassword", _companyShortName]; + messageToSend.Subject = _localizer["Mail_IRCResettingPassword", _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN]; @@ -241,7 +241,7 @@ namespace IRaCIS.Application.Services messageToSend.To.Add(new MailboxAddress(String.Empty, emailAddress)); //主题 //---[来自展影IRC]的提醒 - messageToSend.Subject = _localizer["Mail_ImagingIRCReminder", _companyShortName]; + messageToSend.Subject = _localizer["Mail_ImagingIRCReminder", _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN]; @@ -307,7 +307,7 @@ namespace IRaCIS.Application.Services messageToSend.To.Add(new MailboxAddress(String.Empty, emailAddress)); //主题 //$"[来自展影IRC] [{researchProgramNo}] 关于中心调研的提醒"; - messageToSend.Subject = _localizer["Mail_ProjectParticipationReminder", _companyShortName, researchProgramNo]; + messageToSend.Subject = _localizer["Mail_ProjectParticipationReminder", _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN, researchProgramNo]; @@ -387,7 +387,7 @@ namespace IRaCIS.Application.Services messageToSend.To.Add(new MailboxAddress(sysUserInfo.FullName, sysUserInfo.EMail)); //主题 //---[来自展影IRC] 关于创建账户的提醒 - messageToSend.Subject = _localizer["Mail_AccountCreationReminder", _companyShortName]; + messageToSend.Subject = _localizer["Mail_AccountCreationReminder", _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN]; @@ -443,7 +443,7 @@ namespace IRaCIS.Application.Services messageToSend.To.Add(new MailboxAddress(sysUserInfo.FullName, sysUserInfo.EMail)); //主题 //---[来自展影IRC] 关于重置账户密码的提醒 - messageToSend.Subject = _localizer["Mail_AccountPasswordResetReminder", _companyShortName]; + messageToSend.Subject = _localizer["Mail_AccountPasswordResetReminder", _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN]; @@ -493,7 +493,7 @@ namespace IRaCIS.Application.Services messageToSend.To.Add(new MailboxAddress(sysUserInfo.FullName, sysUserInfo.EMail)); //主题 // $"[来自展影IRC] [{trialInfo.ResearchProgramNo}]邀请信"; - messageToSend.Subject = _localizer["Mail_InvitationEmail", _companyShortName, trialInfo.ResearchProgramNo]; + messageToSend.Subject = _localizer["Mail_InvitationEmail", _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN, trialInfo.ResearchProgramNo]; @@ -557,7 +557,7 @@ namespace IRaCIS.Application.Services messageToSend.To.Add(new MailboxAddress(String.Empty, sysUserInfo.EMail)); //主题 // $"[来自展影IRC] [{trialInfo.ResearchProgramNo}]邀请信"; - messageToSend.Subject = _localizer["Mail_InvitationEmail", _companyShortName,trialInfo.ResearchProgramNo]; + messageToSend.Subject = _localizer["Mail_InvitationEmail", _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN,trialInfo.ResearchProgramNo]; var builder = new BodyBuilder(); @@ -672,7 +672,7 @@ namespace IRaCIS.Application.Services messageToSend.To.Add(new MailboxAddress(doctor.FullName, doctor.EMail)); //主题 // $"[来自展影IRC] [{trialInfo.ResearchProgramNo}]邀请信"; - messageToSend.Subject = _localizer["Mail_InvitationEmail", _companyShortName, 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/SiteSurvey/TrialSiteSurveyService.cs b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs index f76a3ec50..7033ada86 100644 --- a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs +++ b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs @@ -43,7 +43,6 @@ namespace IRaCIS.Core.Application.Contracts private readonly SystemEmailSendConfig _systemEmailConfig; - private string _companyShortName { get; set; } public TrialSiteSurveyService(IRepository trialSiteSurveyRepository, IRepository trialUserRepository, IRepository trialSiteUserSurveyRepository, IRepository userRepository, IRepository trialSiteRepository, @@ -62,7 +61,6 @@ namespace IRaCIS.Core.Application.Contracts _systemEmailConfig = systemEmailConfig.CurrentValue; - _companyShortName = _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN; } @@ -616,7 +614,7 @@ namespace IRaCIS.Core.Application.Contracts //主题 // $"[来自展影IRC] [{trialInfo.ResearchProgramNo}] 关于中心调研审批的提醒"; - messageToSend.Subject = _localizer["TrialSiteSurvey_IRCNotification", _companyShortName, trialInfo.ResearchProgramNo]; + messageToSend.Subject = _localizer["TrialSiteSurvey_IRCNotification", _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN, trialInfo.ResearchProgramNo]; var pathToFile = _hostEnvironment.WebRootPath + Path.DirectorySeparatorChar.ToString() From d35046b277213988fbd02dd98d71653378deaa1d Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Fri, 8 Mar 2024 14:45:13 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Service/Common/MailService.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Common/MailService.cs b/IRaCIS.Core.Application/Service/Common/MailService.cs index a4f617d26..080303bde 100644 --- a/IRaCIS.Core.Application/Service/Common/MailService.cs +++ b/IRaCIS.Core.Application/Service/Common/MailService.cs @@ -260,9 +260,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 ); } @@ -329,7 +329,7 @@ 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 ); } From 38f319b425219e35b91b15a17d132381d15f098b Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Fri, 8 Mar 2024 15:36:10 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BF=E8=A7=86?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Service/Common/MailService.cs | 3 --- IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Common/MailService.cs b/IRaCIS.Core.Application/Service/Common/MailService.cs index 080303bde..41cd0b2fc 100644 --- a/IRaCIS.Core.Application/Service/Common/MailService.cs +++ b/IRaCIS.Core.Application/Service/Common/MailService.cs @@ -71,9 +71,6 @@ namespace IRaCIS.Application.Services _systemEmailConfig = systemEmailConfig.CurrentValue; _verificationCodeRepository = verificationCodeRepository; _systemBasicDatarepository = systemBasicDatarepository; - - - _tokenService = tokenService; _userRepository = userRepository; _trialRepository = trialRepository; 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(); From fdba16de86fc1c93409c6aa8757860ae61ae1ef2 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Fri, 8 Mar 2024 16:05:52 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Service/Management/UserTypeService.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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(); }