From 9e678e950985cebb47a4ff39625900a925217169 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Thu, 28 Jul 2022 14:07:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Allocation/TaskConsistentRuleService.cs     | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs b/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs
index 5920e2129..dfe7d7e96 100644
--- a/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs
@@ -161,17 +161,17 @@ namespace IRaCIS.Core.Application.Service
                             {
                                 SubjectId = lastTask.SubjectId,
                                 TrialId = lastTask.TrialId,
-                                BlindSubjectCode = lastTask.BlindSubjectCode,
-                                BlindTrialSiteCode = lastTask.BlindTrialSiteCode,
                                 ArmEnum = lastTask.ArmEnum,
-                                ReadingCategory = ReadingCategory.Global
+                                ReadingCategory = ReadingCategory.Global,
+                                TaskName= lastTask.VisitTaskNum + ReadingCommon.TaskNumDic[ReadingCategory.Global] + "Global",
+                                TaskBlindName= lastTask.VisitTaskNum + ReadingCommon.TaskNumDic[ReadingCategory.Global] + "Global"
                             };
                         }
 
 
 
-                        existGlobal.TaskName = (int)existGlobal.VisitTaskNum + "Global";
-                        existGlobal.TaskBlindName = (int)existGlobal.VisitTaskNum + "Global";
+                        existGlobal.BlindSubjectCode = lastTask.BlindSubjectCode;
+                        existGlobal.BlindTrialSiteCode = lastTask.BlindTrialSiteCode;
                        
                         subject.VisitTaskList.Add(existGlobal);
                     }
@@ -398,13 +398,14 @@ namespace IRaCIS.Core.Application.Service
                             {
                                 SubjectId = lastTask.SubjectId,
                                 TrialId = lastTask.TrialId,                                                         
-                                ReadingCategory = ReadingCategory.Global
+                                ReadingCategory = ReadingCategory.Global,
+                                TaskBlindName= lastTask.VisitTaskNum + ReadingCommon.TaskNumDic[ReadingCategory.Global]+ "Global",
+                                TaskName= lastTask.VisitTaskNum + ReadingCommon.TaskNumDic[ReadingCategory.Global] + "Global"
+
                             };
                         }
 
                         existGlobal.ArmEnum = Arm.GroupConsistentArm;
-                        existGlobal.TaskName = (int)existGlobal.VisitTaskNum + "Global";
-                        existGlobal.TaskBlindName = (int)existGlobal.VisitTaskNum + "Global";
                         existGlobal.DoctorUserId = needAddDoctorUserId;
                     
                         subjectAddTaskList.Add(existGlobal);