From 14b429a2a8e78719fcdca70ba2b242389a35c15d Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Fri, 9 Dec 2022 15:07:18 +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

---
 .../Reading/Dto/ReadingQuestionViewModel.cs       | 15 +++++++++++++++
 .../ReadingCriterion/ReadingQuestionService.cs    | 12 +++++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
index 3ee8fae89..99585941f 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
@@ -1069,6 +1069,21 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public CustomCalculateMark? CustomCalculateMark { get; set; }
 
+		/// <summary>
+		/// 数值类型
+		/// </summary>
+		public ValueOfType? ValueType { get; set; }
+
+		/// <summary>
+		/// 单位
+		/// </summary>
+		public ValueUnit? Unit { get; set; }
+
+		/// <summary>
+		/// 自定义单位
+		/// </summary>
+		public string CustomUnit { get; set; } = string.Empty;
+
 		public List<CalculateInfo> CalculateQuestionList { get; set; }
 	}
 
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs
index 822ca656b..b39163423 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs
@@ -497,8 +497,11 @@ namespace IRaCIS.Application.Services
                        .Select(x => new CalculateRelationDto()
                        {
                            QuestionId = x.Id,
-                           CustomCalculateMark=x.CustomCalculateMark,
-                           CalculateQuestionList = x.CalculateQuestionList
+                           CustomCalculateMark = x.CustomCalculateMark,
+                           CalculateQuestionList = x.CalculateQuestionList,
+                           ValueType = x.ValueType,
+                           Unit = x.Unit,
+                           CustomUnit = x.CustomUnit,
 
                        }).ToListAsync();
             }
@@ -509,7 +512,10 @@ namespace IRaCIS.Application.Services
                       {
                           QuestionId = x.Id,
                           CustomCalculateMark = x.CustomCalculateMark,
-                          CalculateQuestionList = x.CalculateQuestionList
+                          CalculateQuestionList = x.CalculateQuestionList,
+                          ValueType = x.ValueType,
+                          Unit = x.Unit,
+                          CustomUnit = x.CustomUnit,
 
                       }).ToListAsync();
             }