修改一版

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; }

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>
+        public MedicalReviewAuditState AuditState { get; set; }
-        /// 是否完成
-        /// </summary>
-        public bool IsReviewFinish { get; set; }
 
         /// <summary>
         /// 是否关闭
@@ -145,10 +142,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public AuditAdvice AuditAdviceEnum { get; set; }
 
-        /// <summary>
+        public MedicalReviewAuditState AuditState { get; set; }
-        /// 是否完成
-        /// </summary>
-        public bool IsReviewFinish { get; set; }
 
         /// <summary>
         /// 是否关闭

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();

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>