diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
index d48f80e33..9238f71bb 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
@@ -116,6 +116,15 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public class ReadingTableQuestionTrialAddOrEdit
{
+ ///
+ /// 数值类型
+ ///
+ public ValueOfType? ValueType { get; set; }
+
+ ///
+ /// 单位
+ ///
+ public string Unit { get; set; } = string.Empty;
public Guid? Id { get; set; }
@@ -168,6 +177,15 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// ReadingTableQuestionSystemAddOrEdit 列表查询参数模型
public class ReadingTableQuestionSystemAddOrEdit
{
+ ///
+ /// 数值类型
+ ///
+ public ValueOfType? ValueType { get; set; }
+
+ ///
+ /// 单位
+ ///
+ public string Unit { get; set; } = string.Empty;
public Guid? Id { get; set; }
public Guid ReadingQuestionId { get; set; }
public string Type { get; set; } = string.Empty;
@@ -598,10 +616,30 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// 序号标记
///
public string OrderMark { get; set; } = string.Empty;
+
+ ///
+ /// 数值类型
+ ///
+ public ValueOfType? ValueType { get; set; }
+
+ ///
+ /// 单位
+ ///
+ public string Unit { get; set; } = string.Empty;
}
public class ReadingQuestionSystemView
{
+ ///
+ /// 数值类型
+ ///
+ public ValueOfType? ValueType { get; set; }
+
+ ///
+ /// 单位
+ ///
+ public string Unit { get; set; } = string.Empty;
+
///
/// Id
///
@@ -920,6 +958,15 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
}
public class AddOrUpdateReadingQuestionSystemInDto
{
+ ///
+ /// 数值类型
+ ///
+ public ValueOfType? ValueType { get; set; }
+
+ ///
+ /// 单位
+ ///
+ public string Unit { get; set; } = string.Empty;
///
/// 分组
@@ -1182,6 +1229,17 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// 序号标记
///
public string OrderMark { get; set; } = string.Empty;
+
+
+ ///
+ /// 数值类型
+ ///
+ public ValueOfType? ValueType { get; set; }
+
+ ///
+ /// 单位
+ ///
+ public string Unit { get; set; } = string.Empty;
}
public class GetSystemCriterionSelectDto
diff --git a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
index 1ad86e78b..619d32d96 100644
--- a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
+++ b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
@@ -16,6 +16,27 @@ namespace IRaCIS.Core.Domain.Share
public static readonly string Group = "group";
}
+ ///
+ /// 数值类型
+ ///
+ public enum ValueOfType
+ {
+
+ ///
+ /// 整形
+ ///
+ Plastic = 0,
+
+ ///
+ /// 小数
+ ///
+ Decimals = 1,
+
+ ///
+ /// 百分数
+ ///
+ Percentage = 2
+ }
public enum ImagePlatform
{
diff --git a/IRaCIS.Core.Domain/Reading/ReadingQuestionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingQuestionSystem.cs
index b82df8c0c..97a92d05e 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingQuestionSystem.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingQuestionSystem.cs
@@ -140,6 +140,16 @@ namespace IRaCIS.Core.Domain.Models
///
public TableQuestionType? QuestionGenre { get; set; }
+ ///
+ /// 数值类型
+ ///
+ public ValueOfType? ValueType { get; set; }
+
+ ///
+ /// 单位
+ ///
+ public string Unit { get; set; } = string.Empty;
+
[JsonIgnore]
[ForeignKey("ReadingQuestionCriterionSystemId")]
public ReadingQuestionCriterionSystem ReadingQuestionCriterionSystem { get; set; }
diff --git a/IRaCIS.Core.Domain/Reading/ReadingQuestionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingQuestionTrial.cs
index aef8cbfc7..aa0b7e8c3 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingQuestionTrial.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingQuestionTrial.cs
@@ -173,6 +173,16 @@ namespace IRaCIS.Core.Domain.Models
///
public TableQuestionType? QuestionGenre { get; set; }
+ ///
+ /// 数值类型
+ ///
+ public ValueOfType? ValueType { get; set; }
+
+ ///
+ /// 单位
+ ///
+ public string Unit { get; set; } = string.Empty;
+
///
/// 分页标准
///
diff --git a/IRaCIS.Core.Domain/Reading/ReadingTableQuestionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingTableQuestionSystem.cs
index 383b6e80a..8ed050fad 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingTableQuestionSystem.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingTableQuestionSystem.cs
@@ -137,6 +137,17 @@ namespace IRaCIS.Core.Domain.Models
///
public string DictionaryCode { get; set; }
+
+ ///
+ /// 数值类型
+ ///
+ public ValueOfType? ValueType { get; set; }
+
+ ///
+ /// 单位
+ ///
+ public string Unit { get; set; } = string.Empty;
+
[ForeignKey("DependParentId")]
public ReadingTableQuestionSystem DependParentQuestion { get; set; }
}
diff --git a/IRaCIS.Core.Domain/Reading/ReadingTableQuestionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingTableQuestionTrial.cs
index d6b30cd51..50f329c59 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingTableQuestionTrial.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingTableQuestionTrial.cs
@@ -142,6 +142,16 @@ namespace IRaCIS.Core.Domain.Models
///
public string DictionaryCode { get; set; }
+ ///
+ /// 数值类型
+ ///
+ public ValueOfType? ValueType { get; set; }
+
+ ///
+ /// 单位
+ ///
+ public string Unit { get; set; } = string.Empty;
+
[JsonIgnore]
[ForeignKey("DependParentId")]
public ReadingTableQuestionTrial DependParentQuestion { get; set; }