From 2fd1abf54d104fa3a137c57f0fe2ee5fdc3e5c6b Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Mon, 10 Oct 2022 13:42:19 +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

---
 .../Reading/Dto/ReadingImageTaskViewModel.cs  | 26 ++++++++++++++++---
 .../Reading/ReadingImageTaskService.cs        | 11 +++++---
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
index e09390ce3..a1b31805e 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
@@ -84,6 +84,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public string OrderMark { get; set; } = string.Empty;
 
+        /// <summary>
+		/// 数值类型
+		/// </summary>
+		public ValueOfType? ValueType { get; set; }
+
+        /// <summary>
+        /// 单位
+        /// </summary>
+        public ValueUnit? Unit { get; set; }
+
         public List<TaskQuestionAnswer> Answer { get; set; } = new List<TaskQuestionAnswer>();
 
         public List<ReadingReportDto> Childrens { get; set; } = new List<ReadingReportDto>();
@@ -1698,13 +1708,21 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
 
 
-      
 
-     
+        /// <summary>
+        /// 数值类型
+        /// </summary>
+        public ValueOfType? ValueType { get; set; }
+
+        /// <summary>
+        /// 单位
+        /// </summary>
+        public ValueUnit? Unit { get; set; }
+
+
+
 
-       
 
-       
 
     }
 
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
index 607fd471d..f1f1f2c5a 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
@@ -542,6 +542,8 @@ namespace IRaCIS.Application.Services
                 TypeValue = x.TypeValue,
                 QuestionName = x.QuestionName,
                 ShowOrder = x.ShowOrder,
+                ValueType=x.ValueType,
+                Unit=x.Unit,
 
             }).ToList();
 
@@ -562,7 +564,8 @@ namespace IRaCIS.Application.Services
                     TypeValue = x.TypeValue,
                     ShowOrder = x.ShowOrder,
                     OrderMark = x.OrderMark,
-
+                    ValueType = x.ValueType,
+                    Unit = x.Unit,
 
                 }).ToList();
 
@@ -611,7 +614,8 @@ namespace IRaCIS.Application.Services
                             TypeValue = x.TypeValue,
                             RowIndex = row.RowIndex,
                             ShowOrder = x.ShowOrder,
-
+                            ValueType = x.ValueType,
+                            Unit = x.Unit,
                         }).ToList();
 
 
@@ -816,7 +820,8 @@ namespace IRaCIS.Application.Services
                     QuestionName = x.QuestionName,
                     RelationQuestions = new List<GetTrialReadingQuestionOutDto>(),
                     Remark = x.Remark,
-
+                    ValueType=x.ValueType,
+                    Unit=x.Unit,
                 }).ToList();
             });
             var thisAnswer = tableAnswers.Where(x => x.QuestionId == item.Id).ToList();