From 1c4323a56c7dc72200d07e19fcd2f0e0213ae07a Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Tue, 20 Sep 2022 11:11:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Reading/Dto/ReadingQuestionViewModel.cs   | 20 +++++++++++++
 .../Allocation/AllocationRelation.cs          | 10 +++++++
 IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs  | 28 ++++++++++++++++---
 .../Reading/ReadingQuestionSystem.cs          |  5 ++++
 .../Reading/ReadingQuestionTrial.cs           |  7 ++++-
 5 files changed, 65 insertions(+), 5 deletions(-)

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
 		/// </summary>
 		public string GroupName { get; set; }
 
+		/// <summary>
+		/// 问题类型
+		/// </summary>
+		public TableQuestionType QuestionGenre { get; set; }
 
 		/// <summary>
 		/// 字典code
@@ -595,6 +599,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public string GroupName { get; set; }
 
+
+		/// <summary>
+		/// 问题类型
+		/// </summary>
+		public TableQuestionType QuestionGenre { get; set; }
+
 		/// <summary>
 		/// 字典code
 		/// </summary>
@@ -908,6 +918,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public Guid? Id { get; set; }
 
+		/// <summary>
+		/// 问题类型
+		/// </summary>
+		public TableQuestionType QuestionGenre { get; set; }
+
 		/// <summary>
 		/// 系统标准Id
 		/// </summary>
@@ -1032,6 +1047,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public Guid ReadingQuestionCriterionTrialId { get; set; }
 
+		/// <summary>
+		/// 问题类型
+		/// </summary>
+		public TableQuestionType QuestionGenre { get; set; }
+
 
 		/// <summary>
 		/// 字典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
         /// </summary>
         LinkedData=1,
 
+        /// <summary>
+        /// 关联Question
+        /// </summary>
+        LinkedQuestion = 2,
+
+        /// <summary>
+        /// 字典
+        /// </summary>
+        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
         /// <summary>
         /// SD
         /// </summary>
-        SD = 6
+        SD = 6,
+
+        /// <summary>
+        /// NA
+        /// </summary>
+        NA = 6
     }
 
     /// <summary>
@@ -81,7 +86,12 @@ namespace IRaCIS.Core.Domain.Share
         /// <summary>
         /// 否
         /// </summary>
-        No = 3
+        No = 3,
+
+        /// <summary>
+        /// NA
+        /// </summary>
+        NA = 4
     }
 
     /// <summary>
@@ -112,7 +122,12 @@ namespace IRaCIS.Core.Domain.Share
         /// <summary>
         /// NN
         /// </summary>
-        NN = 4
+        NN = 4,
+
+        /// <summary>
+        /// NA
+        /// </summary>
+        NA = 5
     }
 
     /// <summary>
@@ -148,7 +163,12 @@ namespace IRaCIS.Core.Domain.Share
         /// <summary>
         /// ND
         /// </summary>
-        ND = 5
+        ND = 5,
+
+        /// <summary>
+        /// NA
+        /// </summary>
+        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
 		/// </summary>
 		public Guid CreateUserId { get; set; }
 
+		/// <summary>
+		/// 问题类型
+		/// </summary>
+		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
 		/// <summary>
 		/// 字典code
 		/// </summary>
-		public string DictionaryCode { get; set; }
+		public string DictionaryCode { get; set; } = string.Empty;
+
+		/// <summary>
+		/// 问题类型
+		/// </summary>
+		public TableQuestionType QuestionGenre { get; set; }
 
 		/// <summary>
 		/// 分页标准