修改

2022-11-30 16:54:09 +08:00
parent cfd5387b77
commit dc6123509c
2 changed files with 158 additions and 246 deletions
@@ -509,144 +509,23 @@ namespace IRaCIS.Core.Application.Contracts
        public Guid CreateUserId { get; set; }
    }

-    public class TrialReadQuestion 
+    public class TrialReadQuestion :ReadingQuestionTrial
    {
-
-        public Guid Id { get; set; }
-
-        /// <summary>
-        /// 排序
-        /// </summary>
-        public int ShowOrder { get; set; }
-
        /// <summary>
        /// 分页名称
        /// </summary>
        public string PageName { get; set; }

-        /// <summary>
-		/// 问题名称
-		/// </summary>
-		public string QuestionName { get; set; }
-
-        /// <summary>
-        /// 类型
-        /// </summary>
-        public string Type { get; set; }
-
-        /// <summary>
-        /// 父问题触发
-        /// </summary>
-        public string ParentTriggerValue { get; set; }
-
        /// <summary>
        /// 父问题名称
        /// </summary>
        public string ParentQuestionName { get; set; }

-        /// <summary>
-        /// 是否是必须
-        /// </summary>
-        public IsRequired IsRequired { get; set; }
-
-        /// <summary>
-        /// 是否显示
-        /// </summary>
-        public ShowQuestion ShowQuestion { get; set; }
-
-        /// <summary>
-        /// 类型值
-        /// </summary>
-        public string TypeValue { get; set; }
-
-        /// <summary>
-		/// 单位
-		/// </summary>
-		public ValueUnit? Unit { get; set; }
-
-        /// <summary>
-        /// 自定义单位
-        /// </summary>
-        public string CustomUnit { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 是否启用
-        /// </summary>
-        public bool IsEnable { get; set; }
-
-        /// <summary>
-        /// 是否是裁判问题
-        /// </summary>
-        public bool IsJudgeQuestion { get; set; }
-
-        /// <summary>
-        /// 备注
-        /// </summary>
-        public string Remark { get; set; }
-
-        /// <summary>
-        /// 分组
-        /// </summary>
-        public string GroupName { get; set; }
-
-        /// <summary>
-        /// 答案分组
-        /// </summary>
-        public string AnswerGroup { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 答案组合
-        /// </summary>
-        public string AnswerCombination { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 裁判类型
-        /// </summary>
-        public JudgeTypeEnum JudgeType { get; set; }
-
-
-        /// <summary>
-		/// 关联Value
-		/// </summary>
-		public string RelevanceValue { get; set; } = string.Empty;
-
        public int? RelevanceShowOrder { get; set; }


        public int? ParentQuestionShowOrder { get; set; }

-
-        /// <summary>
-        /// 病灶类型
-        /// </summary>
-        public LesionType? LesionType { get; set; }
-
-        /// <summary>
-        /// 最大问题数
-        /// </summary>
-        public int? MaxQuestionCount { get; set; }
-
-        /// <summary>
-        /// 是否显示在Dicom阅片中
-        /// </summary>
-        public bool IsShowInDicom { get; set; } = false;
-
-
-        /// <summary>
-        /// 序号标记
-        /// </summary>
-        public string OrderMark { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 自定义计算标记
-        /// </summary>
-        public CustomCalculateMark? CustomCalculateMark { get; set; }
-
-        /// <summary>
-        /// 自定义计算标记
-        /// </summary>
-        public string CalculateQuestions { get; set; } = "[]";
-
    }

    public class TrialJudgeQuestion