修改一版

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

@@ -663,6 +663,15 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
     }
 
 
+    public class GetSystemReadingQuestionPageDto
+    {
+        public List<GetSystemReadingQuestionOutDto> SinglePage { get; set; }
+
+        public List<GetSystemReadingQuestionOutDto> MultiPage { get; set; }
+
+        public List<GetSystemReadingQuestionOutDto> PublicPage { get; set; }
+    }
+
     public class GetTrialReadingQuestionPageDto
     {
         public List<GetTrialReadingQuestionOutDto> SinglePage { get; set; }
@@ -672,7 +681,238 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public List<GetTrialReadingQuestionOutDto> PublicPage{ get; set; }
     }
 
-   
+    public class TableQuestionDataInfo
+    {
+        /// <summary>
+        /// 问题ID
+        /// </summary>
+		public Guid ReadingQuestionId { get; set; }
+
+        /// <summary>
+        /// Type
+        /// </summary>
+        public string Type { get; set; }
+
+        /// <summary>
+        /// ParentId
+        /// </summary>
+        public Guid? ParentId { get; set; }
+
+        /// <summary>
+        ///父问题触发值
+        /// </summary>
+        public string ParentTriggerValue { get; set; }
+
+        /// <summary>
+        /// 问题名称
+        /// </summary>
+        public string QuestionName { get; set; }
+
+        /// <summary>
+        /// IsRequired
+        /// </summary>
+        public int IsRequired { get; set; }
+
+        /// <summary>
+        /// 排序号
+        /// </summary>
+        public int ShowOrder { get; set; }
+
+        /// <summary>
+        /// 值
+        /// </summary>
+        public string TypeValue { get; set; }
+
+        /// <summary>
+        /// 是否启用
+        /// </summary>
+        public bool IsEnable { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime { get; set; }
+
+        /// <summary>
+        /// 创建用户
+        /// </summary>
+        public Guid CreateUserId { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
+
+        /// <summary>
+        /// 显示父问题
+        /// </summary>
+        public Guid? RelevanceId { get; set; }
+
+        /// <summary>
+        /// 显示父问题的值
+        /// </summary>
+        public string RelevanceValue { get; set; }
+
+        /// <summary>
+        /// 是否显示
+        /// </summary>
+        public int ShowQuestion { get; set; }
+
+        /// <summary>
+        /// 最大问题数
+        /// </summary>
+        public int? MaxRowCount { get; set; }
+
+        /// <summary>
+        /// 数据表名称
+        /// </summary>
+        public string DataTableName { get; set; }
+
+        /// <summary>
+        /// 数据列
+        /// </summary>
+        public string DataTableColumn { get; set; }
+
+
+        /// <summary>
+        /// 关联父问题
+        /// </summary>
+        public Guid? DependParentId { get; set; }
+
+        /// <summary>
+        /// 是否关联
+        /// </summary>
+        public IsDepend IsDepend { get; set; }
+
+        /// <summary>
+        /// 表格问题类型
+        /// </summary>
+        public TableQuestionType? TableQuestionType { get; set; }
+
+
+        /// <summary>
+        /// 问题标识
+        /// </summary>
+        public QuestionMark? QuestionMark { get; set; }
+    }
+
+
+    public class GetSystemReadingQuestionOutDto
+    {
+
+        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 IsRequired 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 DateTime CreateTime { get; set; }
+
+        /// <summary>
+        /// 是否是裁判问题
+        /// </summary>
+        public bool IsJudgeQuestion { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
+
+        /// <summary>
+        /// 关联ID
+        /// </summary>
+        public Guid? RelevanceId { get; set; }
+
+        /// <summary>
+        /// 关联Value
+        /// </summary>
+        public string RelevanceValue { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 分组
+        /// </summary>
+        public string GroupName { get; set; }
+
+        /// <summary>
+        /// 图片数量
+        /// </summary>
+        public int ImageCount { get; set; } = 1;
+
+        /// <summary>
+        /// 是否显示
+        /// </summary>
+        public ShowQuestion ShowQuestion { get; set; } = ShowQuestion.Show;
+
+        /// <summary>
+        /// 最大问题数
+        /// </summary>
+        public int? MaxQuestionCount { get; set; }
+
+        /// <summary>
+        /// 病灶类型
+        /// </summary>
+        public LesionType? LesionType { get; set; }
+
+        /// <summary>
+        /// 问题类型
+        /// </summary>
+        public QuestionType? QuestionType { get; set; }
+
+        /// <summary>
+        /// 是否显示在Dicom阅片中
+        /// </summary>
+        public bool IsShowInDicom { get; set; }
+
+
+
+        public List<TableQuestionDataInfo> TableQuestions { get; set; }
+
+        public List<GetSystemReadingQuestionOutDto> Childrens { get; set; }
+    }
 
     public class GetTrialReadingQuestionOutDto
     {
@@ -770,6 +1010,31 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public ShowQuestion ShowQuestion { get; set; }
 
+
+    
+
+        /// <summary>
+        /// 最大问题数
+        /// </summary>
+        public int? MaxQuestionCount { get; set; }
+
+        /// <summary>
+        /// 病灶类型
+        /// </summary>
+        public LesionType? LesionType { get; set; }
+
+        /// <summary>
+        /// 问题类型
+        /// </summary>
+        public QuestionType? QuestionType { get; set; }
+
+        /// <summary>
+        /// 是否显示在Dicom阅片中
+        /// </summary>
+        public bool IsShowInDicom { get; set; } = false;
+
+        public List<TableQuestionDataInfo> TableQuestions { get; set; }
+
         public List<GetTrialReadingQuestionOutDto> Childrens { get; set; }
     }