From ef2e125531261fb6ee12195d831e6f160373db50 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Mon, 4 Jul 2022 16:31:15 +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

---
 .../Reading/Dto/ReadingMedicalReviewDto.cs    | 19 +++++++++++++++----
 .../Reading/ReadingMedicalReviewService.cs    |  7 +++++--
 .../Allocation/TaskMedicalReview.cs           |  8 ++++----
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
index 04e06c6db..5d7d1e508 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
@@ -56,6 +56,17 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public Arm ArmEnum { get; set; }
 
+
+        /// <summary>
+        /// 是否完成
+        /// </summary>
+        public bool IsReviewFinish { get; set; }
+
+        /// <summary>
+        /// 是否关闭
+        /// </summary>
+        public bool IsClosedDialo { get; set; }
+
         public List<TaskInfo> TaskList { get; set; } = new List<TaskInfo>();
 
  
@@ -95,12 +106,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// <summary>
         /// 是否完成
         /// </summary>
-        public bool IsFinish { get; set; }
+        public bool IsReviewFinish { get; set; }
 
         /// <summary>
         /// 是否关闭
         /// </summary>
-        public bool IsClosed { get; set; }
+        public bool IsClosedDialo { get; set; }
     }
 
     public class MedicalReviewInfo 
@@ -132,12 +143,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// <summary>
         /// 是否完成
         /// </summary>
-        public bool IsFinish { get; set; }
+        public bool IsReviewFinish { get; set; }
 
         /// <summary>
         /// 是否关闭
         /// </summary>
-        public bool IsClosed { get; set; }
+        public bool IsClosedDialo { get; set; }
     }
 
     public class ReadingMedicineQuestion 
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs
index d1db778e0..6e8476d5d 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs
@@ -66,6 +66,9 @@ namespace IRaCIS.Core.Application.Service
 
             medicalReviewInfo.VisitTaskId = taskInfo.Id;
             medicalReviewInfo.ArmEnum = taskInfo.ArmEnum;
+            medicalReviewInfo.IsClosedDialo = medicalReviewInfo.MedicalReviewInfo.IsClosedDialo;
+            medicalReviewInfo.IsReviewFinish = medicalReviewInfo.MedicalReviewInfo.IsReviewFinish;
+
 
             #region 取任务
             if (medicalReviewInfo.IsReadingTaskViewInOrder)
@@ -247,8 +250,8 @@ namespace IRaCIS.Core.Application.Service
                 Questioning = inDto.Questioning,
                 ImagePath = inDto.ImagePath,
                 AuditAdviceEnum = inDto.AuditAdviceEnum,
-                IsFinish = inDto.IsFinish,
-                IsClosed = inDto.IsClosed
+                IsReviewFinish = inDto.IsReviewFinish,
+                IsClosedDialo = inDto.IsClosedDialo
             });
 
             var result = await _taskMedicalReviewRepository.SaveChangesAsync();
diff --git a/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs b/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs
index be6be3d72..6abc319a1 100644
--- a/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs
+++ b/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs
@@ -110,14 +110,14 @@ namespace IRaCIS.Core.Domain.Models
 		public AuditAdvice AuditAdviceEnum { get; set; }
 
 		/// <summary>
-		/// 是否完成
+		/// 是否审核完成
 		/// </summary>
-		public bool IsFinish { get; set; }
+		public bool IsReviewFinish { get; set; }
 
 		/// <summary>
-		/// 是否关闭
+		/// 是否关闭对话
 		/// </summary>
-		public bool IsClosed { get; set; }
+		public bool IsClosedDialo { get; set; }
 
 		/// <summary>
 		/// 保存问题的时间