From 99c1b1d1eeb2dfd9578c4bfe055284a313dca94e Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Wed, 10 Aug 2022 13:15:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Reading/Dto/ReadingQuestionViewModel.cs   | 20 +++++++++++++++++++
 .../Service/Reading/ReadingQuestionService.cs |  1 +
 .../Reading/ReadingQuestionSystem.cs          | 10 ++++++++++
 3 files changed, 31 insertions(+)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
index f8a6bc99c..3e4fa2b09 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
@@ -303,6 +303,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public string GroupName { get; set; }
 
+		/// <summary>
+		/// 关联ID
+		/// </summary>
+		public Guid? RelevanceId { get; set; }
+
+		/// <summary>
+		/// 关联Value
+		/// </summary>
+		public string RelevanceValue { get; set; } = string.Empty;
+
 		/// <summary>
 		/// 备注
 		/// </summary>
@@ -559,6 +569,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public Guid ReadingQuestionCriterionSystemId { get; set; }
 
+		/// <summary>
+		/// 关联ID
+		/// </summary>
+		public Guid? RelevanceId { get; set; }
+
+		/// <summary>
+		/// 关联Value
+		/// </summary>
+		public string RelevanceValue { get; set; } = string.Empty;
+
 		/// <summary>
 		/// 类型
 		/// </summary>
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs
index 78a3636ab..11dec7d86 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs
@@ -324,6 +324,7 @@ namespace IRaCIS.Application.Services
                    AnswerGroup= (c.trial.FirstOrDefault()?.AnswerGroup) ?? string.Empty,
                    GroupName=c.system.GroupName,
                    IsEnable=c.system.IsEnable,
+                   
                    ShowQuestion= c.system.ShowQuestion,
                    IsJudgeQuestion =c.system.IsJudgeQuestion,
                    IsRequired=c.system.IsRequired,
diff --git a/IRaCIS.Core.Domain/Reading/ReadingQuestionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingQuestionSystem.cs
index c34ce1b86..cb84939cf 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingQuestionSystem.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingQuestionSystem.cs
@@ -74,6 +74,16 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public string Remark { get; set; }
 
+		/// <summary>
+		/// 关联ID
+		/// </summary>
+		public Guid? RelevanceId { get; set; }
+
+		/// <summary>
+		/// 关联Value
+		/// </summary>
+		public string RelevanceValue { get; set; } = string.Empty;
+
 		/// <summary>
 		/// 分组
 		/// </summary>