From 458e3bc74bf2bcd5617028489ef4afd26d33836f Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Tue, 29 Nov 2022 15:23:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Reading/Dto/ReadingImageTaskViewModel.cs  |  7 +++--
 .../ReadingJudgeTaskService.cs                |  6 ++--
 IRaCIS.Core.Domain/Allocation/VisitTask.cs    | 29 +++++++++++++++++--
 3 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
index a6f3d0b8c..be09e1f90 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
@@ -1062,8 +1062,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public string JudgeResultRemark { get; set; }
 
+        public List<string> JudgeResultImagePathList { get; set; } = new List<string>();
 
-        public string JudgeResultImagePath { get; set; } = string.Empty;
+        //public string JudgeResultImagePath { get; set; } = string.Empty;
     }
 
     public class GetReadingPastResultListOutDto
@@ -1096,7 +1097,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public string JudgeResultRemark { get; set; } = string.Empty;
 
-        public string JudgeResultImagePath { get; set; } = string.Empty;
+        //public string JudgeResultImagePath { get; set; } = string.Empty;
+
+        public List<string> JudgeResultImagePathList { get; set; } = new List<string>();
     }
 
     public class GetReadingSubjectInfoOutDto
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs
index 8dbd8d571..bc091a51f 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs
@@ -91,7 +91,7 @@ namespace IRaCIS.Application.Services
                 ReadingTaskState = visitTask.ReadingTaskState,
                 JudgeResultTaskId = visitTask.JudgeResultTaskId,
                 JudgeResultRemark = visitTask.JudgeResultRemark,
-                JudgeResultImagePath = visitTask.JudgeResultImagePath,
+                JudgeResultImagePathList = visitTask.JudgeResultImagePathList,
                 VisitInfoList = new List<JudgeReadingInfoDto>()
             };
 
@@ -267,7 +267,7 @@ namespace IRaCIS.Application.Services
             {
                 JudgeResultTaskId = inDto.JudgeResultTaskId,
                 JudgeResultRemark = inDto.JudgeResultRemark,
-                JudgeResultImagePath = inDto.JudgeResultImagePath,
+                JudgeResultImagePath = string.Join(',',inDto.JudgeResultImagePathList),
 
             });
             var result = await _visitTaskRepository.SaveChangesAsync();
@@ -291,7 +291,7 @@ namespace IRaCIS.Application.Services
                 ReadingTaskState = ReadingTaskState.HaveSigned,
                 JudgeResultRemark = inDto.JudgeResultRemark,
                 SignTime = DateTime.Now,
-                JudgeResultImagePath = inDto.JudgeResultImagePath,
+                JudgeResultImagePath = string.Join(',', inDto.JudgeResultImagePathList),
             });
             await _visitTaskRepository.SaveChangesAsync();
             // 需要判断是否添加肿瘤学任务
diff --git a/IRaCIS.Core.Domain/Allocation/VisitTask.cs b/IRaCIS.Core.Domain/Allocation/VisitTask.cs
index f95525d6e..35932d97e 100644
--- a/IRaCIS.Core.Domain/Allocation/VisitTask.cs
+++ b/IRaCIS.Core.Domain/Allocation/VisitTask.cs
@@ -8,6 +8,7 @@ using IRaCIS.Core.Domain.Share;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace IRaCIS.Core.Domain.Models
 {
@@ -17,7 +18,7 @@ namespace IRaCIS.Core.Domain.Models
     [Table("VisitTask")]
     public class VisitTask : Entity, IAuditUpdate, IAuditAdd
     {
-      
+
         public string TaskName { get; set; } = string.Empty;
         public string TaskBlindName { get; set; } = string.Empty;
 
@@ -32,7 +33,7 @@ namespace IRaCIS.Core.Domain.Models
         /// </summary>
         public ReadingCategory ReadingCategory { get; set; }
 
-       
+
 
         public Guid CreateUserId { get; set; }
         public DateTime CreateTime { get; set; }
@@ -238,6 +239,28 @@ namespace IRaCIS.Core.Domain.Models
         //对于全局任务而言 才可以用的  关联的访视阅片结果
         public List<ReadingGlobalTaskInfo> GlobalVisitResultList { get; set; } = new List<ReadingGlobalTaskInfo>();
 
-    }
 
+        /// <summary>
+        /// 裁判结果图片地址
+        /// </summary>
+        [JsonIgnore]
+        public List<string> JudgeResultImagePathList
+        {
+            get
+            {
+
+                try
+                {
+                    return this.JudgeResultImagePath.Split(',').ToList();
+                }
+                catch (Exception)
+                {
+
+                    return new List<string>();
+                }
+
+            }
+        }
+
+    }
 }