From 2b3d5b49600dc7433c0506a0e1d5a361493c1d1b Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 1 Mar 2023 14:43:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A5=E7=BB=84=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4=E5=8F=91=E9=80=81=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Document/TrialEmailNoticeConfigService.cs | 39 ++++++++++++++++---
 1 file changed, 34 insertions(+), 5 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
index a117c8b5..dd5efbb0 100644
--- a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
+++ b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
@@ -262,6 +262,7 @@ namespace IRaCIS.Core.Application.Service
                 t.SubjectId,
                 t.Subject.SiteId,
 
+                t.DoctorUserId,
                 t.ReadingTaskState,
                 t.ReadingCategory,
                 t.SignTime,
@@ -472,13 +473,41 @@ namespace IRaCIS.Core.Application.Service
 
 
                 //如果其他阅片人已经做了，说明发送了入组确认报告，第二个人做完就不发送了
-                if (await _visitTaskRepository.AnyAsync(t => t.SourceSubjectVisitId == taskInfo.SourceSubjectVisitId && t.TaskState == TaskState.Effect && t.IsAnalysisCreate == false &&
-                t.Id != visitTaskId && t.ReadingTaskState == ReadingTaskState.HaveSigned && t.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId))
+
+                //入组确认一直交给第一个人，如果第一个人重阅 还未做完，第二个人先做完了，此时不发
+
+                var existFirstEnrollTask= await _visitTaskRepository.Where(t => t.SourceSubjectVisitId == taskInfo.SourceSubjectVisitId && t.IsAnalysisCreate == false 
+                && t.ReadingTaskState == ReadingTaskState.HaveSigned && t.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId).OrderBy(t=>t.SignTime).FirstOrDefaultAsync();
+
+                //入组确认的医生已确定
+                if(existFirstEnrollTask!= null)
                 {
-                    isNeedSend = false;
+                    if(taskInfo.DoctorUserId==existFirstEnrollTask.DoctorUserId)
+                    {                      
+                        isNeedSend = await DealMedicalReviewTasKGenerateAndIsSendAsync(taskInfo.TrialId, isHandSend, answer, new List<Guid>() { visitTaskId }, minUserIdList);
+
+                        if (answer == "是")
+                        {
+                            //把另外一个人的任务设置为不加急（如果项目加急是否  subject 加急是否）
+                            var urgent = _repository.Where<SubjectVisit>(t => t.Id == taskInfo.SourceSubjectVisitId).Select(t => new { IsSubjectUrgent = t.Subject.IsUrgent, t.Trial.IsUrgent }).FirstOrDefault();
+
+                            if (urgent?.IsUrgent == false || urgent?.IsSubjectUrgent == false)
+                            {
+                                await _visitTaskRepository.BatchUpdateNoTrackingAsync(t => t.SourceSubjectVisitId == taskInfo.SourceSubjectVisitId && t.TaskState == TaskState.Effect && t.IsAnalysisCreate == false &&
+                        t.Id != visitTaskId && t.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId, u => new VisitTask() { IsUrgent = false });
+                            }
+                        }
+                    }
+                    else
+                    {
+                        isNeedSend = false;
+                    }
                 }
                 else
                 {
+                    isNeedSend = await DealMedicalReviewTasKGenerateAndIsSendAsync(taskInfo.TrialId, isHandSend, answer, new List<Guid>() { visitTaskId }, minUserIdList);
+
+
                     if (answer == "是")
                     {
                         //把另外一个人的任务设置为不加急（如果项目加急是否  subject 加急是否）
@@ -491,11 +520,11 @@ namespace IRaCIS.Core.Application.Service
                         }
                     }
 
-                  
-                    isNeedSend = await DealMedicalReviewTasKGenerateAndIsSendAsync(taskInfo.TrialId, isHandSend, answer, new List<Guid>() { visitTaskId }, minUserIdList);
 
                 }
 
+             
+
 
             }
             else if (businessScenarioEnum == CommonDocumentBusinessScenario.PDConfirmed)