From 8b3711f7556a7cdb799ab17d2ed528f83aac1511 Mon Sep 17 00:00:00 2001
From: "{872297557@qq.com}" <872297557@qq.com>
Date: Mon, 26 Dec 2022 18:08:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E8=87=B4=E6=80=A7?=
 =?UTF-8?q?=E5=88=86=E6=9E=90bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Allocation/TaskConsistentRuleService.cs       |  1 +
 .../Triggers/SubjectVisitCheckPassedTrigger.cs    | 15 +++++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs b/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs
index 0b1c8e5f2..d9d2805fd 100644
--- a/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs
@@ -479,6 +479,7 @@ namespace IRaCIS.Core.Application.Service
                 ;
 
 
+
             var query = subjectQuery.Select(t => new DoctorSelfConsistentSubjectView()
             {
                 TrialId = t.TrialId,
diff --git a/IRaCIS.Core.Application/Triggers/SubjectVisitCheckPassedTrigger.cs b/IRaCIS.Core.Application/Triggers/SubjectVisitCheckPassedTrigger.cs
index 0bf325a0a..08eaaee10 100644
--- a/IRaCIS.Core.Application/Triggers/SubjectVisitCheckPassedTrigger.cs
+++ b/IRaCIS.Core.Application/Triggers/SubjectVisitCheckPassedTrigger.cs
@@ -13,16 +13,18 @@ namespace IRaCIS.Core.Application.Triggers
     /// </summary>
     public class SubjectVisitCheckPassedTrigger : IBeforeSaveTrigger<SubjectVisit>
     {
-      
+
         private readonly IVisitTaskHelpeService _visitTaskHelpeService;
 
+        private readonly IRepository<Subject> _subjectRepository;
 
-        public SubjectVisitCheckPassedTrigger(
+
+        public SubjectVisitCheckPassedTrigger(IRepository<Subject> subjectRepository,
           
             IVisitTaskHelpeService visitTaskHelpeService)
         {
-            
-        
+
+            _subjectRepository = subjectRepository;
             _visitTaskHelpeService = visitTaskHelpeService;
         }
 
@@ -39,6 +41,11 @@ namespace IRaCIS.Core.Application.Triggers
                 // 一致性核查通过  生成读片任务
                 if (context.UnmodifiedEntity?.CheckState != subjectVisit.CheckState && subjectVisit.CheckState == CheckStateEnum.CVPassed)
                 {
+                    //退回或者重阅的任务一致性核查通过了  此时设置Subject 重阅影响状态
+                    if (context.Entity.IsPMBackOrReReading == true)
+                    {
+                        await _subjectRepository.UpdatePartialFromQueryAsync(t => t.Id == context.Entity.SubjectId, u => new Subject() { IsReReadingOrBackInfluenceAnalysis = false });
+                    }
 
                     context.Entity.IsPMBackOrReReading = false;