diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
index 04e06c6d..5d7d1e50 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
@@ -56,6 +56,17 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public Arm ArmEnum { get; set; }
+
+ ///
+ /// 是否完成
+ ///
+ public bool IsReviewFinish { get; set; }
+
+ ///
+ /// 是否关闭
+ ///
+ public bool IsClosedDialo { get; set; }
+
public List TaskList { get; set; } = new List();
@@ -95,12 +106,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
///
/// 是否完成
///
- public bool IsFinish { get; set; }
+ public bool IsReviewFinish { get; set; }
///
/// 是否关闭
///
- public bool IsClosed { get; set; }
+ public bool IsClosedDialo { get; set; }
}
public class MedicalReviewInfo
@@ -132,12 +143,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
///
/// 是否完成
///
- public bool IsFinish { get; set; }
+ public bool IsReviewFinish { get; set; }
///
/// 是否关闭
///
- public bool IsClosed { get; set; }
+ public bool IsClosedDialo { get; set; }
}
public class ReadingMedicineQuestion
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs
index d1db778e..6e8476d5 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs
@@ -66,6 +66,9 @@ namespace IRaCIS.Core.Application.Service
medicalReviewInfo.VisitTaskId = taskInfo.Id;
medicalReviewInfo.ArmEnum = taskInfo.ArmEnum;
+ medicalReviewInfo.IsClosedDialo = medicalReviewInfo.MedicalReviewInfo.IsClosedDialo;
+ medicalReviewInfo.IsReviewFinish = medicalReviewInfo.MedicalReviewInfo.IsReviewFinish;
+
#region 取任务
if (medicalReviewInfo.IsReadingTaskViewInOrder)
@@ -247,8 +250,8 @@ namespace IRaCIS.Core.Application.Service
Questioning = inDto.Questioning,
ImagePath = inDto.ImagePath,
AuditAdviceEnum = inDto.AuditAdviceEnum,
- IsFinish = inDto.IsFinish,
- IsClosed = inDto.IsClosed
+ IsReviewFinish = inDto.IsReviewFinish,
+ IsClosedDialo = inDto.IsClosedDialo
});
var result = await _taskMedicalReviewRepository.SaveChangesAsync();
diff --git a/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs b/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs
index be6be3d7..6abc319a 100644
--- a/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs
+++ b/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs
@@ -110,14 +110,14 @@ namespace IRaCIS.Core.Domain.Models
public AuditAdvice AuditAdviceEnum { get; set; }
///
- /// 是否完成
+ /// 是否审核完成
///
- public bool IsFinish { get; set; }
+ public bool IsReviewFinish { get; set; }
///
- /// 是否关闭
+ /// 是否关闭对话
///
- public bool IsClosed { get; set; }
+ public bool IsClosedDialo { get; set; }
///
/// 保存问题的时间