Merge branch 'Test.IRC' of http://192.168.3.69:2000/XCKJ/irc-netcore-api into Test.IRC

IRaCIS.Core.Application/Helper/FileFormatConvertHelper.cs

@@ -1,16 +0,0 @@
-using DocumentFormat.OpenXml.Bibliography;
-using NPOI.XWPF.UserModel;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace IRaCIS.Core.Application.Helper
-{
-    public class FileFormatConvertHelper
-    {
-
-      
-    }
-}

IRaCIS.Core.Application/Helper/NpoiWordHelper.cs

@@ -1,171 +0,0 @@
-
-using IRaCIS.Core.Application.Helper;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Mvc;
-using NPOI.OpenXmlFormats.Wordprocessing;
-using NPOI.XWPF.UserModel;
-using System.Collections;
-using System.Reflection;
-
-namespace IRaCIS.Core.Application.Service;
-
-public static class NpoiWordHelper
-{
-    public static async Task<IActionResult> TemplateExportWordAsync(string code, object data, IRepository<CommonDocument>? _commonDocumentRepository, IWebHostEnvironment _hostEnvironment)
-    {
-        //var (physicalPath, fileNmae) = await FileStoreHelper.GetCommonDocPhysicalFilePathAsync(_hostEnvironment, _commonDocumentRepository, code);
-
-        var physicalPath = code;
-
-
-        using (FileStream stream = File.OpenRead(physicalPath))
-        {
-            XWPFDocument doc = new XWPFDocument(stream);
-            //遍历段落
-            foreach (var para in doc.Paragraphs)
-            {
-                ReplaceKey(para, data);
-            }
-            //遍历表格
-            var tables = doc.Tables;
-            foreach (var table in tables)
-            {
-                //ReplaceTableKey(table, data, "Data");
-            }
-
-            foreach (var table in tables)
-            {
-                foreach (var row in table.Rows)
-                {
-                    foreach (var cell in row.GetTableCells())
-                    {
-                        foreach (var para in cell.Paragraphs)
-                        {
-                            ReplaceKey(para, data);
-                        }
-                    }
-                }
-            }
-
-            FileStream out1 = new FileStream("table.docx", FileMode.Create);
-            doc.Write(out1);
-            out1.Close();
-            return new FileStreamResult(stream, "application/msword")
-            {
-                FileDownloadName = $"replaced_{DateTime.Now.ToString("yyyyMMddHHmmss")}.docx"
-            };
-        }
-
-
-
-      
-
-       
- 
-     
-
-
-
-
-
-
-    }
-
-    private static void ReplaceKey(XWPFParagraph para, object model)
-    {
-        string text = para.ParagraphText;
-
-        Type t = model.GetType();
-        PropertyInfo[] pi = t.GetProperties();
-        foreach (PropertyInfo p in pi)
-        {
-            //$$与模板中$$对应，也可以改成其它符号，比如{$name},务必做到唯一
-            if (text.Contains("$" + p.Name + "$"))
-            {
-                text = text.Replace("$" + p.Name + "$", p.GetValue(model)?.ToString());
-            }
-        }
-
-        //var runs = para.Runs;
-        //string styleid = para.Style;
-        //for (int i = 0; i < runs.Count; i++)
-        //{
-        //    var run = runs[i];
-        //    text = run.ToString();
-        //    Type t = model.GetType();
-        //    PropertyInfo[] pi = t.GetProperties();
-        //    foreach (PropertyInfo p in pi)
-        //    {
-        //        //$$与模板中$$对应，也可以改成其它符号，比如{$name},务必做到唯一
-        //        if (text.Contains("$" + p.Name + "$"))
-        //        {
-        //            text = text.Replace("$" + p.Name + "$", p.GetValue(model)?.ToString());
-        //        }
-        //    }
-        //    runs[i].SetText(text, 0);
-        //}
-    }
-
-
-
-
-    /// <summary>
-    /// 替换表格Key
-    /// </summary>
-    /// <param name="table"></param>
-    /// <param name="list"></param>
-    /// <param name="field"></param>
-
-    private static void ReplaceTableKey(XWPFTable table, IList list, String field)
-    {
-        List<XWPFParagraph> paras = new List<XWPFParagraph>();
-        // 获取最后一行数据，最后一行设置值
-        Int32 iLastRowIndex = 0;
-        for (int iIndex = 0; iIndex < table.Rows.Count; iIndex++)
-        {
-            if (iIndex == table.Rows.Count - 1)
-            {
-                iLastRowIndex = iIndex;
-                foreach (var cell in table.Rows[iIndex].GetTableCells())
-                {
-                    foreach (var para in cell.Paragraphs)
-                    {
-                        paras.Add(para);
-                    }
-                }
-            }
-        }
-        // 删除最后一行
-        table.RemoveRow(iLastRowIndex);
-
-        for (int iIndex = 0; iIndex < list.Count; iIndex++)
-        {
-            object data = list[iIndex];
-            Type t = data.GetType();
-            PropertyInfo[] pi = t.GetProperties();
-            // 表增加行
-            XWPFTableRow m_row = table.CreateRow();
-            CT_Row m_NewRow = new CT_Row();
-            String text = String.Empty;
-            Int32 jIndex = 0;
-            paras.ForEach(para =>
-            {
-                text = para.ParagraphText;
-                foreach (PropertyInfo p in pi)
-                {
-                    if (text.Contains("$" + field + "." + p.Name + "$"))
-                    {
-                        m_row.GetCell(jIndex).SetText(p.GetValue(data, null).ToString());
-                    }
-                }
-                jIndex++;
-            });
-            m_row = new XWPFTableRow(m_NewRow, table);
-            table.AddRow(m_row);
-
-        }
-    }
-
-
-
-}

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -85,14 +85,6 @@
             <param name="type"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.NpoiWordHelper.ReplaceTableKey(NPOI.XWPF.UserModel.XWPFTable,System.Collections.IList,System.String)">
-            <summary>
-            替换表格Key
-            </summary>
-            <param name="table"></param>
-            <param name="list"></param>
-            <param name="field"></param>
-        </member>
         <member name="T:IRaCIS.Core.Application.Service.TaskAllocationRuleService">
             <summary>
             分配规则
@@ -725,17 +717,9 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.TrialEmailNoticeConfigService.SyncSystemEmainCofigDocListAsync(System.Guid)">
-            <summary>
-            同步系统配置的文档到想项目中 ---废弃
-            </summary>
-            <param name="trialId"></param>
-            <returns></returns>
-            
-        </member>
         <member name="M:IRaCIS.Core.Application.Service.TrialEmailNoticeConfigService.BaseBusinessScenarioSendEmailAsync(System.Guid,System.Nullable{System.Boolean},IRaCIS.Core.Domain.Share.Common.EmailStoreSendMode,System.String)">
             <summary>
-            测试邮件 带附件 填充word --前端不需
+            测试邮件 带附件 填充word 
             </summary>
             <param name="visitTaskId"></param>
             <param name="isHandSend"> 为空 代表 正常任务自动发送，为true  代表医学审核手动发送  为false 代表医学审核自动发送 </param>

IRaCIS.Core.Application/Service/Document/EmailSendService.cs

@@ -18,6 +18,7 @@ using System.Linq;
 using System.Net.Mail;
 using System.Text;
 using System.Threading.Tasks;
+using static IRaCIS.Core.Domain.Share.StaticData;
 
 namespace IRaCIS.Core.Application.Service
 {
@@ -29,6 +30,8 @@ namespace IRaCIS.Core.Application.Service
 
         Task SendTrialQCQuestionEmailAsync(Guid trialId);
         Task SendTrialImageQuestionAsync(Guid trialId);
+
+         Task<(TrialEmailNoticeConfig?, SMTPEmailConfig?)> BuildEmailConfig(Guid trialId, EmailBusinessScenario businessScenario, Func<TrialEmailNoticeConfig, (string topicStr, string htmlBodyStr, bool isEn_us,  Guid? onlyToUserId)> topicAndHtmlFunc, Guid? siteId = null, Guid? trialReadingCriterionId = null);
     }
 
     public class EmailSendService : BaseService, IEmailSendService
@@ -39,18 +42,16 @@ namespace IRaCIS.Core.Application.Service
 
         private readonly IRepository<Trial> _trialRepository;
 
-        private readonly IDictionaryService _dictionaryService;
         private readonly IOptionsMonitor<SystemEmailSendConfig> _SystemEmailSendConfig;
 
-        public readonly static string EmailNamePlaceholder = "EmailNamePlaceholder";
+        public   static string EmailNamePlaceholder => StaticData. EmailSend.EmailNamePlaceholder;
 
-        public EmailSendService(IRepository<TrialEmailNoticeConfig> trialEmailNoticeConfigRepository, IRepository<EmailNoticeConfig> emailNoticeConfigRepository, IRepository<Trial> trialRepository, IOptionsMonitor<SystemEmailSendConfig> systemEmailSendConfig, IDictionaryService dictionaryService)
+        public EmailSendService(IRepository<TrialEmailNoticeConfig> trialEmailNoticeConfigRepository, IRepository<EmailNoticeConfig> emailNoticeConfigRepository, IRepository<Trial> trialRepository, IOptionsMonitor<SystemEmailSendConfig> systemEmailSendConfig)
         {
             _trialEmailNoticeConfigRepository = trialEmailNoticeConfigRepository;
             _emailNoticeConfigRepository = emailNoticeConfigRepository;
             _trialRepository = trialRepository;
             _SystemEmailSendConfig = systemEmailSendConfig;
-            _dictionaryService = dictionaryService;
         }
 
         //入组确认/PD确认
@@ -98,6 +99,8 @@ namespace IRaCIS.Core.Application.Service
 
                     var htmlBodyStr = string.Format(isEn_us ? trialEmailConfig.EmailHtmlContent : trialEmailConfig.EmailHtmlContentCN,
                        EmailNamePlaceholder, taskInfo.ResearchProgramNo, taskInfo.SubjectCode, resultStr);
+
+                    
                     return (topicStr, htmlBodyStr, isEn_us,  null);
                 };
 
@@ -112,6 +115,7 @@ namespace IRaCIS.Core.Application.Service
                     var htmlBodyStr = string.Format(isEn_us ? trialEmailConfig.EmailHtmlContent : trialEmailConfig.EmailHtmlContentCN,
                        EmailNamePlaceholder, taskInfo.ResearchProgramNo, taskInfo.SubjectCode, taskInfo.VisitName, resultStr);
 
+                    
                     return (topicStr, htmlBodyStr, isEn_us,  null);
                 };
 
@@ -165,6 +169,7 @@ namespace IRaCIS.Core.Application.Service
                         var topicStr = string.Format(isEn_us ? trialEmailConfig.EmailTopic : trialEmailConfig.EmailTopicCN, trialInfo.ResearchProgramNo);
                         var htmlBodyStr = string.Format(isEn_us ? trialEmailConfig.EmailHtmlContent : trialEmailConfig.EmailHtmlContentCN,
                             user.FullName, DateTime.Now, sendStat.ToBeClaimedCount, sendStat.ToBeReviewedCount, _SystemEmailSendConfig.CurrentValue.SiteUrl);
+                        
                         return (topicStr, htmlBodyStr, false, userId);
                     };
 
@@ -217,6 +222,8 @@ namespace IRaCIS.Core.Application.Service
                         var htmlBodyStr = string.Format(isEn_us ? trialEmailConfig.EmailHtmlContent : trialEmailConfig.EmailHtmlContentCN,
 
                             user.FullName, DateTime.Now, sendStat.ToBeDealedCount - sendStat.ReUploadTobeDealedCount, sendStat.ReUploadTobeDealedCount, _SystemEmailSendConfig.CurrentValue.SiteUrl);
+                       
+                        
                         return (topicStr, htmlBodyStr, false,  userId);
                     };
 
@@ -266,6 +273,7 @@ namespace IRaCIS.Core.Application.Service
                         var topicStr = string.Format(isEn_us ? trialEmailConfig.EmailTopic : trialEmailConfig.EmailTopicCN, trialInfo.ResearchProgramNo);
                         var htmlBodyStr = string.Format(isEn_us ? trialEmailConfig.EmailHtmlContent : trialEmailConfig.EmailHtmlContentCN,
                             user.FullName, DateTime.Now, sendStat.ToBeDealedCount, _SystemEmailSendConfig.CurrentValue.SiteUrl);
+                        
                         return (topicStr, htmlBodyStr, isEn_us,  userId);
                     };
 
@@ -277,7 +285,19 @@ namespace IRaCIS.Core.Application.Service
 
 
 
-        public async Task SendTrialEmailAsync(Guid trialId, EmailBusinessScenario businessScenario, Func<TrialEmailNoticeConfig, (string topicStr, string htmlBodyStr, bool isEn_us, Guid? onlyToUserId)> topicAndHtmlFunc, Guid? siteId = null, Guid? trialReadingCriterionId = null)
+        public async Task SendTrialEmailAsync(Guid trialId, EmailBusinessScenario businessScenario, Func<TrialEmailNoticeConfig, (string topicStr, string htmlBodyStr, bool isEn_us,  Guid? onlyToUserId)> topicAndHtmlFunc, Guid? siteId = null, Guid? trialReadingCriterionId = null, Func<TrialEmailNoticeConfig, SMTPEmailConfig, SMTPEmailConfig> emailAttachFunc=null)
+        {
+            var  (trialEmailConfig, sendEmailConfig)  = await BuildEmailConfig(trialId, businessScenario, topicAndHtmlFunc, siteId, trialReadingCriterionId);
+
+            if (sendEmailConfig != null)
+            {
+               
+                await SendEmailHelper.SendEmailAsync(sendEmailConfig);
+            }
+        }
+
+
+        public async Task<(TrialEmailNoticeConfig?, SMTPEmailConfig?)> BuildEmailConfig(Guid trialId, EmailBusinessScenario businessScenario, Func<TrialEmailNoticeConfig, (string topicStr, string htmlBodyStr, bool isEn_us,  Guid? onlyToUserId)> topicAndHtmlFunc, Guid? siteId = null, Guid? trialReadingCriterionId = null)
         {
             //找到配置
             var trialEmailConfig = await _trialEmailNoticeConfigRepository.Where(t => t.TrialId == trialId && t.TrialReadingCriterionId == trialReadingCriterionId && t.BusinessScenarioEnum == businessScenario, ignoreQueryFilters: true)
@@ -286,7 +306,7 @@ namespace IRaCIS.Core.Application.Service
 
             if (trialEmailConfig == null || trialEmailConfig.IsAutoSend == false)
             {
-                return;
+                return (null,null);
             }
             else
             {
@@ -393,11 +413,25 @@ namespace IRaCIS.Core.Application.Service
                     }
                 }
 
-                await SendEmailHelper.SendEmailAsync(sendEmailConfig);
+                //邮件附件  这里是原格式发送，不是PDF
 
-            }
+                //if (trialEmailConfig.AttachCNPath != string.Empty && trialEmailConfig.AttachPath != string.Empty)
-        }
+                //{
+                //    var phyPath = FileStoreHelper.GetPhysicalFilePath(_hostEnvironment, isEn_us? trialEmailConfig.AttachName: trialEmailConfig.AttachNameCN);
+
+                //    //先预先生成了邮件，发送预先生成的邮件
+                //    sendEmailConfig.EmailAttachMentConfigList.Add(new EmailAttachMentConfig()
+                //    {
+                //        FileName = $"{attachPrefix}_{Path.GetFileName(_userInfo.IsEn_Us ? trialEmailConfig.AttachName : trialEmailConfig.AttachNameCN)}",
+
+                //        FileStream = File.OpenRead(phyPath),
+                //    });
+                //}
+
+                return (trialEmailConfig,sendEmailConfig) ;
 
 
             }
         }
+    }
+}

IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs

@@ -21,6 +21,8 @@ using IRaCIS.Core.Domain.Share.Common;
 using System.IO;
 using System.Linq;
 using Spire.Doc;
+using Microsoft.AspNetCore.Http;
+using System;
 
 namespace IRaCIS.Core.Application.Service
 {
@@ -43,7 +45,7 @@ namespace IRaCIS.Core.Application.Service
         private readonly IRepository<Subject> _subjectRepository;
         private readonly IRepository<SubjectVisit> _subjectVisitRepository;
 
-
+        private readonly IEmailSendService _emailSendService;
 
 
         public TrialEmailNoticeConfigService(
@@ -56,6 +58,7 @@ namespace IRaCIS.Core.Application.Service
             IRepository<SubjectVisit> subjectVisitRepository,
             IRepository<TrialEmailBlackUser> trialEmailBlackUserRepository,
             IRepository<EmailNoticeConfig> emailNoticeConfigRepository
+,          IEmailSendService emailSendService
             )
         {
             _trialEmailNoticeConfigRepository = trialEmailNoticeConfigRepository;
@@ -67,6 +70,7 @@ namespace IRaCIS.Core.Application.Service
             _subjectVisitRepository = subjectVisitRepository;
             _trialEmailBlackUserRepository = trialEmailBlackUserRepository;
             _emailNoticeConfigRepository = emailNoticeConfigRepository;
+            _emailSendService = emailSendService;
         }
 
         /// <summary>
@@ -87,7 +91,7 @@ namespace IRaCIS.Core.Application.Service
                 IsConfigureEmail = x.IsConfigureEmail,
                 EmailSMTPServerPort = x.EmailSMTPServerPort
 
-            }).FirstOrDefaultAsync();
+            }).FirstAsync();
         }
 
         /// <summary>
@@ -135,60 +139,6 @@ namespace IRaCIS.Core.Application.Service
             return ResponseOutput.Ok();
         }
 
-        /// <summary>
-        /// 同步系统配置的文档到想项目中 ---废弃
-        /// </summary>
-        /// <param name="trialId"></param>
-        /// <returns></returns>
-        /// 
-        private async Task SyncSystemEmainCofigDocListAsync(Guid trialId)
-        {
-
-            //判断流程配置是否确认  确认了一定确认了标准   可以进行同步
-
-            if (_repository.Where<Trial>(t => t.Id == trialId).Any(t => t.IsTrialProcessConfirmed == true))
-            {
-
-                //只要有系统标准的文档 说明同步过了
-                var trialDocCount = _trialEmailNoticeConfigRepository.Where(t => t.TrialId == trialId).Count();
-
-                if (trialDocCount == 0)
-                {
-                    //找到确认的标准
-                    var list = await _repository.Where<ReadingQuestionCriterionTrial>(t => t.TrialId == trialId && t.IsConfirm).Select(t => new { t.CriterionType, TrialReadingCriterionId = t.Id }).ToListAsync();
-
-                    var confirmedCriterionTypeList = list.Select(t => (CriterionType?)t.CriterionType).ToList();
-
-                    var docmentList = _repository.Where<TrialEmailNoticeConfig>(t => t.BusinessScenarioEnum == EmailBusinessScenario.EnrollConfirmed || t.BusinessScenarioEnum == EmailBusinessScenario.PDConfirmed)
-                        //.Where(t => (confirmedCriterionTypeList.Contains(t.CriterionTypeEnum)) || t.CriterionTypeEnum == null).Select(t => new { t.Path, t.Name, t.Code, t.BusinessScenarioEnum, t.CriterionTypeEnum })
-                        .ToList();
-
-
-
-                    foreach (var item in docmentList)
-                    {
-                        await _trialEmailNoticeConfigRepository.AddAsync(new TrialEmailNoticeConfig()
-                        {
-                            TrialId = trialId,
-                            TrialReadingCriterionId = list.Where(t => t.CriterionType == item.CriterionTypeEnum).FirstOrDefault()?.TrialReadingCriterionId,
-                            //FileName = item.Name,
-                            //FilePath = item.Path,
-                            BusinessScenarioEnum = item.BusinessScenarioEnum,
-                            Code = item.Code
-                        });
-                    }
-
-                }
-
-
-            }
-
-
-
-            await _trialEmailNoticeConfigRepository.SaveChangesAsync();
-        }
-
-
 
 
         private async Task<bool> DealMedicalReviewTasKGenerateAndIsSendAsync(Guid trialId, bool? isHandSend, string pdAnswer, List<Guid> taskIdList, List<Guid> minUserIdList)
@@ -237,15 +187,12 @@ namespace IRaCIS.Core.Application.Service
                 }
             }
 
-
-
-
             return isNeedSend;
 
         }
 
         /// <summary>
-        /// 测试邮件 带附件 填充word --前端不需
+        /// 测试邮件 带附件 填充word 
         /// </summary>
         /// <param name="visitTaskId"></param>
         /// <param name="isHandSend"> 为空 代表 正常任务自动发送，为true  代表医学审核手动发送  为false 代表医学审核自动发送 </param>
@@ -255,8 +202,8 @@ namespace IRaCIS.Core.Application.Service
         /// <exception cref="BusinessValidationFailedException"></exception>
         public async Task<string> BaseBusinessScenarioSendEmailAsync(Guid visitTaskId, bool? isHandSend, EmailStoreSendMode emailStoreMode, string sendFileRelativePath)
         {
-
+            var isEn_us = _userInfo.IsEn_Us;
-            EmailBusinessScenario? businessScenarioEnum = null;
+            EmailBusinessScenario businessScenarioEnum = EmailBusinessScenario.None;
 
             #region 任务关联的项目配置  标准信息及配置，subject 信息
             var taskInfo = await _visitTaskRepository.Where(t => t.Id == visitTaskId).Select(t => new
@@ -352,146 +299,28 @@ namespace IRaCIS.Core.Application.Service
             #endregion
 
 
-            #region 发收件人配置 确保无误
+            #region 邮件内容装配
 
-
+            Func<TrialEmailNoticeConfig, (string topicStr, string htmlBodyStr, bool isEn_us, Guid? onlyToUserId)> topicAndHtmlFunc = trialEmailConfig =>
-            var emailConfig = await _trialEmailNoticeConfigRepository.Where(t => t.TrialId == taskInfo.TrialId && t.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId && t.BusinessScenarioEnum == businessScenarioEnum)
-                .Include(t => t.TrialEmailNoticeUserList).FirstOrDefaultAsync();
-
-
-            if (emailConfig == null || (emailConfig.IsAutoSend == false && isHandSend == null))
             {
-                //throw new BusinessValidationFailedException("找不到该项目标准场景下邮件的配置");
+                var topicStr = string.Format(isEn_us ? trialEmailConfig.EmailTopic : trialEmailConfig.EmailTopicCN, taskInfo.ResearchProgramNo, taskInfo.SubjectCode);
 
-                return string.Empty;
+                var htmlBodyStr = string.Format(isEn_us ? trialEmailConfig.EmailHtmlContent : trialEmailConfig.EmailHtmlContentCN,
-            }
+                   StaticData.EmailSend.EmailNamePlaceholder, taskInfo.ResearchProgramNo, taskInfo.SubjectCode);
 
 
-            var sendEmailConfig = new SMTPEmailConfig();
+                return (topicStr, htmlBodyStr, isEn_us, null);
-
+            };
-            //收件人 如果是CRC  CRA  要按照中心发送
-            var toUserTypeEnumList = emailConfig.TrialEmailNoticeUserList.Where(t => t.EmailUserType == EmailUserType.To).Select(c => c.UserType).ToList();
 
 
-
+            var (trialEmailConfig, sendEmailConfig) = await _emailSendService.BuildEmailConfig(taskInfo.TrialId, businessScenarioEnum, topicAndHtmlFunc, taskInfo.SiteId);
-            var toUserList = _repository.Where<TrialSiteUser>(t => t.TrialId == taskInfo.TrialId && toUserTypeEnumList.Contains(t.User.UserTypeEnum) && t.SiteId == taskInfo.SiteId).Select(t => new { t.User.EMail, t.User.FullName }).ToList();
-
-            var copyUserTypeEnumList = emailConfig.TrialEmailNoticeUserList.Where(t => t.EmailUserType == EmailUserType.Copy).Select(c => c.UserType).ToList();
-            var copyUserList = _repository.Where<TrialUser>(t => t.TrialId == taskInfo.TrialId && copyUserTypeEnumList.Contains(t.User.UserTypeEnum)).Select(t => new { t.User.EMail, t.User.FullName }).ToList();
-
-
-            if (toUserList.Count() == 0)
-            {
-                //---没有收件人，无法发送邮件
-                throw new BusinessValidationFailedException(_localizer["TrialEmailN_NoRecipient"]);
-            }
-
-
-            if (emailConfig.FromEmail.Contains("@") && !string.IsNullOrEmpty(emailConfig.FromEmail))
-            {
-
-                sendEmailConfig.FromEmailAddress = new MimeKit.MailboxAddress(emailConfig.FromName, emailConfig.FromEmail);
-                sendEmailConfig.AuthorizationCode = emailConfig.AuthorizationCode;
-                sendEmailConfig.UserName = emailConfig.FromEmail;
-
-                sendEmailConfig.Host = emailConfig.SMTPServerAddress;
-                sendEmailConfig.Port = emailConfig.SMTPServerPort;
-
-
-                //测试
-                //sendEmailConfig.ToMailAddressList.Add(new MimeKit.MailboxAddress("ddd", "872297557@qq.com"));
-
-            }
-            else
-            {
-                //---项目发件邮箱配置有误，请核实
-                throw new BusinessValidationFailedException(_localizer["TrialEmailN_InvalidEmailConfig"]);
-            }
-
-            foreach (var item in toUserList)
-            {
-
-                if (item.EMail.Contains("@") && !string.IsNullOrEmpty(item.EMail))
-                {
-
-                    sendEmailConfig.ToMailAddressList.Add(new MimeKit.MailboxAddress(item.FullName, item.EMail));
-
-                }
-            }
-            foreach (var item in copyUserList)
-            {
-
-                if (item.EMail.Contains("@") && !string.IsNullOrEmpty(item.EMail))
-                {
-
-                    sendEmailConfig.CopyToMailAddressList.Add(new MimeKit.MailboxAddress(item.FullName, item.EMail));
-
-                }
-            }
-            #endregion
-
-            #region 确保 邮件Html存在 
-
-            //邮件附件
-            var path = FileStoreHelper.GetPhysicalFilePath(_hostEnvironment, _userInfo.IsEn_Us ? emailConfig.AttachPath : emailConfig.AttachCNPath);
-
-            if (!File.Exists(path))
-            {
-                //---找不到该项目标准场景下邮件模板
-                throw new BusinessValidationFailedException(_localizer["TrialEmailN_EmailTemplateNotFound"]);
-            }
-
-
-            var pathToFile = _hostEnvironment.WebRootPath
-                      + Path.DirectorySeparatorChar.ToString()
-                      + "EmailTemplate"
-                      + Path.DirectorySeparatorChar.ToString()
-                     //+ "SubjectEnrollConfirmOrPDProgress.html";
-                     + (_userInfo.IsEn_Us ? "SubjectEnrollConfirmOrPDProgress_US.html" : "SubjectEnrollConfirmOrPDProgress.html");
 
             #endregion
 
 
-            #region 不同场景 Tile 设置
+            //自动发送
-
+            if (sendEmailConfig != null)
-            if (businessScenarioEnum == EmailBusinessScenario.EnrollConfirmed)
             {
-                sendEmailConfig.TopicDescription = _localizer["TrialEmailN_EnrollmentConfirmation", taskInfo.ResearchProgramNo, taskInfo.SubjectCode];
-
-                using (StreamReader SourceReader = System.IO.File.OpenText(pathToFile))
-                {
-                    var templateInfo = SourceReader.ReadToEnd();
-
-
-                    sendEmailConfig.HtmlBodyStr = string.Format(templateInfo,
-                        //--- 附件为疾病进展确认报告，请查收 
-                        _localizer["TrialEmailN_SubjectDiseaseProgression"]
-                        );
-                }
-            }
-            else if (businessScenarioEnum == EmailBusinessScenario.PDConfirmed)
-            {
-                sendEmailConfig.TopicDescription = _localizer["TrialEmailN_PDReport", taskInfo.ResearchProgramNo, taskInfo.SubjectCode];
-
-                using (StreamReader SourceReader = System.IO.File.OpenText(pathToFile))
-                {
-                    var templateInfo = SourceReader.ReadToEnd();
-
-
-                    sendEmailConfig.HtmlBodyStr = string.Format(templateInfo,
-                        //--- 附件为疾病进展确认报告，请查收 
-                        _localizer["TrialEmailN_SubjectDiseaseProgression"]
-                        );
-                }
-            }
-            else
-            {
-                //
-            }
-
-            #endregion
-
-
                 #region 不同标准 不同项目配置 发送邮件的时机 处理具体逻辑
 
                 var answer = "否";
@@ -799,11 +628,12 @@ namespace IRaCIS.Core.Application.Service
 
                     var phyPath = FileStoreHelper.GetPhysicalFilePath(_hostEnvironment, sendFileRelativePath);
 
+                    var attachPrefix = $"{taskInfo.SubjectCode}";
 
                     //先预先生成了邮件，发送预先生成的邮件
                     sendEmailConfig.EmailAttachMentConfigList.Add(new EmailAttachMentConfig()
                     {
-                    FileName = $"{taskInfo.SubjectCode}_{Path.GetFileNameWithoutExtension(_userInfo.IsEn_Us ? emailConfig.AttachName : emailConfig.AttachNameCN)}.pdf",
+                        FileName = $"{attachPrefix}_{Path.GetFileNameWithoutExtension(_userInfo.IsEn_Us ? trialEmailConfig.AttachName : trialEmailConfig!.AttachNameCN)}.pdf",
 
                         FileStream = File.OpenRead(phyPath),
                     });
@@ -827,6 +657,8 @@ namespace IRaCIS.Core.Application.Service
 
                 };
 
+                var path = FileStoreHelper.GetPhysicalFilePath(_hostEnvironment, _userInfo.IsEn_Us ? trialEmailConfig.AttachPath : trialEmailConfig.AttachCNPath);
+
                 var (serverFilePath, relativePath, fileRealName) = FileStoreHelper.GetSubjectEnrollConfirmOrPDEmailPath(_hostEnvironment, Path.GetFileName(path), taskInfo.TrialId, taskInfo.SiteId, taskInfo.SubjectId, true);
 
                 if (emailStoreMode == EmailStoreSendMode.StoreLocalSend || emailStoreMode == EmailStoreSendMode.OnlyStoreLocalNotSentEmail)
@@ -871,7 +703,7 @@ namespace IRaCIS.Core.Application.Service
 
                     sendEmailConfig.EmailAttachMentConfigList.Add(new EmailAttachMentConfig()
                     {
-                    FileName = $"{taskInfo.SubjectCode}_{Path.GetFileNameWithoutExtension(_userInfo.IsEn_Us ? emailConfig.AttachName : emailConfig.AttachNameCN)}.pdf",
+                        FileName = $"{taskInfo.SubjectCode}_{Path.GetFileNameWithoutExtension(_userInfo.IsEn_Us ? trialEmailConfig.AttachName : trialEmailConfig.AttachNameCN)}.pdf",
 
                         FileStream = pdfMemoryStream
                     });
@@ -890,6 +722,14 @@ namespace IRaCIS.Core.Application.Service
 
 
                 #endregion
+            }
+            else
+            {
+                return string.Empty;
+            }
+
+
+
 
 
         }
@@ -1388,13 +1228,14 @@ namespace IRaCIS.Core.Application.Service
         /// </summary>
         /// <param name="queryEmailNoticeConfig"></param>
         /// <returns></returns>
+        [HttpPost]
         public async Task<PageOutput<TrialSelectEmailNoticeConfigView>> GetSysEmailNoticeConfigList(EmailNoticeConfigQuery queryEmailNoticeConfig)
         {
             var emailNoticeConfigQueryable = _emailNoticeConfigRepository
            .WhereIf(queryEmailNoticeConfig.BusinessScenarioEnum != null, t => t.BusinessScenarioEnum == queryEmailNoticeConfig.BusinessScenarioEnum)
            .WhereIf(queryEmailNoticeConfig.IsReturnRequired != null, t => t.IsReturnRequired == queryEmailNoticeConfig.IsReturnRequired)
            .WhereIf(queryEmailNoticeConfig.IsEnable != null, t => t.IsEnable == queryEmailNoticeConfig.IsEnable)
-
+           .WhereIf(queryEmailNoticeConfig.IsDistinguishCriteria != null, t => t.IsDistinguishCriteria == queryEmailNoticeConfig.IsDistinguishCriteria)
            .ProjectTo<TrialSelectEmailNoticeConfigView>(_mapper.ConfigurationProvider, new { trialId = queryEmailNoticeConfig.TrialId });
 
             return await emailNoticeConfigQueryable.ToPagedListAsync(queryEmailNoticeConfig.PageIndex, queryEmailNoticeConfig.PageSize, queryEmailNoticeConfig.SortField, queryEmailNoticeConfig.Asc);

IRaCIS.Core.Domain.Share/Common/EmailScenarioEnum.cs

@@ -36,7 +36,7 @@ namespace IRaCIS.Core.Domain.Share
 
     public enum EmailBusinessScenario
     {
-
+        None=-1,
         EnrollConfirmed = 1,
 
         PDConfirmed = 2,

IRaCIS.Core.Domain/_Config/_StaticData.cs

@@ -141,6 +141,11 @@ public static class StaticData
     }
 
 
+    public static class EmailSend
+    {
+        public static string EmailNamePlaceholder = "EmailNamePlaceholder";
+    }
+
 
     /// <summary>
     /// 医生学位等级