IRaCIS.Core.Application/MassTransit/Consumer/ImageConsumer.cs

@@ -256,7 +256,7 @@ public class ImageConsumer(
     }
 
     /// <summary>
-    /// 发送影像重传相关邮件的通用方法  已经处理项目
+    /// 发送影像重传相关邮件的通用方法
     /// </summary>
     private async Task SendImageReuploadEmail(SendImageReuploadEmailInDto inDto)
     {
@@ -436,7 +436,7 @@ public class ImageConsumer(
     }
 
     /// <summary>
-    /// 发送阅片人筛选相关邮件的通用方法  已经处理项目
+    /// 发送阅片人筛选相关邮件的通用方法
     /// </summary>
     private async Task SendReviewerSelectionEmail(EmailNoticeConfig emailNoticeConfig, Guid trialId, List<Guid> enrollIdList)
     {

IRaCIS.Core.Application/MassTransit/Recurring/OldRecurringEmailHelper.cs

@@ -18,7 +18,7 @@ public static class OldRecurringEmailHelper
     public static string EmailNamePlaceholder => StaticData.EmailSend.EmailNamePlaceholder;
 
 
-    //发送项目邮件的通用方法 已经处理
+
     public static async Task SendTrialEmailAsync(
       IRepository<TrialEmailNoticeConfig> _trialEmailNoticeConfigRepository,
       IRepository<Trial> _trialRepository,

IRaCIS.Core.Application/MassTransit/Recurring/TrialDocumentConsumer.cs

@@ -76,7 +76,6 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
                 CurrentStaffTrainDays = trialDoc.CurrentStaffTrainDays,
                 NewStaffTrainDays = trialDoc.NewStaffTrainDays,
                 Id = trialDoc.Id,
-                TrialId= trialDoc.TrialId,
                 IsSystemDoc = false,
                 CreateTime = trialDoc.CreateTime,
                 FullFilePath = trialDoc.Path,
@@ -111,7 +110,6 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
                 {
                     Console.WriteLine($"{index}发送定时过期提醒,邮箱：{userinfo.EMail}，姓名{userinfo.UserName}");
                     index++;
-                    var trialInfo =  _trialRepository.Where(x => x.Id == userinfo.TrialId).FirstOrDefault();
                     var messageToSend = new MimeMessage();
                     //发件地址
                     messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
@@ -141,7 +139,7 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
                     {
                         await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(emailConfig, messageToSend, emailConfigFunc);
                      
-                        await SendEmailHelper.SendEmailAsync(messageToSend, trialInfo);
+                        await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
                     }
 
 

IRaCIS.Core.Application/Service/Common/MailService.cs

@@ -315,7 +315,7 @@ namespace IRaCIS.Core.Application.Service
             var sucessHandle = GetEmailSuccessHandle(Guid.Empty, verificationCode, emailAddress);
 
 
-            await SendEmailHelper.SendEmailAsync(messageToSend, trialInfo, sucessHandle);
+            await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig, sucessHandle);
 
         }
 
@@ -750,8 +750,6 @@ namespace IRaCIS.Core.Application.Service
 
             var isHaveTrialId = feedBack.TrialId != null;
 
-            var trialinfo = await _trialRepository.Where(x => x.Id == feedBack.TrialId).FirstOrDefaultAsync();
-
             var companyName = _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
 
             var emialScenario = feedBack.VisitTaskId != null ? EmailBusinessScenario.IRImageError : (feedBack.SubjectVisitId != null ? EmailBusinessScenario.TrialSubjectVisitFeedBack : (feedBack.TrialId != null ? EmailBusinessScenario.TrialFeedBack : EmailBusinessScenario.SysFeedBack));
@@ -886,15 +884,7 @@ namespace IRaCIS.Core.Application.Service
                 await GetEmailSubejctAndHtmlInfoAndBuildAsync(EmailBusinessScenario.SysFeedBack, messageToSend, emailConfigFunc);
             }
 
-            if (trialinfo == null)
-            {
             await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
-            }
-            else
-            {
-                await SendEmailHelper.SendEmailAsync(messageToSend, trialinfo);
-            }
-           
 
         }
 

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

@@ -137,7 +137,7 @@ namespace IRaCIS.Core.Domain.Share
         Approval_UpdateSiteSurvey = 35,
 
         /// <summary>
-        /// 中心调研审批       ---- 这个没找到引用
+        /// 中心调研审批
         /// </summary>
         SiteSurveyApproval = 36,