修改

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

@@ -7,7 +7,26 @@ using System.Threading.Tasks;
 
 namespace IRaCIS.Core.Application.Service.Reading.Dto
 {
-    public class AddOrUpdateReadingQuestionCriterionSystemInDto
+
+	public class AddOrUpdateReadingQuestionCriterionTrialInDto
+	{
+		public Guid? Id { get; set; }
+
+		[NotDefault]
+		public Guid TrialId { get; set; }
+
+		/// <summary>
+		/// 标准
+		/// </summary>
+		public string CriterionName { get; set; }
+
+		/// <summary>
+		/// 是否启用
+		/// </summary>
+		public bool IsEnable { get; set; }
+	}
+
+	public class AddOrUpdateReadingQuestionCriterionSystemInDto
     {
 		public Guid? Id { get; set; }
 
@@ -32,21 +51,33 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 	/// </summary>
 	public class ReadingQuestionCriterionSystemViewInDto:PageInput
 	{
-		public string CriterionName { get; set; }
+		public string CriterionName { get; set; }=String.Empty;
 	}
 
 
-	public class ReadingQuestionSystemView
+	/// <summary>
+	/// 
+	/// </summary>
+	public class ReadingQuestionCriterionTrialViewInDto : PageInput
 	{
-		/// <summary>
-		/// Id
-		/// </summary>
+		[NotDefault]
+		public Guid TrialId { get; set; }
+
+		public string CriterionName { get; set; } = string.Empty;
+	}
+
+
+	public class ReadingQuestionTrialView
+	{
+
 		public Guid Id { get; set; }
 
 		/// <summary>
 		/// 系统标准Id
 		/// </summary>
-		public Guid ReadingQuestionCriterionSystem { get; set; }
+		public Guid ReadingQuestionCriterionTrialId { get; set; }
+
+		public Guid TrialId { get; set; }
 
 		/// <summary>
 		/// 类型
@@ -87,12 +118,86 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		public bool IsEnable { get; set; }
 	}
 
+	public class ReadingQuestionSystemView
+	{
+		/// <summary>
+		/// Id
+		/// </summary>
+		public Guid Id { get; set; }
+
+		/// <summary>
+		/// 系统标准Id
+		/// </summary>
+		public Guid ReadingQuestionCriterionSystemId { get; set; }
+
+		/// <summary>
+		/// 类型
+		/// </summary>
+		public string Type { get; set; }
+
+		/// <summary>
+		/// 父问题触发
+		/// </summary>
+		public string ParentTriggerValue { get; set; }
+
+		/// <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; }
+
+		public bool IsEnable { get; set; }
+	}
+
+
+	public class ReadingQuestionTrialViewInDto : PageInput
+	{
+		/// <summary>
+		/// 系统标准Id
+		/// </summary>
+		[NotDefault]
+		public Guid ReadingQuestionCriterionTrialId { get; set; }
+
+		/// <summary>
+		/// 类型
+		/// </summary>
+		public string Type { get; set; } = string.Empty;
+
+
+		/// <summary>
+		/// 问题名称
+		/// </summary>
+		public string QuestionName { get; set; } = string.Empty;
+	}
+
+
+
 	public class ReadingQuestionSystemViewInDto : PageInput
 	{
 		/// <summary>
 		/// 系统标准Id
 		/// </summary>
-		[Required(ErrorMessage = "ReadingQuestionCriterionSystemId为null")]
+		[NotDefault]
 		public Guid ReadingQuestionCriterionSystemId { get; set; }
 
 		/// <summary>
@@ -117,7 +222,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// <summary>
 		/// 系统标准Id
 		/// </summary>
-		public Guid ReadingQuestionCriterionSystem { get; set; }
+		public Guid ReadingQuestionCriterionSystemId { get; set; }
 
 		/// <summary>
 		/// 类型
@@ -158,6 +263,63 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		public bool IsEnable { get; set; } = false;
 	}
 
+
+
+	public class AddOrUpdateReadingQuestionTrialInDto
+	{
+		/// <summary>
+		/// Id
+		/// </summary>
+		public Guid? Id { get; set; }
+
+
+		public Guid TrialId { get; set; }
+
+		/// <summary>
+		/// 系统标准Id
+		/// </summary>
+		public Guid ReadingQuestionCriterionTrialId { 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; } = false;
+
+		/// <summary>
+		/// 排序
+		/// </summary>
+		public int ShowOrder { get; set; } = 0;
+
+		/// <summary>
+		/// 父问题ID
+		/// </summary>
+		public Guid? ParentId { get; set; }
+
+
+		/// <summary>
+		/// 类型值
+		/// </summary>
+		public string TypeValue { get; set; }
+
+		public bool IsEnable { get; set; } = false;
+	}
+
+
 	public class ReadingQuestionCriterionSystemView
 	{
 		/// <summary>
@@ -180,4 +342,37 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public bool IsEnable { get; set; }
 	}
+
+
+	public class ReadingQuestionCriterionTrialView
+	{
+		/// <summary>
+		/// 返回的对象
+		/// </summary>
+		public Guid Id { get; set; }
+
+		/// <summary>
+		/// 系统标准ID
+		/// </summary>
+		public Guid? ReadingQuestionCriterionSystemId { get; set; }
+
+		/// <summary>
+		/// 标准
+		/// </summary>
+		public string CriterionName { get; set; }
+
+		/// <summary>
+		/// 是否启用
+		/// </summary>
+		public bool IsEnable { get; set; }
+
+		/// <summary>
+		/// 是否是系统数据
+		/// </summary>
+		public bool IsSystemData {
+			get {
+				return this.ReadingQuestionCriterionSystemId != null;
+			}
+		}
+	}
 }