修改一版
parent
385bb1116e
commit
38ef0557a6
|
@ -298,6 +298,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
/// 单位
|
/// 单位
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public ValueUnit? Unit { get; set; }
|
public ValueUnit? Unit { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 数据来源
|
||||||
|
/// </summary>
|
||||||
|
public DataSources? DataSource { get; set; } = DataSources.ManualEntry;
|
||||||
public Guid? Id { get; set; }
|
public Guid? Id { get; set; }
|
||||||
|
|
||||||
|
|
||||||
|
@ -358,6 +363,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public ValueOfType? ValueType { get; set; }
|
public ValueOfType? ValueType { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 数据来源
|
||||||
|
/// </summary>
|
||||||
|
public DataSources? DataSource { get; set; } = DataSources.ManualEntry;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 单位
|
/// 单位
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -833,6 +843,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
/// 自定义计算标记
|
/// 自定义计算标记
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string CalculateQuestions { get; set; }
|
public string CalculateQuestions { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 数据来源
|
||||||
|
/// </summary>
|
||||||
|
public DataSources? DataSource { get; set; } = DataSources.ManualEntry;
|
||||||
}
|
}
|
||||||
|
|
||||||
public class ReadingQuestionSystemView
|
public class ReadingQuestionSystemView
|
||||||
|
@ -842,6 +857,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public ValueOfType? ValueType { get; set; }
|
public ValueOfType? ValueType { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 数据来源
|
||||||
|
/// </summary>
|
||||||
|
public DataSources? DataSource { get; set; } = DataSources.ManualEntry;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 单位
|
/// 单位
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -1225,6 +1245,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public ValueOfType? ValueType { get; set; }
|
public ValueOfType? ValueType { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 数据来源
|
||||||
|
/// </summary>
|
||||||
|
public DataSources? DataSource { get; set; } = DataSources.ManualEntry;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 单位
|
/// 单位
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -1518,6 +1543,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public ValueOfType? ValueType { get; set; }
|
public ValueOfType? ValueType { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 数据来源
|
||||||
|
/// </summary>
|
||||||
|
public DataSources? DataSource { get; set; } = DataSources.ManualEntry;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 单位
|
/// 单位
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
|
@ -16,6 +16,24 @@ namespace IRaCIS.Core.Domain.Share
|
||||||
public static readonly string Group = "group";
|
public static readonly string Group = "group";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 数据来源
|
||||||
|
/// </summary>
|
||||||
|
public enum DataSources
|
||||||
|
{
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 手动录入
|
||||||
|
/// </summary>
|
||||||
|
ManualEntry = 0,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 自动计算
|
||||||
|
/// </summary>
|
||||||
|
Automatic = 1
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 自定义计算标记
|
/// 自定义计算标记
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
|
@ -160,6 +160,12 @@ namespace IRaCIS.Core.Domain.Models
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public ValueUnit? Unit { get; set; }
|
public ValueUnit? Unit { get; set; }
|
||||||
|
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 数据来源
|
||||||
|
/// </summary>
|
||||||
|
public DataSources DataSource { get; set; } = DataSources.ManualEntry;
|
||||||
|
|
||||||
[JsonIgnore]
|
[JsonIgnore]
|
||||||
[ForeignKey("ReadingQuestionCriterionSystemId")]
|
[ForeignKey("ReadingQuestionCriterionSystemId")]
|
||||||
public ReadingQuestionCriterionSystem ReadingQuestionCriterionSystem { get; set; }
|
public ReadingQuestionCriterionSystem ReadingQuestionCriterionSystem { get; set; }
|
||||||
|
|
|
@ -204,6 +204,11 @@ namespace IRaCIS.Core.Domain.Models
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string CalculateQuestions { get; set; } = "[]";
|
public string CalculateQuestions { get; set; } = "[]";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 数据来源
|
||||||
|
/// </summary>
|
||||||
|
public DataSources DataSource { get; set; } = DataSources.ManualEntry;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 分页标准
|
/// 分页标准
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
|
@ -148,6 +148,11 @@ namespace IRaCIS.Core.Domain.Models
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public ValueUnit? Unit { get; set; }
|
public ValueUnit? Unit { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 数据来源
|
||||||
|
/// </summary>
|
||||||
|
public DataSources DataSource { get; set; } = DataSources.ManualEntry;
|
||||||
|
|
||||||
[ForeignKey("DependParentId")]
|
[ForeignKey("DependParentId")]
|
||||||
public ReadingTableQuestionSystem DependParentQuestion { get; set; }
|
public ReadingTableQuestionSystem DependParentQuestion { get; set; }
|
||||||
}
|
}
|
||||||
|
|
|
@ -162,6 +162,11 @@ namespace IRaCIS.Core.Domain.Models
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string CalculateQuestions { get; set; } = "[]";
|
public string CalculateQuestions { get; set; } = "[]";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 数据来源
|
||||||
|
/// </summary>
|
||||||
|
public DataSources DataSource { get; set; } = DataSources.ManualEntry;
|
||||||
|
|
||||||
[JsonIgnore]
|
[JsonIgnore]
|
||||||
[ForeignKey("DependParentId")]
|
[ForeignKey("DependParentId")]
|
||||||
public ReadingTableQuestionTrial DependParentQuestion { get; set; }
|
public ReadingTableQuestionTrial DependParentQuestion { get; set; }
|
||||||
|
|
Loading…
Reference in New Issue