From c2f4f09449f5ab016d30a797096f220e32ec7254 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Mon, 25 Jul 2022 11:24:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Reading/Dto/ReadingMedicalReviewDto.cs   | 12 ++++++++++++
 .../Service/Reading/ReadingImageTaskService.cs       |  9 ++++++++-
 .../Service/Reading/ReadingMedicalReviewService.cs   |  2 ++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
index a2e51e465..579d12dd4 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
@@ -99,6 +99,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public Guid VisitTaskId { get; set; }
 
+        /// <summary>
+        /// 无效的 为True无效
+        /// </summary>
+        public bool IsInvalid { get; set; }
+
     }
 
     public class FinishMedicalReviewInDto
@@ -227,6 +232,13 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public bool? IsApplyHeavyReading { get; set; }
 
+
+
+        /// <summary>
+        /// 图片路径
+        /// </summary>
+        public string ImagePath { get; set; } = string.Empty;
+
     }
 
     public class SendMedicalReviewDialogInDto
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
index c38bd3827..6cc73294f 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
@@ -671,7 +671,14 @@ namespace IRaCIS.Application.Services
                 JudgeResultImagePath = visitTask.JudgeResultImagePath,
                 VisitInfoList = new List<JudgeReadingInfoDto>()
             };
-            var taskList = await _visitTaskRepository.Where(x => x.JudgeVisitTaskId == inDto.VisitTaskId).OrderBy(x=>x.ArmEnum).ToListAsync();
+
+            var judgeDataInfo = await _readingJudgeInfoRepository.Where(x => x.JudgeTaskId == inDto.VisitTaskId).FirstNotNullAsync();
+
+            var taskids = new List<Guid>();
+
+            taskids.Add(judgeDataInfo.TaskIdOne);
+            taskids.Add(judgeDataInfo.TaskIdTwo);
+            var taskList = await _visitTaskRepository.Where(x => taskids.Contains(x.Id)).OrderBy(x=>x.ArmEnum).ToListAsync();
             judgeInfo.VisitTaskArmList = taskList.Select(x => new VisitTaskArm()
             {
                 ArmEnum = x.ArmEnum,
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs
index 0b96a6818..954419b4f 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs
@@ -437,6 +437,7 @@ namespace IRaCIS.Core.Application.Service
                 TaskMedicalReviewId = inDto.TaskMedicalReviewId,
                 UserTypeShortName = _userInfo.UserTypeShortName,
                 Content = inDto.Content,
+                ImagePath=inDto.ImagePath,
                 UserTypeEnumInt = _userInfo.UserTypeEnumInt,
                 VisitTaskId = visitTaskId,
                 DisagreeReason = inDto.DisagreeReason,
@@ -585,6 +586,7 @@ namespace IRaCIS.Core.Application.Service
                     IsClosedDialog=x.IsClosedDialog,
                     IsHaveQuestion=x.IsHaveQuestion,
                     MedicalDialogCloseEnum=x.MedicalDialogCloseEnum,
+                    IsInvalid=x.IsInvalid,
 
                 });