修改加急发送邮件

IRaCIS.Core.API/_ServiceExtensions/hangfireSetup.cs

@@ -16,12 +16,12 @@ namespace IRaCIS.Core.API
             services.AddHangfire(hangFireConfig =>
             {
                 //本地window 调试 使用内存，服务器部署使用数据库，防止服务器任务调度到本地
-                if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+                //if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-                {
+                //{
-                    hangFireConfig.UseInMemoryStorage();
+                //    hangFireConfig.UseInMemoryStorage();
 
-                }
+                //}
-                else
+                //else
                 {
                     //指定存储介质
                     hangFireConfig.UseSqlServerStorage(hangFireConnStr, new SqlServerStorageOptions()

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

@@ -1,4 +1,5 @@
-using IRaCIS.Application.Contracts;
+using DocumentFormat.OpenXml;
+using IRaCIS.Application.Contracts;
 using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.Helper;
 using IRaCIS.Core.Application.MassTransit.Consumer;
@@ -43,7 +44,7 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
                 IsEn_US = isEn_US,
                 DictionaryList = new List<DictionaryDto>()
                 {
-                    new DictionaryDto (){DictionaryCode= "YesOrNo",EnumValue="1" } 
+                    new DictionaryDto (){DictionaryCode= "YesOrNo",EnumValue="true" }
                 }
             });
 
@@ -66,16 +67,16 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
             foreach (var trialUser in trialUserList)
             {
 
-                var userId=trialUser.UserId;
+                var userId = trialUser.UserId;
 
-                var doctorCriterionList =  await _trialReadingCriterionRepository.Where(t => t.IsSigned && t.IsConfirm && t.Trial.TrialUserList.Any(t => t.UserId == userId))
+                var doctorCriterionList = await _trialReadingCriterionRepository.Where(t => t.IsSigned && t.IsConfirm && t.TrialId == trialId && t.Trial.TrialUserList.Any(t => t.UserId == userId))
                      .Select(c => new
                      {
 
                          TrialReadingCriterionId = c.Id,
-                         CriterionName=c.CriterionName,
+                         CriterionName = c.CriterionName,
 
-                         UnReadList = c.VisitTaskList
+                         UnReadList = c.VisitTaskList.Where(t => t.ExpetidEmailNoticeTime == null) //没有被通知
                               .Where(t => t.DoctorUserId == userId && t.ReadingTaskState != ReadingTaskState.HaveSigned && t.TaskState == TaskState.Effect)
                               // 前序 不存在 未一致性核查未通过的
                               .Where(t => !t.Subject.SubjectVisitList.Any(sv => sv.CheckState != CheckStateEnum.CVPassed && t.VisitTaskNum > sv.VisitNum))
@@ -84,69 +85,84 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
 
                               .Where(y => y.IsFrontTaskNeedSignButNotSign == false && (y.IsNeedClinicalDataSign == false || y.IsClinicalDataSign == true))
 
-                              .Where(t=> t.SourceSubjectVisit.PDState==PDStateEnum.PDProgress || t.SourceSubjectVisit.IsEnrollmentConfirm ||
+                              .Where(t => t.SourceSubjectVisit.PDState == PDStateEnum.PDProgress || t.SourceSubjectVisit.IsEnrollmentConfirm ||
                               t.ReadModule.SubjectVisit.PDState == PDStateEnum.PDProgress || t.ReadModule.SubjectVisit.IsEnrollmentConfirm)
-                              .Select(c=>new 
+                              .Select(c => new
                               {
-                                SubejctCode=  c.IsAnalysisCreate? c.BlindSubjectCode:  c.Subject.Code,
+                                  SubejctCode = c.IsAnalysisCreate ? c.BlindSubjectCode : c.Subject.Code,
-                                 c.TaskBlindName,
+                                  c.TaskBlindName,
-                                c.TaskName
+                                  c.TaskName,
+                                  VisitTaskId = c.Id
                               }).ToList()
 
                      }).ToListAsync();
 
 
-                var toTalUnreadCount= doctorCriterionList.SelectMany(t=>t.UnReadList).Count();
+                var toTalUnreadCount = doctorCriterionList.SelectMany(t => t.UnReadList).Count();
 
-
+                if (toTalUnreadCount > 0)
-                var messageToSend = new MimeMessage();
-
-                //发件地址
-                messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
-                messageToSend.To.Add(new MailboxAddress(trialUser.FullName, trialUser.EMail));
-
-                var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
-
-                Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
                 {
-                    var topicStr = string.Format(input.topicStr, trialUser.ResearchProgramNo);
+                    var messageToSend = new MimeMessage();
 
-                    var template = input.htmlBodyStr;
+                    //发件地址
+                    messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
+                    messageToSend.To.Add(new MailboxAddress(trialUser.FullName, trialUser.EMail));
 
-                    //正则提取循环的部分 {%for%}(.*?){%end for%}
+                    var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
-                    string pattern = @"{%for%}(.*?){%end for%}";
-                    var match = Regex.Match(template, pattern, RegexOptions.Singleline);
 
-                    string criteriaTemplate = match.Groups[1].Value; // 提取循环模板
+                    Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
-
-                    // 构建循环内容
-                    string criteriaDetails = "";
-                    foreach (var criteria in doctorCriterionList)
                     {
-                        criteriaDetails += string.Format(criteriaTemplate, criteria.CriterionName, criteria.UnReadList.Select(t=>t.SubejctCode).Distinct().Count(), criteria.UnReadList.Count());
+                        var topicStr = string.Format(input.topicStr, trialUser.ResearchProgramNo);
-                    }
 
-                    // 用循环内容替换原始模板中的循环部分
+                        var template = input.htmlBodyStr;
-                    string emailContent = Regex.Replace(template, pattern, criteriaDetails);
+
+                        //正则提取循环的部分 {%for%}(.*?){%end for%}
+                        string pattern = @"{%for%}(.*?){%end for%}";
+                        var match = Regex.Match(template, pattern, RegexOptions.Singleline);
+
+                        string criteriaTemplate = match.Groups[1].Value; // 提取循环模板
+
+                        // 构建循环内容
+                        string criteriaDetails = "";
+                        foreach (var criteria in doctorCriterionList)
+                        {
+                            if (criteria.UnReadList.Count() > 0)
+                            {
+                                criteriaDetails += string.Format(criteriaTemplate, criteria.CriterionName, criteria.UnReadList.Select(t => t.SubejctCode).Distinct().Count(), criteria.UnReadList.Count());
+
+                            }
+                        }
+
+                        // 用循环内容替换原始模板中的循环部分
+                        string emailContent = template.Replace(criteriaTemplate, criteriaDetails).Replace("{%for%}", "").Replace("{%end for%}", "");
 
 
-                    var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
-                        trialUser.FullName,
 
-                    DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
+                        var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, emailContent),
-                    toTalUnreadCount,
+                            trialUser.FullName,
 
-                    trialUser.ResearchProgramNo,
+                        DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
-                     dictionValue[0],
+                        toTalUnreadCount,
-                    _systemEmailConfig.SiteUrl
-                        );
 
-                    return (topicStr, htmlBodyStr);
+                        trialUser.ResearchProgramNo,
-                };
+                         dictionValue[0],
+                        _systemEmailConfig.SiteUrl
+                            );
 
-                await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository, EmailBusinessScenario.ExpeditedReading, messageToSend, emailConfigFunc);
+                        return (topicStr, htmlBodyStr);
+                    };
+
+                    await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository, EmailBusinessScenario.ExpeditedReading, messageToSend, emailConfigFunc);
+
+                    await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
+
+                    //处理标记已通知的任务
+
+                    var visitTaskIdList = doctorCriterionList.Where(t => t.UnReadList.Count() > 0).SelectMany(t => t.UnReadList.Select(u => u.VisitTaskId)).ToList();
+
+                    await _visitTaskRepository.BatchUpdateNoTrackingAsync(t => visitTaskIdList.Contains(t.Id), u => new VisitTask() { ExpetidEmailNoticeTime = DateTime.Now });
+                }
 
-                await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
 
             }
 

IRaCIS.Core.Domain/Allocation/VisitTask.cs

@@ -278,4 +278,7 @@ public class VisitTask : BaseFullAuditEntity
     [Comment("前序任务需要签名 但是未签名")]
     public bool IsFrontTaskNeedSignButNotSign { get; set; }
     public int ImageStudyState { get; set; }
+
+    [Comment("通知IR加急阅片时间")]
+    public DateTime? ExpetidEmailNoticeTime { get; set; }
 }

IRaCIS.Core.Infra.EFCore/Migrations/20241101061056_VisitTaskExpetiedTime.cs

@@ -0,0 +1,30 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace IRaCIS.Core.Infra.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class VisitTaskExpetiedTime : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<DateTime>(
+                name: "ExpetidEmailNoticeTime",
+                table: "VisitTask",
+                type: "datetime2",
+                nullable: true,
+                comment: "通知IR加急阅片时间");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "ExpetidEmailNoticeTime",
+                table: "VisitTask");
+        }
+    }
+}

IRaCIS.Core.Infra.EFCore/Migrations/IRaCISDBContextModelSnapshot.cs

@@ -13301,6 +13301,10 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                     b.Property<Guid?>("DoctorUserId")
                         .HasColumnType("uniqueidentifier");
 
+                    b.Property<DateTime?>("ExpetidEmailNoticeTime")
+                        .HasColumnType("datetime2")
+                        .HasComment("通知IR加急阅片时间");
+
                     b.Property<DateTime?>("FirstReadingTime")
                         .HasColumnType("datetime2")
                         .HasComment("首次阅片时间");