修改一版

2022-07-05 09:26:00 +08:00
parent bfe037a672
commit c2e5f76970
4 changed files with 16 additions and 26 deletions
@@ -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; }
@@ -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>
        /// 是否关闭
@@ -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();