From 514764ee6eeaf9a301bb9fe821f57988a0f0c3c9 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Wed, 7 May 2025 13:16:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IRaCIS.Core.Application.xml               |  2 +-
 .../Consumer/Dto/SendImageReuploadEmailDto.cs | 29 +++++++++++++++++++
 .../MassTransit/Consumer/ImageConsumer.cs     |  4 +++
 3 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 IRaCIS.Core.Application/MassTransit/Consumer/Dto/SendImageReuploadEmailDto.cs

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index eb371f66e..08ba71b3c 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -14184,7 +14184,7 @@
             处理已阅任务重阅申请事件
             </summary>
         </member>
-        <member name="M:IRaCIS.Core.Application.MassTransit.Consumer.ImageConsumer.SendImageReuploadEmail(IRaCIS.Core.Domain.Models.EmailNoticeConfig,IRaCIS.Core.Domain.Share.EmailBusinessScenario,IRaCIS.Core.Domain.Models.SubjectVisit,System.Guid)">
+        <member name="M:IRaCIS.Core.Application.MassTransit.Consumer.ImageConsumer.SendImageReuploadEmail(IRaCIS.Core.Domain.Models.EmailNoticeConfig,IRaCIS.Core.Domain.Share.EmailBusinessScenario,IRaCIS.Core.Domain.Models.SubjectVisit,System.Guid,System.Collections.Generic.List{IRaCIS.Core.Domain.Share.UserTypeEnum},IRaCIS.Core.Domain.Share.ImageBackStateEnum)">
             <summary>
             发送影像重传相关邮件的通用方法
             </summary>
diff --git a/IRaCIS.Core.Application/MassTransit/Consumer/Dto/SendImageReuploadEmailDto.cs b/IRaCIS.Core.Application/MassTransit/Consumer/Dto/SendImageReuploadEmailDto.cs
new file mode 100644
index 000000000..36ac5aa0a
--- /dev/null
+++ b/IRaCIS.Core.Application/MassTransit/Consumer/Dto/SendImageReuploadEmailDto.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IRaCIS.Core.Application.MassTransit.Consumer.Dto
+{
+    public class SendImageReuploadEmailInDto
+    {
+        public EmailNoticeConfig EmailNoticeConfig { get; set; }
+
+        public EmailBusinessScenario Scenario { get; set; }
+
+        public SubjectVisit SubjectVisit { get; set; }
+
+        public Guid trialId { get; set; }
+        public List<UserTypeEnum> UserTypes { get; set; } = null;
+
+        public ImageBackStateEnum ImageBackStateEnum { get; set; } = ImageBackStateEnum.None;
+
+        public RequestBackStateEnum RequestBackStateEnum { get; set; } = RequestBackStateEnum.NotRequest;
+
+
+
+
+
+    }
+}
diff --git a/IRaCIS.Core.Application/MassTransit/Consumer/ImageConsumer.cs b/IRaCIS.Core.Application/MassTransit/Consumer/ImageConsumer.cs
index aae6a8486..dda36fa80 100644
--- a/IRaCIS.Core.Application/MassTransit/Consumer/ImageConsumer.cs
+++ b/IRaCIS.Core.Application/MassTransit/Consumer/ImageConsumer.cs
@@ -1,5 +1,6 @@
 using IRaCIS.Core.Application.Helper;
 using IRaCIS.Core.Application.MassTransit.Command;
+using IRaCIS.Core.Application.MassTransit.Consumer.Dto;
 using IRaCIS.Core.Application.Service.Reading.Dto;
 using IRaCIS.Core.Domain;
 using IRaCIS.Core.Domain._DomainEvent;
@@ -126,6 +127,7 @@ public class ImageConsumer(
                 scenario = EmailBusinessScenario.DataReconciliation_CRCApplyRe_Uploading; // 62
                 break;
             case RequestBackStateEnum.PM_AgressBack:
+            case RequestBackStateEnum.PM_NotAgree:
                 scenario = EmailBusinessScenario.DataReconciliation_PMApprovalRe_Uploading; // 63
                 break;
             default:
@@ -226,6 +228,8 @@ public class ImageConsumer(
     /// </summary>
     private async Task SendImageReuploadEmail(EmailNoticeConfig emailNoticeConfig, EmailBusinessScenario scenario, SubjectVisit subjectVisit, Guid trialId,List<UserTypeEnum> userTypes=null, ImageBackStateEnum imageBackStateEnum= ImageBackStateEnum.None)
     {
+
+        SendImageReuploadEmailInDto inDto = new SendImageReuploadEmailInDto() { };
         var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
 
         // 获取项目信息