From 10a5cdca851c108c3f60c239542e577f75911708 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Mon, 15 Aug 2022 13:56:16 +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

---
 .../Service/Reading/Dto/OrganInfoViewModel.cs | 18 +++++++++++++++
 .../Service/Reading/OrganInfoService.cs       |  3 +++
 IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs  | 23 +++++++++++++++++++
 .../Reading/ReadingTableQuestionSystem.cs     |  7 +++++-
 4 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs
index b81c4a8d9..589871ba6 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs
@@ -41,8 +41,21 @@ namespace IRaCIS.Core.Application.ViewModel
 		/// 类型枚举
 		/// </summary>
 		public OrganType OrganType { get; set; }
+
+        /// <summary>
+        /// 是否关联
+        /// </summary>
+        public IsDepend IsDepend { get; set; }
     }
 
+    public class GetTrialSelectOrganListInDto
+    {
+        public Guid TrialId { get; set; }
+        /// <summary>
+        /// 类型枚举
+        /// </summary>
+        public OrganType? OrganType { get; set; }
+    }
 
     public class GetTrialOrganListInDto
     {
@@ -108,6 +121,11 @@ namespace IRaCIS.Core.Application.ViewModel
 		/// </summary>
 		public string Remark { get; set; }
 
+        /// <summary>
+        /// 是否关联
+        /// </summary>
+        public IsDepend IsDepend { get; set; }
+
         public DateTime CreateTime { get; set; }
         public Guid CreateUserId { get; set; }
     }
diff --git a/IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs b/IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs
index 335bd14a6..dc83bebaa 100644
--- a/IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs
@@ -169,5 +169,8 @@ namespace IRaCIS.Core.Application.Service
             return await organInfoQueryable.ToListAsync();
         }
 
+
+     
+
     }
 }
diff --git a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
index b57ae9829..43c70267b 100644
--- a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
+++ b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
@@ -271,6 +271,29 @@ namespace IRaCIS.Core.Domain.Share
      
     }
 
+
+    /// <summary>
+    /// 是否关联
+    /// </summary>
+    public enum IsDepend
+    {
+        /// <summary>
+        /// 是
+        /// </summary>
+        Yes = 0,
+
+        /// <summary>
+        /// 依赖父问题
+        /// </summary>
+        Rely = 1,
+
+        /// <summary>
+        /// 否
+        /// </summary>
+        No = 2,
+
+    }
+
     /// <summary>
     /// 是否显示问题
     /// </summary>
diff --git a/IRaCIS.Core.Domain/Reading/ReadingTableQuestionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingTableQuestionSystem.cs
index 3fc329a76..7b9f74e1c 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingTableQuestionSystem.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingTableQuestionSystem.cs
@@ -108,10 +108,15 @@ namespace IRaCIS.Core.Domain.Models
 
 
 		/// <summary>
-		/// 依赖父问题
+		/// 关联父问题
 		/// </summary>
 		public Guid? DependParentId { get; set; }
 
+		/// <summary>
+		/// 是否关联
+		/// </summary>
+		public IsDepend IsDepend { get; set; }
+
 		/// <summary>
 		/// 表格问题类型
 		/// </summary>