From ab5b0ba0837c934a2495528caa6f162be11fa8f8 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Tue, 31 Jan 2023 14:47:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.Application/IRaCIS.Core.Application.xml        | 6 ++++++
 .../Reading/ReadingImageTask/ReadingImageTaskService.cs    | 6 ++++--
 IRaCIS.Core.Domain/Allocation/VisitTask.cs                 | 7 +++----
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 74213ed46..1c438bd49 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -9522,6 +9522,12 @@
             <param name="visitTaskId"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.CreateTaskRelated(System.Guid)">
+            <summary>
+            签名时创建任务关联
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.AddReadingTask(System.Guid,System.Nullable{System.Guid})">
             <summary>
             阅片期 -全局和肿瘤学任务的生成
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index adb804650..346195567 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -1938,6 +1938,9 @@ namespace IRaCIS.Application.Services
 
             await _visitTaskRepository.SaveChangesAsync();
 
+            // 创建任务关联关系
+            await this.CreateTaskRelated(visitTaskId);
+
             // 触裁判任务
             await this.TriggerJudgeQuestion(visitTaskId);
             // 添加阅片期任务
@@ -1946,8 +1949,7 @@ namespace IRaCIS.Application.Services
             // 完成阅片修改状态
             //await this.FinishReadUpdateState(visitTaskId);
 
-            // 创建任务关联关系
-            await this.CreateTaskRelated(visitTaskId);
+          
 
             await _visitTaskRepository.SaveChangesAsync();
 
diff --git a/IRaCIS.Core.Domain/Allocation/VisitTask.cs b/IRaCIS.Core.Domain/Allocation/VisitTask.cs
index b051f5dde..abd0386c2 100644
--- a/IRaCIS.Core.Domain/Allocation/VisitTask.cs
+++ b/IRaCIS.Core.Domain/Allocation/VisitTask.cs
@@ -191,8 +191,8 @@ namespace IRaCIS.Core.Domain.Models
 
                 try
                 {
-                  
-                    return this.RelatedVisitTaskIds.Trim().Split(',').Select(x=>Guid.Parse(x)).ToList();
+
+                    return JsonConvert.DeserializeObject<List<Guid>>(this.RelatedVisitTaskIds);
                 }
                 catch (Exception)
                 {
@@ -222,8 +222,7 @@ namespace IRaCIS.Core.Domain.Models
 
                 try
                 {
-
-                    return this.PastResultTaskIds.Trim().Split(',').Select(x => Guid.Parse(x)).ToList();
+                    return JsonConvert.DeserializeObject<List<Guid>>(this.PastResultTaskIds);
                 }
                 catch (Exception)
                 {