From ad231fdb53d62ea3ae77345791f55a7794987d80 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Tue, 25 Oct 2022 17:07:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IRaCIS.Core.Application.xml               | 45 -----------------
 .../Dto/ReadingMedicineQuestionViewModel.cs   | 50 +------------------
 2 files changed, 2 insertions(+), 93 deletions(-)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index af69283b2..2c718faa0 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -5216,51 +5216,6 @@
             位置 英文
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.ViewModel.ReadingMedicineSystemQuestionView.Type">
-            <summary>
-            类型
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.ViewModel.ReadingMedicineSystemQuestionView.ParentTriggerValue">
-            <summary>
-            父问题触发
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.ViewModel.ReadingMedicineSystemQuestionView.QuestionName">
-            <summary>
-            问题名称
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.ViewModel.ReadingMedicineSystemQuestionView.IsRequired">
-            <summary>
-            是否是必须
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.ViewModel.ReadingMedicineSystemQuestionView.ShowOrder">
-            <summary>
-            排序
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.ViewModel.ReadingMedicineSystemQuestionView.ParentId">
-            <summary>
-            父问题ID
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.ViewModel.ReadingMedicineSystemQuestionView.TypeValue">
-            <summary>
-            类型值
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.ViewModel.ReadingMedicineSystemQuestionView.IsEnable">
-            <summary>
-            是否启用
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.ViewModel.ReadingMedicineSystemQuestionView.ReadingCategory">
-            <summary>
-            任务类型
-            </summary>
-        </member>
         <member name="P:IRaCIS.Core.Application.ViewModel.ReadingMedicineSystemQuestionView.ParentShowOrder">
             <summary>
             排序
diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs
index 67662304e..8b634c90d 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs
@@ -6,55 +6,9 @@ using System.ComponentModel.DataAnnotations;
 namespace IRaCIS.Core.Application.ViewModel
 {
 
-    public class ReadingMedicineSystemQuestionView
+    public class ReadingMedicineSystemQuestionView: ReadingMedicineSystemQuestionAddOrEdit
     {
-        public Guid Id { get; set; }
-
-        /// <summary>
-        /// 类型
-        /// </summary>
-        public string Type { get; set; }
-
-        /// <summary>
-        /// 父问题触发
-        /// </summary>
-        public string ParentTriggerValue { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 问题名称
-        /// </summary>
-        public string QuestionName { get; set; }
-
-        /// <summary>
-        /// 是否是必须
-        /// </summary>
-        public bool IsRequired { get; set; }
-
-        /// <summary>
-        /// 排序
-        /// </summary>
-        public int ShowOrder { get; set; }
-
-        /// <summary>
-        /// 父问题ID
-        /// </summary>
-        public Guid? ParentId { get; set; }
-
-        /// <summary>
-        /// 类型值
-        /// </summary>
-        public string TypeValue { get; set; }
-
-        /// <summary>
-        /// 是否启用
-        /// </summary>
-        public bool IsEnable { get; set; }
-
-        /// <summary>
-        /// 任务类型
-        /// </summary>
-        public ReadingCategory ReadingCategory { get; set; }
-
+       
 
         /// <summary>
         /// 排序