修改入组Pd报告
continuous-integration/drone/push Build is passing Details

Test_IRC_Net8
hang 2025-07-02 15:16:10 +08:00
parent bdb48f93bc
commit f8e501fb0d
1 changed files with 21 additions and 9 deletions

View File

@ -5,6 +5,7 @@
//-------------------------------------------------------------------- //--------------------------------------------------------------------
using Amazon.Runtime; using Amazon.Runtime;
using IRaCIS.Application.Interfaces;
using IRaCIS.Core.Application.Contracts; using IRaCIS.Core.Application.Contracts;
using IRaCIS.Core.Application.Filter; using IRaCIS.Core.Application.Filter;
using IRaCIS.Core.Application.Helper; using IRaCIS.Core.Application.Helper;
@ -45,6 +46,7 @@ namespace IRaCIS.Core.Application.Service
IRepository<ReadingTaskQuestionAnswer> _readingTaskQuestionAnswerRepository, IRepository<ReadingTaskQuestionAnswer> _readingTaskQuestionAnswerRepository,
IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository, IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository,
IOptionsMonitor<SystemEmailSendConfig> _systemEmailSendConfig, IOptionsMonitor<SystemEmailSendConfig> _systemEmailSendConfig,
IDictionaryService _dictionaryService,
IEmailSendService _emailSendService, IEmailSendService _emailSendService,
IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer, IWebHostEnvironment _hostEnvironment) : BaseService, ITrialEmailNoticeConfigService IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer, IWebHostEnvironment _hostEnvironment) : BaseService, ITrialEmailNoticeConfigService
{ {
@ -193,6 +195,9 @@ namespace IRaCIS.Core.Application.Service
var isEn_us = _userInfo.IsEn_Us; var isEn_us = _userInfo.IsEn_Us;
EmailBusinessScenario businessScenarioEnum = EmailBusinessScenario.None; EmailBusinessScenario businessScenarioEnum = EmailBusinessScenario.None;
var enrollReplace = "";
var PdReplace = "";
#region 任务关联的项目配置 标准信息及配置subject 信息 #region 任务关联的项目配置 标准信息及配置subject 信息
var taskInfo = await _visitTaskRepository.Where(t => t.Id == visitTaskId).Select(t => new var taskInfo = await _visitTaskRepository.Where(t => t.Id == visitTaskId).Select(t => new
{ {
@ -319,8 +324,9 @@ namespace IRaCIS.Core.Application.Service
//入组确认 根据每个标准配置的是否自动发送,发送邮件与否 //入组确认 根据每个标准配置的是否自动发送,发送邮件与否
if (businessScenarioEnum == EmailBusinessScenario.EnrollConfirmed) if (businessScenarioEnum == EmailBusinessScenario.EnrollConfirmed)
{ {
var findItem = (await _dictionaryService.GetBasicDataSelect("Trial_Enroll_Report")).Where(t => t.Code == ((int)taskInfo.CriterionType).ToString()).FirstOrDefault();
enrollReplace = _userInfo.IsEn_Us ? findItem.Value : findItem.ValueCN;
//如果其他阅片人已经做了,说明发送了入组确认报告,第二个人做完就不发送了 //如果其他阅片人已经做了,说明发送了入组确认报告,第二个人做完就不发送了
@ -345,7 +351,9 @@ namespace IRaCIS.Core.Application.Service
} }
else if (businessScenarioEnum == EmailBusinessScenario.PDConfirmed) else if (businessScenarioEnum == EmailBusinessScenario.PDConfirmed)
{ {
var findItem = (await _dictionaryService.GetBasicDataSelect("Trial_PD_Report")).Where(t => t.Code == ((int)taskInfo.CriterionType).ToString()).FirstOrDefault();
PdReplace = _userInfo.IsEn_Us ? findItem.Value : findItem.ValueCN;
//有序 //有序
@ -614,6 +622,8 @@ namespace IRaCIS.Core.Application.Service
var value = new Dictionary<string, object>() var value = new Dictionary<string, object>()
{ {
["Criterion_Enroll_Replace"]= enrollReplace,
["Criterion_PD_Replace"]= PdReplace,
["SponsorName"] = taskInfo.SponsorName, ["SponsorName"] = taskInfo.SponsorName,
["ResearchProgramNo"] = taskInfo.ResearchProgramNo, ["ResearchProgramNo"] = taskInfo.ResearchProgramNo,
["TrialSiteCode"] = taskInfo.TrialSiteCode, ["TrialSiteCode"] = taskInfo.TrialSiteCode,
@ -651,10 +661,11 @@ namespace IRaCIS.Core.Application.Service
{ {
var wordStoreServerPath = Path.Combine(Path.GetDirectoryName(serverFilePath), Path.GetFileNameWithoutExtension(serverFilePath) + ".docx"); var wordStoreServerPath = Path.Combine(Path.GetDirectoryName(serverFilePath), Path.GetFileNameWithoutExtension(serverFilePath) + ".docx");
//using (FileStream fileStream = new FileStream(wordStoreServerPath, FileMode.Create, FileAccess.Write)) //模板写入数据先放本地才能转换为pdf
//{ using (FileStream fileStream = new FileStream(wordStoreServerPath, FileMode.Create, FileAccess.Write))
// wordMemoryStream.WriteTo(fileStream); {
//} wordMemoryStream.WriteTo(fileStream);
}
FileConvertHelper.ConvertWordToPdf(wordStoreServerPath, Path.GetDirectoryName(serverFilePath)); FileConvertHelper.ConvertWordToPdf(wordStoreServerPath, Path.GetDirectoryName(serverFilePath));
@ -695,10 +706,11 @@ namespace IRaCIS.Core.Application.Service
{ {
var wordStoreServerPath = Path.Combine(Path.GetDirectoryName(serverFilePath), Path.GetFileNameWithoutExtension(serverFilePath) + ".docx"); var wordStoreServerPath = Path.Combine(Path.GetDirectoryName(serverFilePath), Path.GetFileNameWithoutExtension(serverFilePath) + ".docx");
//using (FileStream fileStream = new FileStream(wordStoreServerPath, FileMode.Create, FileAccess.Write)) //模板写入数据先放本地才能转换为pdf
//{ using (FileStream fileStream = new FileStream(wordStoreServerPath, FileMode.Create, FileAccess.Write))
// wordMemoryStream.WriteTo(fileStream); {
//} wordMemoryStream.WriteTo(fileStream);
}
FileConvertHelper.ConvertWordToPdf(wordStoreServerPath, Path.GetDirectoryName(serverFilePath)); FileConvertHelper.ConvertWordToPdf(wordStoreServerPath, Path.GetDirectoryName(serverFilePath));
File.Delete(wordStoreServerPath); File.Delete(wordStoreServerPath);