diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
index d81b466f..a73a446c 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
@@ -298,6 +298,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// 单位
///
public ValueUnit? Unit { get; set; }
+
+ ///
+ /// 数据来源
+ ///
+ public DataSources? DataSource { get; set; } = DataSources.ManualEntry;
public Guid? Id { get; set; }
@@ -358,6 +363,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
///
public ValueOfType? ValueType { get; set; }
+ ///
+ /// 数据来源
+ ///
+ public DataSources? DataSource { get; set; } = DataSources.ManualEntry;
+
///
/// 单位
///
@@ -833,6 +843,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// 自定义计算标记
///
public string CalculateQuestions { get; set; }
+
+ ///
+ /// 数据来源
+ ///
+ public DataSources? DataSource { get; set; } = DataSources.ManualEntry;
}
public class ReadingQuestionSystemView
@@ -842,6 +857,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
///
public ValueOfType? ValueType { get; set; }
+ ///
+ /// 数据来源
+ ///
+ public DataSources? DataSource { get; set; } = DataSources.ManualEntry;
+
///
/// 单位
///
@@ -1225,6 +1245,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
///
public ValueOfType? ValueType { get; set; }
+ ///
+ /// 数据来源
+ ///
+ public DataSources? DataSource { get; set; } = DataSources.ManualEntry;
+
///
/// 单位
///
@@ -1518,6 +1543,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
///
public ValueOfType? ValueType { get; set; }
+ ///
+ /// 数据来源
+ ///
+ public DataSources? DataSource { get; set; } = DataSources.ManualEntry;
+
///
/// 单位
///
diff --git a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
index 67e324f8..2c117330 100644
--- a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
+++ b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
@@ -16,6 +16,24 @@ namespace IRaCIS.Core.Domain.Share
public static readonly string Group = "group";
}
+ ///
+ /// 数据来源
+ ///
+ public enum DataSources
+ {
+
+ ///
+ /// 手动录入
+ ///
+ ManualEntry = 0,
+
+ ///
+ /// 自动计算
+ ///
+ Automatic = 1
+ }
+
+
///
/// 自定义计算标记
///
diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs
index 20e5a7fa..59e508fb 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs
@@ -160,6 +160,12 @@ namespace IRaCIS.Core.Domain.Models
///
public ValueUnit? Unit { get; set; }
+
+ ///
+ /// 数据来源
+ ///
+ public DataSources DataSource { get; set; } = DataSources.ManualEntry;
+
[JsonIgnore]
[ForeignKey("ReadingQuestionCriterionSystemId")]
public ReadingQuestionCriterionSystem ReadingQuestionCriterionSystem { get; set; }
diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs
index 09057b64..952f16af 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs
@@ -204,6 +204,11 @@ namespace IRaCIS.Core.Domain.Models
///
public string CalculateQuestions { get; set; } = "[]";
+ ///
+ /// 数据来源
+ ///
+ public DataSources DataSource { get; set; } = DataSources.ManualEntry;
+
///
/// 分页标准
///
diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs
index 95622c4b..3728ab5c 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs
@@ -148,6 +148,11 @@ namespace IRaCIS.Core.Domain.Models
///
public ValueUnit? Unit { get; set; }
+ ///
+ /// 数据来源
+ ///
+ public DataSources DataSource { get; set; } = DataSources.ManualEntry;
+
[ForeignKey("DependParentId")]
public ReadingTableQuestionSystem DependParentQuestion { get; set; }
}
diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs
index 8326f5dd..9d3b7712 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs
@@ -162,6 +162,11 @@ namespace IRaCIS.Core.Domain.Models
///
public string CalculateQuestions { get; set; } = "[]";
+ ///
+ /// 数据来源
+ ///
+ public DataSources DataSource { get; set; } = DataSources.ManualEntry;
+
[JsonIgnore]
[ForeignKey("DependParentId")]
public ReadingTableQuestionTrial DependParentQuestion { get; set; }