diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 2c718faa0..732a51c8a 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -826,6 +826,57 @@ + + + 测试计算 + + + + + + + + 计算任务 + + + + + + + 自动计算 + + + + + + + + 基线病灶计数 + + + + + + + 获取新病灶计数 + + + + + + + 既往新病灶计数 + + + + + + + 自治疗后第二个访视点以来持续的新骨病变数量 + + + + 标准和服务对应 @@ -2026,6 +2077,11 @@ 项目Id + + + 任务盲态名称 和访视盲态一样 + + 分页名称 diff --git a/IRaCIS.Core.Application/Service/Document/DTO/TrialEmailNoticeConfigViewModel.cs b/IRaCIS.Core.Application/Service/Document/DTO/TrialEmailNoticeConfigViewModel.cs index e1ba5a1de..913d45972 100644 --- a/IRaCIS.Core.Application/Service/Document/DTO/TrialEmailNoticeConfigViewModel.cs +++ b/IRaCIS.Core.Application/Service/Document/DTO/TrialEmailNoticeConfigViewModel.cs @@ -84,7 +84,7 @@ namespace IRaCIS.Core.Application.ViewModel public string FromName { get; set; } = string.Empty; - public string FromEmail { get; set; } + public string FromEmail { get; set; } = string.Empty; public List ToUserIdList { get; set; } diff --git a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs index 96706be7a..1b791345a 100644 --- a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs +++ b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs @@ -144,7 +144,7 @@ namespace IRaCIS.Core.Application.Service - private async Task FillWordTemplateAndSetEmailAsync(Guid visitTaskId, SMTPEmailConfig sendEmailConfig, CommonDocumentBusinessScenario businessScenarioEnum, string fileName,string filePath) + private async Task FillWordTemplateAndSetEmailAsync(Guid visitTaskId, SMTPEmailConfig sendEmailConfig, CommonDocumentBusinessScenario businessScenarioEnum, string fileName,string templatePath) { var isNeedSend = true; @@ -464,16 +464,30 @@ namespace IRaCIS.Core.Application.Service if (isNeedSend) { - var docFileStream = System.IO.File.OpenRead(fileName); - + + var value = new Dictionary() + { + ["SponsorName"] = documentNeedBasicInfo.SponsorName, + ["ResearchProgramNo"] = documentNeedBasicInfo.ResearchProgramNo, + ["TrialSiteCode"] = documentNeedBasicInfo.TrialSiteCode, + ["SubjectCode"] = documentNeedBasicInfo.SubjectCode, + ["VisitName"] = documentNeedBasicInfo.VisitName, + ["EarliestScanDate"] = documentNeedBasicInfo.SourceSubjectVisitId!=null? documentNeedBasicInfo.VisitEarliestScanDate: documentNeedBasicInfo.ModuleEarliestScanDate, + ["SignTime"] = documentNeedBasicInfo.SignTime, + ["Result"] = answer + + }; + + MemoryStream memoryStream = new MemoryStream(); + MiniSoftware.MiniWord.SaveAsByTemplate(memoryStream, templatePath, value); sendEmailConfig.EmailAttachMentConfigList.Add(new EmailAttachMentConfig() { FileName = fileName, - FileStream = docFileStream + FileStream = memoryStream }); return false;