From 12a7d5b8fd95298bcd1c80e80a4eda0bf1760f12 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 1 Mar 2023 15:01:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B2=BE=E7=AE=80=E5=85=A5=E7=BB=84=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E9=82=AE=E4=BB=B6=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Document/TrialEmailNoticeConfigService.cs | 25 +++----------------
 IRaCIS.Core.Domain/SQLFile/Test.sql           |  9 ++++++-
 2 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
index dd5efbb04..0111fa771 100644
--- a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
+++ b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
@@ -480,28 +480,9 @@ namespace IRaCIS.Core.Application.Service
                 && t.ReadingTaskState == ReadingTaskState.HaveSigned && t.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId).OrderBy(t=>t.SignTime).FirstOrDefaultAsync();
 
                 //入组确认的医生已确定
-                if(existFirstEnrollTask!= null)
-                {
-                    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;
-                    }
+                if( (existFirstEnrollTask != null) &&(taskInfo.DoctorUserId != existFirstEnrollTask.DoctorUserId) )
+                {                   
+                        isNeedSend = false;                    
                 }
                 else
                 {
diff --git a/IRaCIS.Core.Domain/SQLFile/Test.sql b/IRaCIS.Core.Domain/SQLFile/Test.sql
index a82902899..9de49ae3a 100644
--- a/IRaCIS.Core.Domain/SQLFile/Test.sql
+++ b/IRaCIS.Core.Domain/SQLFile/Test.sql
@@ -949,4 +949,11 @@ where ReadingQuestionTrial.ReadingQuestionSystemId is not null and ReadingTableQ
 
  ---------------------------------------------2023-02-20-----------------------------------
  --维护全局阅片是否修改状态
- update  ReadingTaskQuestionAnswer set IsGlobalChange=1 where  GlobalChangeAnswer is  not null and GlobalChangeAnswer!='' and Answer!=GlobalChangeAnswer
\ No newline at end of file
+ update  ReadingTaskQuestionAnswer set IsGlobalChange=1 where  GlobalChangeAnswer is  not null and GlobalChangeAnswer!='' and Answer!=GlobalChangeAnswer
+
+
+ -----20230301
+update CommonDocument set Name='PD进展报告.docx' where Name='PCR_v1.0_Final.docx'
+update CommonDocument set Name='入组确认报告.docx' where Name='ECR_v1.0_Final.docx'
+update TrialEmailNoticeConfig set FileName='PD进展报告.docx' where FileName='PCR_v1.0_Final.docx'
+update TrialEmailNoticeConfig set FileName='入组确认报告.docx' where FileName='ECR_v1.0_Final.docx'
\ No newline at end of file