修改

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

@@ -641,7 +641,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// <summary>
         /// 是否是必须
         /// </summary>
-        public bool IsRequired { get; set; }
+        public IsRequired IsRequired { get; set; }
 
         /// <summary>
         /// 排序
@@ -695,7 +695,13 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// <summary>
 		/// 图片数量
 		/// </summary>
-		public int ImageCount { get; set; } 
+		public int ImageCount { get; set; }
+
+
+        /// <summary>
+        /// 是否显示
+        /// </summary>
+        public ShowQuestion ShowQuestion { get; set; }
 
         public List<GetTrialReadingQuestionOutDto> Childrens { get; set; }
     }

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

@@ -190,8 +190,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
 		public string CriterionName { get; set; } = string.Empty;
 
-
-
 	}
 
 
@@ -227,11 +225,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public string QuestionName { get; set; }
 
-		/// <summary>
-		/// 是否是必须
-		/// </summary>
-		public bool IsRequired { get; set; }
-
 		/// <summary>
 		/// 排序
 		/// </summary>
@@ -285,6 +278,17 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// 图片数量
 		/// </summary>
 		public int ImageCount { get; set; } = 0;
+
+
+		/// <summary>
+		/// 是否是必须
+		/// </summary>
+		public IsRequired IsRequired { get; set; }
+
+		/// <summary>
+		/// 是否显示
+		/// </summary>
+		public ShowQuestion ShowQuestion { get; set; }
 	}
 
 	public class ReadingQuestionSystemView
@@ -324,11 +328,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public string QuestionName { get; set; }
 
-		/// <summary>
-		/// 是否是必须
-		/// </summary>
-		public bool IsRequired { get; set; }
-
 		/// <summary>
 		/// 排序
 		/// </summary>
@@ -359,7 +358,18 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// <summary>
 		/// 图片数量
 		/// </summary>
-		public int ImageCount { get; set; } 
+		public int ImageCount { get; set; }
+
+
+		/// <summary>
+		/// 是否是必须
+		/// </summary>
+		public IsRequired IsRequired { get; set; }
+
+		/// <summary>
+		/// 是否显示
+		/// </summary>
+		public ShowQuestion ShowQuestion { get; set; }
 	}
 
 
@@ -564,11 +574,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public string QuestionName { get; set; }
 
-		/// <summary>
-		/// 是否是必须
-		/// </summary>
-		public bool IsRequired { get; set; } = false;
-
 		/// <summary>
 		/// 排序
 		/// </summary>
@@ -597,6 +602,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
 		public bool IsEnable { get; set; } = false;
 
+		/// <summary>
+		/// 是否是必须
+		/// </summary>
+		public IsRequired IsRequired { get; set; }
+
+		/// <summary>
+		/// 是否显示
+		/// </summary>
+		public ShowQuestion ShowQuestion { get; set; }
+
 
 		/// <summary>
 		/// 图片数量
@@ -658,11 +673,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public string QuestionName { get; set; }
 
-		/// <summary>
-		/// 是否是必须
-		/// </summary>
-		public bool IsRequired { get; set; } = false;
-
 		/// <summary>
 		/// 排序
 		/// </summary>
@@ -701,6 +711,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// 图片数量
 		/// </summary>
 		public int ImageCount { get; set; } = 0;
+
+		/// <summary>
+		/// 是否是必须
+		/// </summary>
+		public IsRequired IsRequired { get; set; }
+
+		/// <summary>
+		/// 是否显示
+		/// </summary>
+		public ShowQuestion ShowQuestion { get; set; }
 	}
 
 

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

@@ -690,6 +690,7 @@ namespace IRaCIS.Application.Services
                             GroupName = data.GroupName,
                             QuestionName = data.QuestionName,
                             IsRequired = data.IsRequired,
+                            ShowQuestion=data.ShowQuestion,
                             ShowOrder = data.ShowOrder,
                             RelevanceId=data.RelevanceId,
                             RelevanceValue=data.RelevanceValue,
@@ -801,6 +802,7 @@ namespace IRaCIS.Application.Services
                             ParentId = data.ParentId,
                             TypeValue = data.TypeValue,
                             Answer = string.Empty,
+                            ShowQuestion=data.ShowQuestion,
                             PageShowOrder = data.ShowOrder,
                             Type=data.Type,
                         };

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

@@ -324,7 +324,8 @@ namespace IRaCIS.Application.Services
                    AnswerGroup= (c.trial.FirstOrDefault()?.AnswerGroup) ?? string.Empty,
                    GroupName=c.system.GroupName,
                    IsEnable=c.system.IsEnable,
-                   IsJudgeQuestion=c.system.IsJudgeQuestion,
+                   ShowQuestion= c.system.ShowQuestion,
+                   IsJudgeQuestion =c.system.IsJudgeQuestion,
                    IsRequired=c.system.IsRequired,
                    JudgeType = (c.trial.FirstOrDefault()?.JudgeType)??JudgeTypeEnum.None,
                    ParentId = c.trial.FirstOrDefault()?.ParentId,