From f1630fc8ecdd20e67e78b1233045bababd0b2636 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 2 Nov 2022 09:22:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E8=87=B4=E6=80=A7=E5=88=86=E6=9E=90?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Allocation/TaskConsistentRuleService.cs  | 12 ++++++------
 .../Document/TrialEmailNoticeConfigService.cs        |  4 ++++
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs b/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs
index 3780a8e12..85f358c66 100644
--- a/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs
@@ -188,14 +188,14 @@ namespace IRaCIS.Core.Application.Service
                                 TrialId = lastTask.TrialId,
                                 ArmEnum = lastTask.ArmEnum,
                                 ReadingCategory = ReadingCategory.Global,
-                                TaskName = lastTask.VisitTaskNum + "Global",
-                                TaskBlindName = lastTask.VisitTaskNum + "Global",
+                                TaskName = lastTask.TaskName + "_Global",
+                                TaskBlindName = lastTask.TaskBlindName + "_Global",
                                 TrialReadingCriterionId=trialReadingCriterionId,
                             };
                         }
 
 
-
+                        existGlobal.DoctorUserId = doctorUserId;
                         existGlobal.BlindSubjectCode = lastTask.BlindSubjectCode;
                         existGlobal.BlindTrialSiteCode = lastTask.BlindTrialSiteCode;
 
@@ -343,10 +343,10 @@ namespace IRaCIS.Core.Application.Service
                                 SubjectId = lastTask.SubjectId,
                                 TrialId = lastTask.TrialId,
                                 ReadingCategory = ReadingCategory.Global,
-                                TaskBlindName = lastTask.VisitTaskNum + "Global",
-                                TaskName = lastTask.VisitTaskNum + "Global",
+                                TaskName = lastTask.TaskName + "_Global",
+                                TaskBlindName = lastTask.TaskBlindName + "_Global",
 
-                                TrialReadingCriterionId=trialReadingCriterionId,
+                                TrialReadingCriterionId =trialReadingCriterionId,
 
                             };
                         }
diff --git a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
index 60ad6d580..43dec17d5 100644
--- a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
+++ b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
@@ -450,6 +450,10 @@ namespace IRaCIS.Core.Application.Service
 
                                 }
                             }
+                            else
+                            {
+                                throw new BusinessValidationFailedException("发送PD 进展邮件中发现任务数据有问题！");
+                            }