From 4cdd3c5206b709899b43cb9e6e58943a7fedb159 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Thu, 25 Aug 2022 13:11:30 +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

---
 .../Service/Reading/Dto/ReadingQuestionViewModel.cs           | 2 ++
 IRaCIS.Core.Application/Service/Reading/_MapConfig.cs         | 3 ++-
 IRaCIS.Core.Domain/Reading/ReadingTableQuestionSystem.cs      | 4 ++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
index 922eb2731..5779c8139 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
@@ -51,6 +51,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		public string DataTableName { get; set; }
 		public string DataTableColumn { get; set; }
 
+		public int? DependShowOrder { get; set; }
+
 		/// <summary>
 		/// 表格问题类型
 		/// </summary>
diff --git a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
index cba6f4a57..347923918 100644
--- a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
@@ -51,7 +51,8 @@ namespace IRaCIS.Core.Application.Service
 
             #region 阅片问题
 
-            CreateMap<ReadingTableQuestionSystem, ReadingTableQuestionSystemView>();
+            CreateMap<ReadingTableQuestionSystem, ReadingTableQuestionSystemView>()
+                    .ForMember(d => d.DependShowOrder, u => u.MapFrom(s => s.DependParentQuestion.ShowOrder));
 
 
             CreateMap<ReadingTableQuestionTrial, ReadingTableQuestionTrialView>();
diff --git a/IRaCIS.Core.Domain/Reading/ReadingTableQuestionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingTableQuestionSystem.cs
index 3d4267d41..46db56689 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingTableQuestionSystem.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingTableQuestionSystem.cs
@@ -132,6 +132,10 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public QuestionMark? QuestionMark { get; set; }
 
+
+		
+		[ForeignKey("DependParentId")]
+		public ReadingTableQuestionSystem DependParentQuestion { get; set; }
 	}