diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
index 6f19d617c..878e349cc 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
@@ -462,6 +462,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
///
public string GroupName { get; set; }
+ ///
+ /// 问题类型
+ ///
+ public TableQuestionType QuestionGenre { get; set; }
///
/// 字典code
@@ -595,6 +599,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
///
public string GroupName { get; set; }
+
+ ///
+ /// 问题类型
+ ///
+ public TableQuestionType QuestionGenre { get; set; }
+
///
/// 字典code
///
@@ -908,6 +918,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
///
public Guid? Id { get; set; }
+ ///
+ /// 问题类型
+ ///
+ public TableQuestionType QuestionGenre { get; set; }
+
///
/// 系统标准Id
///
@@ -1032,6 +1047,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
///
public Guid ReadingQuestionCriterionTrialId { get; set; }
+ ///
+ /// 问题类型
+ ///
+ public TableQuestionType QuestionGenre { get; set; }
+
///
/// 字典code
diff --git a/IRaCIS.Core.Domain.Share/Allocation/AllocationRelation.cs b/IRaCIS.Core.Domain.Share/Allocation/AllocationRelation.cs
index dd4b76aa7..411713ed1 100644
--- a/IRaCIS.Core.Domain.Share/Allocation/AllocationRelation.cs
+++ b/IRaCIS.Core.Domain.Share/Allocation/AllocationRelation.cs
@@ -184,6 +184,16 @@ namespace IRaCIS.Core.Domain.Share
///
LinkedData=1,
+ ///
+ /// 关联Question
+ ///
+ LinkedQuestion = 2,
+
+ ///
+ /// 字典
+ ///
+ Dictionary = 3,
+
}
public enum FormType
diff --git a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
index 52d3f4434..0a678ba42 100644
--- a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
+++ b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
@@ -54,7 +54,12 @@ namespace IRaCIS.Core.Domain.Share
///
/// SD
///
- SD = 6
+ SD = 6,
+
+ ///
+ /// NA
+ ///
+ NA = 6
}
///
@@ -81,7 +86,12 @@ namespace IRaCIS.Core.Domain.Share
///
/// 否
///
- No = 3
+ No = 3,
+
+ ///
+ /// NA
+ ///
+ NA = 4
}
///
@@ -112,7 +122,12 @@ namespace IRaCIS.Core.Domain.Share
///
/// NN
///
- NN = 4
+ NN = 4,
+
+ ///
+ /// NA
+ ///
+ NA = 5
}
///
@@ -148,7 +163,12 @@ namespace IRaCIS.Core.Domain.Share
///
/// ND
///
- ND = 5
+ ND = 5,
+
+ ///
+ /// NA
+ ///
+ NA = 6
}
diff --git a/IRaCIS.Core.Domain/Reading/ReadingQuestionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingQuestionSystem.cs
index b518c011a..4ffae8c78 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingQuestionSystem.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingQuestionSystem.cs
@@ -129,6 +129,11 @@ namespace IRaCIS.Core.Domain.Models
///
public Guid CreateUserId { get; set; }
+ ///
+ /// 问题类型
+ ///
+ public TableQuestionType QuestionGenre { get; set; }
+
[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 51fc19a70..be6da0481 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingQuestionTrial.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingQuestionTrial.cs
@@ -166,7 +166,12 @@ namespace IRaCIS.Core.Domain.Models
///
/// 字典code
///
- public string DictionaryCode { get; set; }
+ public string DictionaryCode { get; set; } = string.Empty;
+
+ ///
+ /// 问题类型
+ ///
+ public TableQuestionType QuestionGenre { get; set; }
///
/// 分页标准