Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8

代码修改
2024-10-17 10:38:29 +08:00 · 2024-10-17 10:38:28 +08:00
3 changed files with 75 additions and 54 deletions
--- a/IRaCIS.Core.Application/MassTransit/Consumer/ReadingRelationEmailConsumer.cs
+++ b/IRaCIS.Core.Application/MassTransit/Consumer/ReadingRelationEmailConsumer.cs
@ -108,13 +108,17 @@ public class UrgentMedicalReviewAddedEventConsumer(
                   //dictionValue[1],     // 阅片人是否同意        {6}
                   dictionValue[2],     // 审核状态             {6}
                   dictionValue[3],    // 是否加急               {7}
-
+                  _systemEmailConfig.SiteUrl              // 链接                    {8}
                    );

                return (topicStr, htmlBodyStr);
            };

-        await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository, EmailBusinessScenario.EligibilityVerification_MedicalQC, messageToSend, emailConfigFunc);
+        await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository,
+
+         context.Message.IsPD ? EmailBusinessScenario.PDVerification_MedicalQC :   EmailBusinessScenario.EligibilityVerification_MedicalQC,
+            
+            messageToSend, emailConfigFunc);

        await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
    }
@ -125,6 +129,7 @@ public class UrgentIRRepliedMedicalReviewConsumer(
      IRepository<User> _userRepository,
       IRepository<TaskMedicalReview> _taskMedicalReviewRepository,
      IRepository<Trial> _trialRepository,
+        IRepository<SubjectVisit> _subjectVisitRepository,
      IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository,
      IRepository<VisitTask> _visitTaskRepository,
         IRepository<Dictionary> _dictionaryRepository,
@ -137,73 +142,85 @@ public class UrgentIRRepliedMedicalReviewConsumer(
    //IR 回复医学反馈通知MIM
    public async Task Consume(ConsumeContext<UrgentIRRepliedMedicalReview> context)
    {
-        //Console.WriteLine("发送【加急的医学反馈任务  通知MIM】邮件！！！");
-        //var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
+        Console.WriteLine("发送(028,029) 【IR 回复医学反馈通知MIM】邮件！！！");
+        var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;

-        //var medicalReviewId = context.Message.MedicalReviewId;
+        var medicalReviewId = context.Message.MedicalReviewId;

-        //var medicalReview = await _taskMedicalReviewRepository.Where(x => x.Id == medicalReviewId).Include(x => x.VisitTask).Include(x => x.MedicalManagerUser).FirstOrDefaultAsync();
+        var medicalReview = await _taskMedicalReviewRepository.Where(x => x.Id == medicalReviewId).Include(x => x.VisitTask).Include(x => x.MedicalManagerUser).FirstOrDefaultAsync();



-        //if (medicalReview.MedicalManagerUserId == null)
-        //{
-        //    Console.WriteLine("MIMId为空 ID" + medicalReviewId);
-        //    return;
-        //}
-        //var criterion = await _readingQuestionCriterionTrialRepository.FirstOrDefaultAsync(x => x.Id == medicalReview.VisitTask.TrialReadingCriterionId);
-        //var userinfo = await _userRepository.Where(x => x.Id == medicalReview.MedicalManagerUserId).FirstOrDefaultAsync();
+        if (medicalReview.MedicalManagerUserId == null)
+        {
+            Console.WriteLine("MIMId为空 ID" + medicalReviewId);
+            return;
+        }
+        var criterion = await _readingQuestionCriterionTrialRepository.FirstOrDefaultAsync(x => x.Id == medicalReview.VisitTask.TrialReadingCriterionId);
+        var userinfo = await _userRepository.Where(x => x.Id == medicalReview.MedicalManagerUserId).FirstOrDefaultAsync();

-        //var taskInfo = await _visitTaskRepository.Where(x => x.Id == medicalReview.VisitTaskId).Include(x => x.SourceSubjectVisit).Include(x => x.ReadModule).Include(x => x.Subject).FirstNotNullAsync();
+        var taskInfo = await _visitTaskRepository.Where(x => x.Id == medicalReview.VisitTaskId).Include(x => x.SourceSubjectVisit).Include(x => x.ReadModule).Include(x => x.Subject).FirstNotNullAsync();


-        //var messageToSend = new MimeMessage();
-        ////发件地址
-        //messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
-        //messageToSend.To.Add(new MailboxAddress(String.Empty, userinfo.EMail));
-
-        //var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == medicalReview.TrialId);
-        //var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
+        var visitid = taskInfo.SourceSubjectVisit == null ? taskInfo.ReadModule.SubjectVisitId : taskInfo.SourceSubjectVisitId;


-        //var dictionValue = await CommonEmailHelper.TranslationDictionary(new TranslationDictionaryDto()
-        //{
-
-        //    DictionaryRepository = _dictionaryRepository,
-        //    IsEn_US = isEn_US,
+        var subjectVisit = await _subjectVisitRepository.Where(x => x.Id == visitid).FirstOrDefaultAsync();


-        //    DictionaryList = new List<DictionaryDto>()
-        //    {
-        //     new DictionaryDto (){DictionaryCode= "ReadingCategory",EnumValue=taskInfo.ReadingCategory.GetEnumInt(), },
-        //     new DictionaryDto (){DictionaryCode= "MedicalReviewDoctorUserIdea",EnumValue=medicalReview.DoctorUserIdeaEnum.GetEnumInt(), },
-        //     new DictionaryDto (){DictionaryCode= "MedicalReviewAuditState",EnumValue=medicalReview.AuditState.GetEnumInt(), },
-        //     new DictionaryDto (){DictionaryCode= "YesOrNo",EnumValue=taskInfo.IsUrgent.ToString(), }
-        //    }
-        //});

-        //Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
-        //{
-        //    var topicStr = string.Format(input.topicStr, companyName, trialInfo.ResearchProgramNo);
-        //    var htmlBodyStr = string.Format(
-        //       CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
-        //       userinfo.FullName,              // 用户名
-        //       trialInfo.ExperimentName,        // 项目
-        //       criterion.CriterionName,  // 阅片标准
-        //       taskInfo.BlindSubjectCode.IsNullOrEmpty() ? taskInfo.Subject.Code : taskInfo.BlindSubjectCode, // 受试者
-        //       taskInfo.TaskBlindName,             // 访视
-        //       dictionValue[0],      // 任务类型
-        //       dictionValue[1],     // 阅片人是否同意
-        //       dictionValue[2],     // 审核状态
-        //       dictionValue[3]    // 是否加急
-        //        );
+        var messageToSend = new MimeMessage();
+        //发件地址
+        messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
+        messageToSend.To.Add(new MailboxAddress(String.Empty, userinfo.EMail));

-        //    return (topicStr, htmlBodyStr);
-        //};
+        var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == medicalReview.TrialId);
+        var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;

-        //await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository, EmailBusinessScenario.EligibilityVerification_MedicalQC, messageToSend, emailConfigFunc);

-        //await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
+        var dictionValue = await CommonEmailHelper.TranslationDictionary(new TranslationDictionaryDto()
+        {
+
+            DictionaryRepository = _dictionaryRepository,
+            IsEn_US = isEn_US,
+
+
+            DictionaryList = new List<DictionaryDto>()
+            {
+             new DictionaryDto (){DictionaryCode= "ReadingCategory",EnumValue=taskInfo.ReadingCategory.GetEnumInt(), },
+             new DictionaryDto (){DictionaryCode= "MedicalReviewDoctorUserIdea",EnumValue=medicalReview.DoctorUserIdeaEnum.GetEnumInt(), },
+             new DictionaryDto (){DictionaryCode= "MedicalReviewAuditState",EnumValue=medicalReview.AuditState.GetEnumInt(), },
+             new DictionaryDto (){DictionaryCode= "YesOrNo",EnumValue=taskInfo.IsUrgent.ToString(), }
+            }
+        });
+
+        Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
+        {
+            var topicStr = string.Format(input.topicStr, companyName, trialInfo.ResearchProgramNo);
+            var htmlBodyStr = string.Format(
+               CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
+               userinfo.FullName,              // 用户名  {0}
+               trialInfo.ExperimentName,        // 项目   {1}
+               criterion.CriterionName,  // 阅片标准       {2}
+               taskInfo.BlindSubjectCode.IsNullOrEmpty() ? taskInfo.Subject.Code : taskInfo.BlindSubjectCode, // 受试者 {3}
+               taskInfo.TaskBlindName,             // 访视  {4}
+               dictionValue[0],      // 任务类型            {5}
+               dictionValue[1],     // 阅片人是否同意        {6}
+               dictionValue[2],     // 审核状态             {7}
+               dictionValue[3],    // 是否加急               {8}
+              _systemEmailConfig.SiteUrl              // 链接                    {9}
+                );
+
+            return (topicStr, htmlBodyStr);
+        };
+
+        await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository,
+
+         context.Message.IsPD ? EmailBusinessScenario.PDVerification_ExpeditedMedicalQCResponse : EmailBusinessScenario.EligibilityVerification_ExpeditedMedicalQCResponse,
+
+            messageToSend, emailConfigFunc);
+
+        await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
    }
 }

--- a/IRaCIS.Core.Domain/_DomainEvent/ReadingEnrollOrPDRelationEvent.cs
+++ b/IRaCIS.Core.Domain/_DomainEvent/ReadingEnrollOrPDRelationEvent.cs
@ -25,6 +25,10 @@ public class UrgentMedicalReviewAddedEvent : DomainEvent
 public class UrgentIRRepliedMedicalReview : DomainEvent
 {
    public Guid ReadingMedicalReviewDialogId { get; set; }
+
+    public Guid MedicalReviewId { get; set; }
+
+    public bool IsPD { get; set; }
 }

 /// <summary>
--- a/IRaCIS.Core.Infra.EFCore/Interceptor/AddDomainExt.cs
+++ b/IRaCIS.Core.Infra.EFCore/Interceptor/AddDomainExt.cs
@ -220,7 +220,7 @@ public static class DBContext_Ext
                }
                else if (entry.State == EntityState.Added && readingMedicalReviewDialog.UserTypeEnumInt == (int)UserTypeEnum.IndependentReviewer)
                {
-                    readingMedicalReviewDialog.AddDomainEvent(new UrgentIRRepliedMedicalReview() { ReadingMedicalReviewDialogId = readingMedicalReviewDialog.Id });
+                    readingMedicalReviewDialog.AddDomainEvent(new UrgentIRRepliedMedicalReview() {  IsPD= findSubjectVisit.PDState == PDStateEnum.PDProgress, MedicalReviewId= readingMedicalReviewDialog.TaskMedicalReviewId, ReadingMedicalReviewDialogId = readingMedicalReviewDialog.Id });
                }

                //添加进记录
Author	SHA1	Message	Date
he	289811e0e6	Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8 continuous-integration/drone/push Build is passing Details	2024-10-17 10:38:29 +08:00
he	a258d3c4ae	代码修改	2024-10-17 10:38:28 +08:00