From 1ad7308108fafa37456b1548cd4dcdb9b2675c12 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Wed, 28 Dec 2022 17:57:57 +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

---
 .../Service/Reading/Dto/ReadingMedicalReviewDto.cs    |  5 +++++
 .../MedicalAudit/ReadingMedicalReviewService.cs       |  3 ++-
 .../MedicalAudit/ReadingMedicalReviewDialog.cs        | 11 ++++++++---
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
index b9fa48018..74e0d4a43 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
@@ -197,6 +197,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public string UserTypeShortName { get; set; }
 
+        /// <summary>
+        /// 医学审核对话关闭原因
+        /// </summary>
+        public MedicalDialogClose? MedicalDialogCloseEnum { get; set; }
+
         /// <summary>
         /// 用户角色枚举
         /// </summary>
diff --git a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs
index b65ffd577..9a8845b91 100644
--- a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs
@@ -531,7 +531,8 @@ namespace IRaCIS.Core.Application.Service
                 TaskMedicalReviewId = inDto.TaskMedicalReviewId,
                 VisitTaskId= taskMedical.VisitTaskId,
                 UserTypeShortName = _userInfo.UserTypeShortName,
-                Content = inDto.MedicalDialogCloseEnum.GetDescription()+ (inDto.DialogCloseReason.IsNullOrEmpty()? inDto.DialogCloseReason:","+ inDto.DialogCloseReason),
+                MedicalDialogCloseEnum= inDto.MedicalDialogCloseEnum,
+                Content = inDto.DialogCloseReason,
                 UserTypeEnumInt = _userInfo.UserTypeEnumInt,
             };
 
diff --git a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicalReviewDialog.cs b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicalReviewDialog.cs
index 54813200c..9976c0d01 100644
--- a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicalReviewDialog.cs
+++ b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicalReviewDialog.cs
@@ -37,10 +37,15 @@ namespace IRaCIS.Core.Domain.Models
 		/// 用户角色
 		/// </summary>
 		public string UserTypeShortName { get; set; }
-	
+
 		/// <summary>
-        /// 用户角色枚举
-        /// </summary>
+		/// 医学审核对话关闭原因
+		/// </summary>
+		public MedicalDialogClose? MedicalDialogCloseEnum { get; set; }
+
+		/// <summary>
+		/// 用户角色枚举
+		/// </summary>
 		public int UserTypeEnumInt { get; set; }
 	
 		/// <summary>