修改一版

IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs

@@ -26,9 +26,14 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		public Guid? RelevanceId { get; set; }
 		public string RelevanceValue { get; set; }
 		public int ShowQuestion { get; set; }
-		public int MaxRowCount { get; set; }
+		public int? MaxRowCount { get; set; }
 		public string DataTableName { get; set; }
 		public string DataTableColumn { get; set; }
+
+		/// <summary>
+		/// 表格问题类型
+		/// </summary>
+		public TableQuestionType TableQuestionType { get; set; }
 	}
 
 	
@@ -38,6 +43,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
 		public Guid ReadingQuestionId { get; set; }
 
+		/// <summary>
+		/// 表格问题类型
+		/// </summary>
+		public TableQuestionType? TableQuestionType { get; set; }
+
 	}
 
 	///<summary> ReadingTableQuestionSystemAddOrEdit  列表查询参数模型</summary>
@@ -59,9 +69,14 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		public Guid? RelevanceId { get; set; }
 		public string RelevanceValue { get; set; }
 		public int ShowQuestion { get; set; }
-		public int MaxRowCount { get; set; }
+		public int? MaxRowCount { get; set; }
 		public string DataTableName { get; set; }
 		public string DataTableColumn { get; set; }
+
+		/// <summary>
+		/// 表格问题类型
+		/// </summary>
+		public TableQuestionType TableQuestionType { get; set; }
 	}
 
 	public class ReadingCriterionPageView
@@ -377,7 +392,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// <summary>
 		/// 最大问题数
 		/// </summary>
-		public int MaxQuestionCount { get; set; }
+		public int? MaxQuestionCount { get; set; }
 	}
 
 	public class ReadingQuestionSystemView
@@ -476,7 +491,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// <summary>
 		/// 最大问题数
 		/// </summary>
-		public int MaxQuestionCount { get; set; }
+		public int? MaxQuestionCount { get; set; }
 	}
 
 
@@ -753,7 +768,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// <summary>
 		/// 最大问题数
 		/// </summary>
-		public int MaxQuestionCount { get; set; } = 0;
+		public int? MaxQuestionCount { get; set; }
 	}
 
 
@@ -862,7 +877,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// <summary>
 		/// 最大问题数
 		/// </summary>
-		public int MaxQuestionCount { get; set; } = 0;
+		public int? MaxQuestionCount { get; set; }
 	}
 
 

IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs

@@ -80,6 +80,7 @@ namespace IRaCIS.Application.Services
 
 
             var readingTableQuestionSystemQueryable = _readingTableQuestionSystemRepository
+            .WhereIf(inDto.TableQuestionType!=null,x=>x.TableQuestionType ==inDto.TableQuestionType!)
             .Where(x=>x.ReadingQuestionId==inDto.ReadingQuestionId).ProjectTo<ReadingTableQuestionSystemView>(_mapper.ConfigurationProvider);
 
             var result=await readingTableQuestionSystemQueryable.ToListAsync();

IRaCIS.Core.Domain.Share/Allocation/AllocationRelation.cs

@@ -172,6 +172,19 @@ namespace IRaCIS.Core.Domain.Share
         SubjectVisit = 1
     }
 
+    public enum TableQuestionType
+    {
+        /// <summary>
+        /// 自定义
+        /// </summary>
+        Customize=0,
+
+        /// <summary>
+        /// 关联数据
+        /// </summary>
+        LinkedData=1,
+
+    }
 
     public enum FormType
     {

IRaCIS.Core.Domain/Reading/ReadingQuestionSystem.cs

@@ -102,7 +102,7 @@ namespace IRaCIS.Core.Domain.Models
 		/// <summary>
 		/// 最大问题数
 		/// </summary>
-		public int MaxQuestionCount { get; set; }
+		public int? MaxQuestionCount { get; set; }
 
 		/// <summary>
 		/// 创建人

IRaCIS.Core.Domain/Reading/ReadingQuestionTrial.cs

@@ -140,7 +140,7 @@ namespace IRaCIS.Core.Domain.Models
 		/// <summary>
 		/// 最大问题数
 		/// </summary>
-		public int MaxQuestionCount { get; set; }
+		public int? MaxQuestionCount { get; set; }
 
 		/// <summary>
 		/// 分页标准

IRaCIS.Core.Domain/Reading/ReadingTableQuestionSystem.cs

@@ -94,7 +94,7 @@ namespace IRaCIS.Core.Domain.Models
 		/// <summary>
         /// 最大问题数
         /// </summary>
-		public int MaxRowCount { get; set; }
+		public int? MaxRowCount { get; set; }
 	
 		/// <summary>
         /// 数据表名称
@@ -106,6 +106,11 @@ namespace IRaCIS.Core.Domain.Models
         /// </summary>
 		public string DataTableColumn { get; set; }
 
+		/// <summary>
+		/// 表格问题类型
+		/// </summary>
+		public TableQuestionType TableQuestionType { get; set; }
+
 	}