From c940976f7f6b94e9853f4d9af8f0011f32232e22 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Sat, 12 Oct 2024 11:02:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=B3=E8=AF=B7=E9=87=8D?=
 =?UTF-8?q?=E9=98=85=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.Application/IRaCIS.Core.Application.xml        | 2 +-
 .../MassTransit/Consumer/ReadingRelationEmailConsumer.cs   | 6 +++---
 .../_DomainEvent/ReadingEnrollOrPDRelationEvent.cs         | 7 +++++--
 IRaCIS.Core.Infra.EFCore/Interceptor/AddDomainExt.cs       | 4 ++--
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 7e404b9c7..1234e3753 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -12746,7 +12746,7 @@
         </member>
         <member name="T:IRaCIS.Core.Application.MassTransit.Consumer.UrgentIRApplyedReReadingConsumer">
             <summary>
-            加急阅片 IR 申请重阅
+            加急阅片 IR 申请重阅  或者PM 申请重阅
             </summary>
         </member>
         <member name="T:IRaCIS.Core.Application.MassTransit.Consumer.UserSiteSurveySubmitedEventConsumer">
diff --git a/IRaCIS.Core.Application/MassTransit/Consumer/ReadingRelationEmailConsumer.cs b/IRaCIS.Core.Application/MassTransit/Consumer/ReadingRelationEmailConsumer.cs
index 9d943b2c0..33e82753e 100644
--- a/IRaCIS.Core.Application/MassTransit/Consumer/ReadingRelationEmailConsumer.cs
+++ b/IRaCIS.Core.Application/MassTransit/Consumer/ReadingRelationEmailConsumer.cs
@@ -42,11 +42,11 @@ public class UrgentMIMRepliedMedicalReviewConsumer : IConsumer<UrgentMIMRepliedM
 }
 
 /// <summary>
-/// 加急阅片 IR 申请重阅
+/// 加急阅片 IR 申请重阅  或者PM 申请重阅
 /// </summary>
-public class UrgentIRApplyedReReadingConsumer : IConsumer<UrgentIRApplyedReReading>
+public class UrgentIRApplyedReReadingConsumer : IConsumer<UrgentApplyedReReading>
 {
-    public Task Consume(ConsumeContext<UrgentIRApplyedReReading> context)
+    public Task Consume(ConsumeContext<UrgentApplyedReReading> context)
     {
         throw new NotImplementedException();
     }
diff --git a/IRaCIS.Core.Domain/_DomainEvent/ReadingEnrollOrPDRelationEvent.cs b/IRaCIS.Core.Domain/_DomainEvent/ReadingEnrollOrPDRelationEvent.cs
index a5975b2c5..1285847a6 100644
--- a/IRaCIS.Core.Domain/_DomainEvent/ReadingEnrollOrPDRelationEvent.cs
+++ b/IRaCIS.Core.Domain/_DomainEvent/ReadingEnrollOrPDRelationEvent.cs
@@ -1,4 +1,5 @@
 using IRaCIS.Core.Domain.BaseModel;
+using IRaCIS.Core.Domain.Share;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -33,9 +34,11 @@ public class UrgentMIMRepliedMedicalReview : DomainEvent
 
 
 /// <summary>
-/// 加急阅片 IR 申请重阅
+/// 加急阅片 IR 申请重阅  或者PM 申请重阅
 /// </summary>
-public class UrgentIRApplyedReReading : DomainEvent
+public class UrgentApplyedReReading : DomainEvent
 {
     public Guid VisitTaskId { get; set; }
+
+    public ReReadingApplyState ReReadingApplyState { get; set; }
 }
diff --git a/IRaCIS.Core.Infra.EFCore/Interceptor/AddDomainExt.cs b/IRaCIS.Core.Infra.EFCore/Interceptor/AddDomainExt.cs
index f274bb409..3a3ce07b2 100644
--- a/IRaCIS.Core.Infra.EFCore/Interceptor/AddDomainExt.cs
+++ b/IRaCIS.Core.Infra.EFCore/Interceptor/AddDomainExt.cs
@@ -237,7 +237,7 @@ public static class DBContext_Ext
 
             var originReReadingApplyState = entry.Property(p => p.ReReadingApplyState).OriginalValue;
 
-            if (originReReadingApplyState == ReReadingApplyState.Default && visitTask.ReReadingApplyState == ReReadingApplyState.DocotorHaveApplyed)
+            if (originReReadingApplyState == ReReadingApplyState.Default && (visitTask.ReReadingApplyState == ReReadingApplyState.DocotorHaveApplyed || visitTask.ReReadingApplyState == ReReadingApplyState.TrialGroupHaveApplyed))
             {
                 var findSubjectVisit = new EnrollmentConfirmAndPD();
 
@@ -258,7 +258,7 @@ public static class DBContext_Ext
                 if (findSubjectVisit.IsEnrollmentConfirm || findSubjectVisit.PDState == PDStateEnum.PDProgress)
                 {
 
-                    visitTask.AddDomainEvent(new UrgentIRApplyedReReading() { VisitTaskId = visitTask.Id });
+                    visitTask.AddDomainEvent(new UrgentApplyedReReading() { VisitTaskId = visitTask.Id, ReReadingApplyState= visitTask.ReReadingApplyState });
 
                     //添加进记录
                     eventStoreList.AddRange(GetStoreEvents(visitTask.DomainEvents));