From c2e5f769704b8251fe50dea9ad9fbbf106c7a3bf Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Tue, 5 Jul 2022 09:26:00 +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

---
 .../DTO/TaskMedicalReviewViewModel.cs         |  8 ++++++--
 .../Reading/Dto/ReadingMedicalReviewDto.cs    | 10 ++--------
 .../Reading/ReadingMedicalReviewService.cs    |  5 +++--
 .../Allocation/TaskMedicalReview.cs           | 19 +++++--------------
 4 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Allocation/DTO/TaskMedicalReviewViewModel.cs b/IRaCIS.Core.Application/Service/Allocation/DTO/TaskMedicalReviewViewModel.cs
index 74a71511..d5e5607b 100644
--- a/IRaCIS.Core.Application/Service/Allocation/DTO/TaskMedicalReviewViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/DTO/TaskMedicalReviewViewModel.cs
@@ -17,10 +17,14 @@ namespace IRaCIS.Core.Application.ViewModel
         public DateTime? AuditSignTime { get; set; }
         public int DoctorUserIdeaEnum { get; set; }
         public Guid? MedicalManagerUserId { get; set; }
-        public string AuditSuggestion { get; set; }
+
+        /// <summary>
+        /// 审核建议
+        /// </summary>
+        public AuditAdvice AuditAdviceEnum { get; set; }
+
 
 
-    
         public UserSimpleInfo DoctorUser { get; set; }
 
         public UserSimpleInfo MedicalManagerUser { get; set; }
diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
index b365fd94..1f46f1d3 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
@@ -58,10 +58,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public Arm ArmEnum { get; set; }
 
 
-        /// <summary>
-        /// 是否完成
-        /// </summary>
-        public bool IsReviewFinish { get; set; }
+        public MedicalReviewAuditState AuditState { get; set; }
 
         /// <summary>
         /// 是否关闭
@@ -145,10 +142,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public AuditAdvice AuditAdviceEnum { get; set; }
 
-        /// <summary>
-        /// 是否完成
-        /// </summary>
-        public bool IsReviewFinish { get; set; }
+        public MedicalReviewAuditState AuditState { get; set; }
 
         /// <summary>
         /// 是否关闭
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs
index a9d4c6bb..032d3e56 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs
@@ -69,7 +69,7 @@ namespace IRaCIS.Core.Application.Service
             medicalReviewInfo.VisitTaskId = taskInfo.Id;
             medicalReviewInfo.ArmEnum = taskInfo.ArmEnum;
             medicalReviewInfo.IsClosedDialog = medicalReviewInfo.MedicalReviewInfo.IsClosedDialog;
-            medicalReviewInfo.IsReviewFinish = medicalReviewInfo.MedicalReviewInfo.IsReviewFinish;
+            medicalReviewInfo.AuditState = medicalReviewInfo.MedicalReviewInfo.AuditState;
 
 
             #region 取任务
@@ -310,7 +310,8 @@ namespace IRaCIS.Core.Application.Service
 
             await _taskMedicalReviewRepository.UpdatePartialFromQueryAsync(inDto.TaskMedicalReviewId, x => new TaskMedicalReview()
             {
-                IsReviewFinish = true 
+                AuditState = MedicalReviewAuditState.HaveSigned,
+                AuditSignTime=DateTime.Now,
             });
 
             var result = await _taskMedicalReviewRepository.SaveChangesAsync();
diff --git a/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs b/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs
index 45fe7361..861571f7 100644
--- a/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs
+++ b/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs
@@ -42,29 +42,25 @@ namespace IRaCIS.Core.Domain.Models
 		public Guid UpdateUserId { get; set; }
 	
 		/// <summary>
-        /// AllocateTime
+        /// 分配时间
         /// </summary>
 		public DateTime? AllocateTime { get; set; }
 	
 		/// <summary>
-        /// AuditState
+        /// 审核状态
         /// </summary>
 		[Required]
 		public MedicalReviewAuditState AuditState { get; set; }
 	
-		/// <summary>
-        /// AuditSuggestion
-        /// </summary>
-		[Required]
-		public string AuditSuggestion { get; set; }=String.Empty;
+	
 	
 		/// <summary>
-        /// AuditSignTime
+        /// 审核通过时间
         /// </summary>
 		public DateTime? AuditSignTime { get; set; }
 	
 		/// <summary>
-        /// DoctorUserIdeaEnum
+        /// 阅片人是否认同
         /// </summary>
 		public MedicalReviewDoctorUserIdea DoctorUserIdeaEnum { get; set; }
 	
@@ -109,11 +105,6 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public AuditAdvice AuditAdviceEnum { get; set; }
 
-		/// <summary>
-		/// 是否审核完成
-		/// </summary>
-		public bool IsReviewFinish { get; set; }
-
 		/// <summary>
 		/// 是否关闭对话
 		/// </summary>