From b12877e39bae13f77025089e1879b1e7c842bb80 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 18 Dec 2024 11:16:05 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs index d8b22a1fa..0b834efa9 100644 --- a/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs +++ b/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs @@ -234,7 +234,7 @@ namespace IRaCIS.Core.Application.Contracts.DTO { if (!ClosedTime.HasValue) return ""; - else return string.Format("{0}Days{1}Hours{2}Minutes", (ClosedTime - CreateTime)?.Days, (ClosedTime - CreateTime)?.Hours, (ClosedTime - CreateTime)?.Minutes); + else return string.Format("{0}d {1}h {2}m", (ClosedTime - CreateTime)?.Days, (ClosedTime - CreateTime)?.Hours, (ClosedTime - CreateTime)?.Minutes); } } From 3b28e13fd89aac630cb686a441202414d53e0857 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 18 Dec 2024 11:32:58 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs index cbc90c609..418c6f4d6 100644 --- a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs +++ b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs @@ -1755,7 +1755,7 @@ namespace IRaCIS.Core.Application.Contracts { if (!ClosedTime.HasValue) return ""; - else return string.Format("{0}d {1}h {2}min", (ClosedTime - CreateTime)?.Days, (ClosedTime - CreateTime)?.Hours, (ClosedTime - CreateTime)?.Minutes); + else return string.Format("{0}d {1}h {2}m", (ClosedTime - CreateTime)?.Days, (ClosedTime - CreateTime)?.Hours, (ClosedTime - CreateTime)?.Minutes); } } From 496396fa6b03c3bb3c731515cdb82416b4db2367 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 18 Dec 2024 13:36:52 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E7=9A=84=E6=9C=BA=E6=9E=84=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/ImageAndDoc/DTO/DicomStudyModel.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomStudyModel.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomStudyModel.cs index 0e759fafd..eea51dc7d 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomStudyModel.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomStudyModel.cs @@ -37,7 +37,7 @@ public bool SoftDelete { get; set; } = false; - public string InstitutionName { get; set; } = string.Empty; + //public string InstitutionName { get; set; } = string.Empty; public string PatientId { get; set; } = string.Empty; public string PatientName { get; set; } = string.Empty; public string PatientAge { get; set; } = string.Empty; From 8656ed09bb36b97e52b283067194bae95606b165 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Fri, 3 Jan 2025 10:52:34 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9PM=20=E7=94=B3=E5=AE=A1?= =?UTF-8?q?=E6=89=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Allocation/VisitTaskService.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs index b3050e104..861c3358d 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs @@ -1334,7 +1334,7 @@ public class VisitTaskService(IRepository _visitTaskRepository, throw new BusinessValidationFailedException(_localizer["VisitTask_BackendData"]); } - _logger.LogError("重阅申请状态"+ (int)task.ReReadingApplyState); + _logger.LogError("重阅申请状态" + (int)task.ReReadingApplyState); if (task.ReReadingApplyState == ReReadingApplyState.DocotorHaveApplyed || task.ReReadingApplyState == ReReadingApplyState.TrialGroupHaveApplyed || task.ReReadingApplyState == ReReadingApplyState.Agree) { @@ -2556,7 +2556,7 @@ public class VisitTaskService(IRepository _visitTaskRepository, private bool IsSpmOrCPM() { - return _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SPM || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.CPM; + return _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SPM || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.CPM || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager; } /// From c62086f8e8cccac7805e44151dff660ad08eb45a Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Fri, 3 Jan 2025 13:20:22 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E6=92=A4=E5=9B=9E=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs index 861c3358d..88cda7c9e 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs @@ -2556,7 +2556,7 @@ public class VisitTaskService(IRepository _visitTaskRepository, private bool IsSpmOrCPM() { - return _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SPM || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.CPM || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager; + return _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SPM || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.CPM ; } /// From 63919c8f6b723c73bab10057cbb57a8a35ea8299 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 16 Jan 2025 15:13:58 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/TestService.cs | 1 - .../Common/AuditingData.cs | 51 +++++++++---------- 2 files changed, 23 insertions(+), 29 deletions(-) diff --git a/IRaCIS.Core.Application/TestService.cs b/IRaCIS.Core.Application/TestService.cs index 02ce983d3..99e28458e 100644 --- a/IRaCIS.Core.Application/TestService.cs +++ b/IRaCIS.Core.Application/TestService.cs @@ -161,7 +161,6 @@ namespace IRaCIS.Core.Application.Service /// public async Task UserMutiAccount([FromServices] IRepository _identityUserRepository) { - _userInfo.IsNotNeedInspection = true; if ((await _identityUserRepository.FirstOrDefaultAsync()) == null) { diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index b05bc360a..d8618ad05 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs @@ -1735,13 +1735,11 @@ namespace IRaCIS.Core.Infra.EFCore.Common var entity = item.Entity as IdentityUser; - if (!_userInfo.IsNotNeedInspection) - { + await InsertInspection(entity, type, x => new InspectionConvertDTO { IsDistinctionInterface = type == AuditOpt.Update ? true : false, }); - } } // 项目参与人员 @@ -1753,33 +1751,30 @@ namespace IRaCIS.Core.Infra.EFCore.Common var identityUser = await _dbContext.IdentityUser.AsNoTracking().Where(x => x.Id == entity.IdentityUserId).FirstOrDefaultAsync(); - //if (type == AuditOpt.Update) - //{ - // extraIndentification = "/" + entity.IsDeleted.ToString(); - //} - - - //var user = await _dbContext.Users.Include(x => x.UserTypeRole).FirstOrDefaultAsync(x => x.Id == entity.UserId); - await InsertInspection(entity, type, x => new InspectionConvertDTO - { - //IsDistinctionInterface = true , - TrialId = x.TrialId, - IsDistinctionInterface=false, - ObjectRelationParentId = x.TrialId, - ExtraIndentification = extraIndentification, - //ObjectRelationParentId2 = x.IdentityUserId, - }, new + // 变更维护数据，会维护数据，不能插入稽查 + if (_userInfo.IsNotNeedInspection == false) { + await InsertInspection(entity, type, x => new InspectionConvertDTO + { + //IsDistinctionInterface = true , + TrialId = x.TrialId, + IsDistinctionInterface = false, + ObjectRelationParentId = x.TrialId, + ExtraIndentification = extraIndentification, + //ObjectRelationParentId2 = x.IdentityUserId, + }, new + { - identityUser.FullName, - identityUser.EMail, - identityUser.Code, - identityUser.UserCode, - identityUser.UserName, - identityUser.DepartmentName, - identityUser.Phone, - identityUser.OrganizationName, - }); + identityUser.FullName, + identityUser.EMail, + identityUser.Code, + identityUser.UserCode, + identityUser.UserName, + identityUser.DepartmentName, + identityUser.Phone, + identityUser.OrganizationName, + }); + } } // 项目人员 From 36f0e203407ef4df4f9f1aa7cf355d7b1f5c91ba Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 16 Jan 2025 16:51:58 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Domain/TrialSiteUser/TrialUser.cs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/IRaCIS.Core.Domain/TrialSiteUser/TrialUser.cs b/IRaCIS.Core.Domain/TrialSiteUser/TrialUser.cs index 74dc28502..992e821af 100644 --- a/IRaCIS.Core.Domain/TrialSiteUser/TrialUser.cs +++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialUser.cs @@ -19,15 +19,20 @@ public class TrialUserRole : BaseFullDeleteAuditEntity #endregion + [Comment("这里实际是UserRoleId")] public Guid UserId { get; set; } public Guid TrialId { get; set; } - public DateTime? RemoveTime { get; set; } - - public DateTime? JoinTime { get; set; } public Guid TrialUserId { get; set; } + + #region 下个版本删除 + public DateTime? RemoveTime { get; set; } + + public DateTime? JoinTime { get; set; } + #endregion + } From 07f1511bb9e73204299e1af11c38f264e5d4df47 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 16 Jan 2025 17:48:39 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/SiteSurvey/DTO/TrialSiteUserSurveyViewModel.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/SiteSurvey/DTO/TrialSiteUserSurveyViewModel.cs b/IRaCIS.Core.Application/Service/SiteSurvey/DTO/TrialSiteUserSurveyViewModel.cs index 923e6f585..9310e0182 100644 --- a/IRaCIS.Core.Application/Service/SiteSurvey/DTO/TrialSiteUserSurveyViewModel.cs +++ b/IRaCIS.Core.Application/Service/SiteSurvey/DTO/TrialSiteUserSurveyViewModel.cs @@ -146,7 +146,7 @@ namespace IRaCIS.Core.Application.Contracts public string Phone { get; set; } = string.Empty; public string OrganizationName { get; set; } = string.Empty; - [ExcelColumnName("UserType")] + [ExcelColumnName("Role")] public string UserTypeStr { get; set; } [JsonIgnore] From 7b7723426ba1374c2d889743ca2dca9cdc072278 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Fri, 17 Jan 2025 10:17:15 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=95=B0=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/TrialSiteUser/PersonalWorkstation.cs | 4 ++-- .../VisitTaskIsFrontTaskNeedSignButNotSignTrigger.cs | 2 +- IRaCIS.Core.Domain/Allocation/VisitTask.cs | 6 +++++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs index fdb3e34bb..36045e187 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs @@ -1178,7 +1178,7 @@ namespace IRaCIS.Core.Application var record = new UserToBeDoneRecord() { - IsFirstSysDocNeedSign= isfirstSysDocNeedSign, + IsFirstSysDocNeedSign = isfirstSysDocNeedSign, IsHaveSysDocNeedNeedSign = needSignSysDocCont > 0, //TrialNeedSignList= trialNeedSignList, @@ -1406,7 +1406,7 @@ namespace IRaCIS.Core.Application Sponsor = _userInfo.IsEn_Us ? t.Sponsor.SponsorName : t.Sponsor.SponsorNameCN, TrialStatusStr = t.TrialStatusStr, - ExpetiedTaskCount = isPM ? t.VisitTaskList.Where(t => t.IsUrgent).Count() : 0, + ExpetiedTaskCount = isPM ? t.VisitTaskList.Where(t => t.IsUrgent && t.IsAnalysisCreate==false && (t.TaskState == TaskState.Effect || t.TaskState == TaskState.Freeze)).Count() : 0, ReReadingApprovalCount = isPM ? t.VisitTaskReReadingList.Where(t => t.OriginalReReadingTask.ReReadingApplyState == ReReadingApplyState.DocotorHaveApplyed).Count() : 0, diff --git a/IRaCIS.Core.Application/Triggers/AfterSaveTrigger/VisitTaskIsFrontTaskNeedSignButNotSignTrigger.cs b/IRaCIS.Core.Application/Triggers/AfterSaveTrigger/VisitTaskIsFrontTaskNeedSignButNotSignTrigger.cs index 7c5136458..fb328e4b6 100644 --- a/IRaCIS.Core.Application/Triggers/AfterSaveTrigger/VisitTaskIsFrontTaskNeedSignButNotSignTrigger.cs +++ b/IRaCIS.Core.Application/Triggers/AfterSaveTrigger/VisitTaskIsFrontTaskNeedSignButNotSignTrigger.cs @@ -30,7 +30,7 @@ namespace IRaCIS.Core.Application.Triggers } else { - //访视类型的任务 不影响肿瘤学任务的临床数据状态 + //访视类型、全局的任务 不影响肿瘤学任务的临床数据状态 visitTaskLambda = visitTaskLambda.And(x => x.ArmEnum != Arm.TumorArm); } diff --git a/IRaCIS.Core.Domain/Allocation/VisitTask.cs b/IRaCIS.Core.Domain/Allocation/VisitTask.cs index eb955eee8..88b2a3322 100644 --- a/IRaCIS.Core.Domain/Allocation/VisitTask.cs +++ b/IRaCIS.Core.Domain/Allocation/VisitTask.cs @@ -193,7 +193,11 @@ public class VisitTask : BaseFullAuditEntity [Comment("在裁判任务上记录 裁判结果的任务ID（访视或者全局）")] public Guid? JudgeResultTaskId { get; set; } - [Comment("随访任务号 取访视的号 计划外是 访视+0.1 裁判任务在访视任务上+0.002 全局任务在截止访视号上+0.03 肿瘤待定")] + + + [Comment("随访任务号 取访视的号 计划外是 访视+0.1 裁判任务在访视任务上+0.02 全局任务在截止访视号上+0.03 肿瘤0.06")] + + [DecimalPrecision(18,2)] public decimal VisitTaskNum { get; set; } [Comment("首次阅片时间")] public DateTime? FirstReadingTime { get; set; } From 2255ee1b0354eb7d491ed0c576fb66dd82af7644 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Fri, 17 Jan 2025 14:10:19 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=B8=8D=E8=A6=81=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/TestService.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/IRaCIS.Core.Application/TestService.cs b/IRaCIS.Core.Application/TestService.cs index 99e28458e..be08aa320 100644 --- a/IRaCIS.Core.Application/TestService.cs +++ b/IRaCIS.Core.Application/TestService.cs @@ -159,6 +159,7 @@ namespace IRaCIS.Core.Application.Service /// 用户多账号，初次维护数据 /// /// + [AllowAnonymous] public async Task UserMutiAccount([FromServices] IRepository _identityUserRepository) { @@ -211,6 +212,7 @@ namespace IRaCIS.Core.Application.Service /// /// /// + [AllowAnonymous] public async Task UserTrialUser([FromServices] IRepository _trialIdentityUserRepository, [FromServices] IRepository _trialUserRoleReposiotry) { _userInfo.IsNotNeedInspection = true; @@ -262,6 +264,7 @@ namespace IRaCIS.Core.Application.Service /// /// /// + [AllowAnonymous] [UnitOfWork] public async Task ExternalTrialUser( [FromServices] IRepository _trialSiteUserSurveyRepository, From 629fbfb037358c572fa30d392b98a5d4a4280d88 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Fri, 17 Jan 2025 15:23:46 +0800 Subject: [PATCH 11/14] =?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/Document/EmailSendService.cs | 8 ++++++-- .../Service/Document/TrialEmailNoticeConfigService.cs | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Document/EmailSendService.cs b/IRaCIS.Core.Application/Service/Document/EmailSendService.cs index 2c436cb01..2a980e788 100644 --- a/IRaCIS.Core.Application/Service/Document/EmailSendService.cs +++ b/IRaCIS.Core.Application/Service/Document/EmailSendService.cs @@ -1,4 +1,5 @@ using IRaCIS.Core.Application.Helper; +using IRaCIS.Core.Application.MassTransit.Consumer; using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Infrastructure; using Microsoft.Extensions.Options; @@ -9,7 +10,7 @@ namespace IRaCIS.Core.Application.Service public interface IEmailSendService { Task SendEnrollOrPdEmail(Guid visitTaskId, bool? isEnrollment, bool? isPDConfirm); - + Task<(TrialEmailNoticeConfig?, SMTPEmailConfig?)> BuildEmailConfig(Guid trialId, EmailBusinessScenario businessScenario, Func topicAndHtmlFunc, Guid? siteId = null, Guid? trialReadingCriterionId = null); } @@ -20,7 +21,7 @@ namespace IRaCIS.Core.Application.Service IRepository _trialSiteUserRoleRepository, IOptionsMonitor _SystemEmailSendConfig, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IEmailSendService { - + private readonly SystemEmailSendConfig _systemEmailConfig = _SystemEmailSendConfig.CurrentValue; public static string EmailNamePlaceholder => StaticData.EmailSend.EmailNamePlaceholder; @@ -130,6 +131,9 @@ namespace IRaCIS.Core.Application.Service var (topicStr, htmlBodyStr, isEn_us, onlyToUserId) = topicAndHtmlFunc(trialEmailConfig); + //处理替换公司名 + htmlBodyStr = CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, htmlBodyStr); + sendEmailConfig.TopicDescription = topicStr; sendEmailConfig.HtmlBodyStr = htmlBodyStr; diff --git a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs index 8cc1e024f..c08126828 100644 --- a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs +++ b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs @@ -8,6 +8,7 @@ using IRaCIS.Core.Application.Contracts; using IRaCIS.Core.Application.Filter; using IRaCIS.Core.Application.Helper; using IRaCIS.Core.Application.Interfaces; +using IRaCIS.Core.Application.MassTransit.Consumer; using IRaCIS.Core.Application.ViewModel; using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Domain.Share.Common; From d930d51d0d55bbedda8e6adae1cc947de8e719e3 Mon Sep 17 00:00:00 2001 From: he <1097837524@qq.com> Date: Sat, 18 Jan 2025 22:55:21 +0800 Subject: [PATCH 12/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs index 3af4d7205..ff42210da 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs @@ -260,7 +260,8 @@ namespace IRaCIS.Core.Application.Service .ForMember(d => d.ParentDictionaryCode, u => u.MapFrom(s => s.ParentReadingQuestionTrial.DictionaryCode)) .ForMember(t => t.ParentQuestionName, u => u.MapFrom(c => c.ParentReadingQuestionTrial.QuestionName)) .ForMember(t => t.RelevanceShowOrder, u => u.MapFrom(c => c.RelevanceReadingQuestionTrial.ShowOrder)) - .ForMember(t => t.ParentQuestionShowOrder, u => u.MapFrom(c => c.ParentReadingQuestionTrial.ShowOrder)); + .ForMember(t => t.ParentQuestionShowOrder, u => u.MapFrom(c => c.ParentReadingQuestionTrial.ShowOrder)) + .ForMember(x => x.CreateUserRole, x => x.Ignore()); From 3463b69b78bb8caa1c9ec42ba007d77b094fc804 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Mon, 20 Jan 2025 10:44:27 +0800 Subject: [PATCH 13/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=82=AE=E4=BB=B6=20?= =?UTF-8?q?=E5=A4=9A=E4=BA=86IR?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Service/Common/MailService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/Common/MailService.cs b/IRaCIS.Core.Application/Service/Common/MailService.cs index cea87baf2..cf68a4a40 100644 --- a/IRaCIS.Core.Application/Service/Common/MailService.cs +++ b/IRaCIS.Core.Application/Service/Common/MailService.cs @@ -660,7 +660,7 @@ namespace IRaCIS.Core.Application.Service trialInfo.ResearchProgramNo, trialInfo.TrialCode, sysUserInfo.IsFirstAdd ? sysUserInfo.EMail : sysUserInfo.UserName, - $"{userType.UserTypeShortName} ({userType.UserTypeName})", + userType.UserTypeName, sysUserInfo.IsFirstAdd ? redirectUrl : baseUrl ); From a2225d7cba386525da88127e83505c3bd7898a97 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Mon, 20 Jan 2025 11:09:55 +0800 Subject: [PATCH 14/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E6=94=BEtoken?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.API/Controllers/ExtraController.cs | 2 +- .../Service/ImageAndDoc/ImageShareService.cs | 2 +- .../Service/SiteSurvey/TrialSiteSurveyService.cs | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.API/Controllers/ExtraController.cs b/IRaCIS.Core.API/Controllers/ExtraController.cs index 68d71badf..4933a95d8 100644 --- a/IRaCIS.Core.API/Controllers/ExtraController.cs +++ b/IRaCIS.Core.API/Controllers/ExtraController.cs @@ -122,7 +122,7 @@ namespace IRaCIS.Api.Controllers { var token = _tokenService.GetToken(new UserTokenInfo() { - UserRoleId = Guid.NewGuid(), + IdentityUserId = Guid.NewGuid(), UserName = "Share001", UserTypeEnum = UserTypeEnum.ShareImage, diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/ImageShareService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/ImageShareService.cs index e21e7b5ff..4c97b57b3 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/ImageShareService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/ImageShareService.cs @@ -104,7 +104,7 @@ namespace IRaCIS.Core.Application.Services StudyId = imageShare.StudyId, Token = _tokenService.GetToken(new UserTokenInfo() { - UserRoleId = Guid.NewGuid(), + IdentityUserId = Guid.NewGuid(), FullName = "Share001", UserName = "Share001", UserTypeEnum = UserTypeEnum.ShareImage, diff --git a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs index b83e1601e..fe1dd8fde 100644 --- a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs +++ b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs @@ -672,6 +672,7 @@ namespace IRaCIS.Core.Application.Contracts TrialSiteSurveyId = currentEntity!.Id, Token = _tokenService.GetToken(new UserTokenInfo() { + IdentityUserId=Guid.NewGuid(), UserRoleId = Guid.NewGuid(), UserName = "SiteSurvey", UserTypeEnum = UserTypeEnum.Undefined,