From eb890b0c761af01ccd80ab5dc4ddd9150cf42de6 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Fri, 8 Jul 2022 13:30: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

---
 .../Reading/Dto/ReadingMedicalReviewDto.cs    | 11 ++++++++
 .../Reading/ReadingMedicalReviewService.cs    |  7 +++--
 .../Allocation/AllocationRelation.cs          | 28 +++++++++++++++++++
 .../Allocation/TaskMedicalReview.cs           | 11 ++++++++
 4 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
index 6dc7fff86..91291e2ae 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
@@ -311,6 +311,17 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// 是否关闭
         /// </summary>
         public bool IsClosedDialog { get; set; }
+
+
+        /// <summary>
+        /// 医学审核对话关闭原因
+        /// </summary>
+        public MedicalDialogClose MedicalDialogCloseEnum { get; set; }
+
+        /// <summary>
+        /// 对话关闭原因
+        /// </summary>
+        public string DialogCloseReason { get; set; } = string.Empty;
     }
 
     public class SaveMedicalReviewInfoInDto
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs
index b10c6d806..21d55cd48 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs
@@ -327,7 +327,9 @@ namespace IRaCIS.Core.Application.Service
         {
             await _taskMedicalReviewRepository.UpdatePartialFromQueryAsync(inDto.TaskMedicalReviewId, x => new TaskMedicalReview()
             {
-                IsClosedDialog = inDto.IsClosedDialog
+                IsClosedDialog = inDto.IsClosedDialog,
+                MedicalDialogCloseEnum=inDto.MedicalDialogCloseEnum,
+                DialogCloseReason=inDto.DialogCloseReason,
             });
 
             var result = await _taskMedicalReviewRepository.SaveChangesAsync();
@@ -385,7 +387,8 @@ namespace IRaCIS.Core.Application.Service
                 });
                 await _taskMedicalReviewRepository.BatchUpdateNoTrackingAsync(x => !x.IsClosedDialog && x.Id == inDto.TaskMedicalReviewId, x => new TaskMedicalReview()
                 {
-                    IsClosedDialog = true
+                    IsClosedDialog = true,
+                    MedicalDialogCloseEnum= MedicalDialogClose.IRApplyReReading,
                 });
             }
             ReadingMedicalReviewDialog dialog = new ReadingMedicalReviewDialog()
diff --git a/IRaCIS.Core.Domain.Share/Allocation/AllocationRelation.cs b/IRaCIS.Core.Domain.Share/Allocation/AllocationRelation.cs
index 7616141ce..4831fc755 100644
--- a/IRaCIS.Core.Domain.Share/Allocation/AllocationRelation.cs
+++ b/IRaCIS.Core.Domain.Share/Allocation/AllocationRelation.cs
@@ -82,6 +82,34 @@ namespace IRaCIS.Core.Domain.Share
         HaveSigned=2
     }
 
+    public enum MedicalDialogClose
+    {
+        /// <summary>
+        /// 无
+        /// </summary>
+        None = 0,
+
+        /// <summary>
+        /// 问题已解决
+        /// </summary>
+        ProblemSolved = 1,
+
+        /// <summary>
+        /// 问题无法解决
+        /// </summary>
+        Unresolvable = 2,
+
+        /// <summary>
+        /// IR申请重阅
+        /// </summary>
+        IRApplyReReading = 3,
+
+        /// <summary>
+        /// 其他原因
+        /// </summary>
+        OtherReason = 4
+    }
+
     /// <summary>
     /// 
     /// </summary>
diff --git a/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs b/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs
index f6883879d..66c7cfa69 100644
--- a/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs
+++ b/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs
@@ -154,6 +154,17 @@ namespace IRaCIS.Core.Domain.Models
 		public bool IsSendMessage { get; set; } = false;
 
 
+		/// <summary>
+		/// 医学审核对话关闭原因
+		/// </summary>
+		public MedicalDialogClose MedicalDialogCloseEnum { get; set; }
+
+	     /// <summary>
+		/// 对话关闭原因
+		/// </summary>
+		public string DialogCloseReason { get; set; } = string.Empty;
+
+
 
 	}