整理数据库实体备注

IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs

@@ -1,274 +1,192 @@
 using IRaCIS.Core.Domain.Share;
 using System.Linq;
 
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+[Comment("系统阅片问题")]
+[Table("ReadingQuestionSystem")]
+public class ReadingQuestionSystem : BaseAddAuditEntity
 {
-    ///<summary>
-    /// 系统阅片问题
-    ///</summary>
-    [Table("ReadingQuestionSystem")]
-    public class ReadingQuestionSystem : BaseAddAuditEntity
+    #region 导航属性
+    [JsonIgnore]
+    [ForeignKey("GroupId")]
+    public ReadingQuestionSystem GroupInfo { get; set; }
+    [JsonIgnore]
+    [ForeignKey("ReadingQuestionCriterionSystemId")]
+    public ReadingQuestionCriterionSystem ReadingQuestionCriterionSystem { get; set; }
+
+    [JsonIgnore]
+    [ForeignKey("ParentId")]
+    public ReadingQuestionSystem ParentReadingQuestionSystem { get; set; }
+    [JsonIgnore]
+    [ForeignKey("RelevanceId")]
+    public ReadingQuestionSystem RelevanceReadingQuestionSystem { get; set; }
+
+    [NotMapped]
+    public List<string> ParentTriggerValueList
     {
-        #region 导航属性
-        [JsonIgnore]
-        [ForeignKey("GroupId")]
-        public ReadingQuestionSystem GroupInfo { get; set; }
-        [JsonIgnore]
-        [ForeignKey("ReadingQuestionCriterionSystemId")]
-        public ReadingQuestionCriterionSystem ReadingQuestionCriterionSystem { get; set; }
-
-        [JsonIgnore]
-        [ForeignKey("ParentId")]
-        public ReadingQuestionSystem ParentReadingQuestionSystem { get; set; }
-        [JsonIgnore]
-        [ForeignKey("RelevanceId")]
-        public ReadingQuestionSystem RelevanceReadingQuestionSystem { get; set; }
-
-        [NotMapped]
-        public List<string> ParentTriggerValueList
+        get
         {
-            get
+            try
             {
-                try
-                {
-                    return this.ParentTriggerValue.Split(',').ToList();
-                }
-                catch (Exception)
-                {
-
-                    return new List<string>();
-                }
+                return this.ParentTriggerValue.Split(',').ToList();
             }
-
-        }
-        [NotMapped]
-        public List<string> RelevanceValueList
-        {
-            get
-            {
-                try
-                {
-                    return this.RelevanceValue.Split(',').ToList();
-                }
-                catch (Exception)
-                {
-
-                    return new List<string>();
-                }
-            }
-
-        }
-
-        [NotMapped]
-        public List<string> HighlightAnswerList
-        {
-            get
+            catch (Exception)
             {
 
-                try
-                {
-                    var result = JsonConvert.DeserializeObject<List<string>>(this.HighlightAnswer);
-                    return result == null ? new List<string>() : result;
-                }
-                catch (Exception)
-                {
-
-                    return new List<string>();
-                }
-
+                return new List<string>();
             }
         }
-        #endregion
-        /// <summary>
-        /// 系统标准Id
-        /// </summary>
-        public Guid ReadingQuestionCriterionSystemId { get; set; }
 
-        /// <summary>
-        /// 类型
-        /// </summary>
-        public string Type { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 父问题触发
-        /// </summary>
-        public string ParentTriggerValue { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 问题名称
-        /// </summary>
-        public string QuestionName { get; set; } = string.Empty;
-
-        /// <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; } = string.Empty;
-
-        /// <summary>
-        /// 是否启用
-        /// </summary>
-        public bool IsEnable { get; set; }
-        /// <summary>
-        /// 是否是裁判问题
-        /// </summary>
-        public bool IsJudgeQuestion { get; set; }
-
-        /// <summary>
-        /// 备注
-        /// </summary>
-        public string Remark { get; set; } = string.Empty;
-
-        /// <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; } = string.Empty;
-
-        /// <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; } = false;
-
-        /// <summary>
-        /// 序号标记
-        /// </summary>
-        public string OrderMark { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 字典code
-        /// </summary>
-        public string DictionaryCode { get; set; } = string.Empty;
-        /// <summary>
-        /// 问题类型
-        /// </summary>
-        public TableQuestionType? QuestionGenre { get; set; }
-
-        /// <summary>
-        /// 全局阅片显示类型
-        /// </summary>
-        public GlobalReadingShowType GlobalReadingShowType { get; set; } = GlobalReadingShowType.NotShow;
-
-        /// <summary>
-        /// 转化显示类型
-        /// </summary>
-        public ConvertShowType ConvertShowType { get; set; } = ConvertShowType.All;
-
-        /// <summary>
-        /// 默认值
-        /// </summary>
-        public string DefaultValue { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 数值类型
-        /// </summary>
-        public ValueOfType? ValueType { get; set; }
-
-        /// <summary>
-        /// 单位
-        /// </summary>
-        public ValueUnit? Unit { get; set; }
-        /// <summary>
-        /// 问题英文名称
-        /// </summary>
-        public string QuestionEnName { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 问题英文分组
-        /// </summary>
-        public string GroupEnName { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 限制编辑
-        /// </summary>
-        public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
-
-        /// <summary>
-        /// 限制显示
-        /// </summary>
-        public LimitShow LimitShow { get; set; } = LimitShow.AllShow;
-
-        /// <summary>
-        /// 数据来源
-        /// </summary>
-        public DataSources DataSource { get; set; } = DataSources.ManualEntry;
-
-        /// <summary>
-        /// 最大答案长度
-        /// </summary>
-        public int? MaxAnswerLength { get; set; }
-
-        /// <summary>
-        /// 分组ID
-        /// </summary>
-        public Guid? GroupId { get; set; }
-
-        /// <summary>
-        /// 文件类型
-        /// </summary>
-        public string FileType { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 分组分类
-        /// </summary>
-        public GroupClassify? GroupClassify { get; set; }
-
-        /// <summary>
-        /// 问题分类
-        /// </summary>
-        public QuestionClassify? QuestionClassify { get; set; }
-
-        /// <summary>
-        /// 高亮问题的答案
-        /// </summary>
-        public string HighlightAnswer { get; set; } = "[]";
     }
+    [NotMapped]
+    public List<string> RelevanceValueList
+    {
+        get
+        {
+            try
+            {
+                return this.RelevanceValue.Split(',').ToList();
+            }
+            catch (Exception)
+            {
+
+                return new List<string>();
+            }
+        }
+
+    }
+
+    [NotMapped]
+    public List<string> HighlightAnswerList
+    {
+        get
+        {
+
+            try
+            {
+                var result = JsonConvert.DeserializeObject<List<string>>(this.HighlightAnswer);
+                return result == null ? new List<string>() : result;
+            }
+            catch (Exception)
+            {
+
+                return new List<string>();
+            }
+
+        }
+    }
+    #endregion
+    [Comment("系统标准Id")]
+    public Guid ReadingQuestionCriterionSystemId { get; set; }
+
+    [Comment("类型")]
+    public string Type { get; set; } = string.Empty;
+
+    [Comment("父问题触发")]
+    public string ParentTriggerValue { get; set; } = string.Empty;
+
+    [Comment("问题名称")]
+    public string QuestionName { get; set; } = string.Empty;
+
+    [Comment("是否是必须")]
+    public IsRequired IsRequired { get; set; }
+
+    [Comment("排序")]
+    public int ShowOrder { get; set; }
+
+    [Comment("父问题ID")]
+    public Guid? ParentId { get; set; }
+
+    [Comment("类型值")]
+    public string TypeValue { get; set; } = string.Empty;
+
+    [Comment("是否启用")]
+    public bool IsEnable { get; set; }
+    [Comment("是否是裁判问题")]
+    public bool IsJudgeQuestion { get; set; }
+
+    [Comment("备注")]
+    public string Remark { get; set; } = string.Empty;
+
+    [Comment("关联ID")]
+    public Guid? RelevanceId { get; set; }
+
+    [Comment("关联Value")]
+    public string RelevanceValue { get; set; } = string.Empty;
+
+    [Comment("分组")]
+    public string GroupName { get; set; } = string.Empty;
+
+    [Comment("图片数量")]
+    public int ImageCount { get; set; } = 1;
+
+    [Comment("是否显示")]
+    public ShowQuestion ShowQuestion { get; set; } = ShowQuestion.Show;
+
+    [Comment("最大问题数")]
+    public int? MaxQuestionCount { get; set; }
+
+    [Comment("病灶类型")]
+    public LesionType? LesionType { get; set; }
+
+    [Comment("问题类型")]
+    public QuestionType? QuestionType { get; set; }
+
+    [Comment("是否显示在Dicom阅片中")]
+    public bool IsShowInDicom { get; set; } = false;
+
+    [Comment("序号标记")]
+    public string OrderMark { get; set; } = string.Empty;
+
+    [Comment("字典code")]
+    public string DictionaryCode { get; set; } = string.Empty;
+    [Comment("问题类型")]
+    public TableQuestionType? QuestionGenre { get; set; }
+
+    [Comment("全局阅片显示类型")]
+    public GlobalReadingShowType GlobalReadingShowType { get; set; } = GlobalReadingShowType.NotShow;
+
+    [Comment("转化显示类型")]
+    public ConvertShowType ConvertShowType { get; set; } = ConvertShowType.All;
+
+    [Comment("默认值")]
+    public string DefaultValue { get; set; } = string.Empty;
+
+    [Comment("数值类型")]
+    public ValueOfType? ValueType { get; set; }
+
+    [Comment("单位")]
+    public ValueUnit? Unit { get; set; }
+    [Comment("问题英文名称")]
+    public string QuestionEnName { get; set; } = string.Empty;
+
+    [Comment("问题英文分组")]
+    public string GroupEnName { get; set; } = string.Empty;
+
+    [Comment("限制编辑")]
+    public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
+
+    [Comment("限制显示")]
+    public LimitShow LimitShow { get; set; } = LimitShow.AllShow;
+
+    [Comment("数据来源")]
+    public DataSources DataSource { get; set; } = DataSources.ManualEntry;
+
+    [Comment("最大答案长度")]
+    public int? MaxAnswerLength { get; set; }
+
+    [Comment("分组ID")]
+    public Guid? GroupId { get; set; }
+
+    [Comment("文件类型")]
+    public string FileType { get; set; } = string.Empty;
+
+    [Comment("分组分类")]
+    public GroupClassify? GroupClassify { get; set; }
+
+    [Comment("问题分类")]
+    public QuestionClassify? QuestionClassify { get; set; }
+
+    [Comment("高亮问题的答案")]
+    public string HighlightAnswer { get; set; } = "[]";
 }

IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs

@@ -1,377 +1,265 @@
 using IRaCIS.Core.Domain.Share;
 using System.Linq;
 
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+[Comment("项目阅片问题")]
+[Table("ReadingQuestionTrial")]
+public class ReadingQuestionTrial : BaseAddAuditEntity
 {
-    ///<summary>
-    /// 项目阅片问题
-    ///</summary>
-    [Table("ReadingQuestionTrial")]
-    public class ReadingQuestionTrial : BaseAddAuditEntity
+    #region 导航属性
+    [Comment("分页标准")]
+    [ForeignKey("ReadingCriterionPageId")]
+    [JsonIgnore]
+    public ReadingCriterionPage ReadingCriterionPage { get; set; }
+    [JsonIgnore]
+    [ForeignKey("ParentId")]
+    public ReadingQuestionTrial ParentReadingQuestionTrial { get; set; }
+    [JsonIgnore]
+    [ForeignKey("RelevanceId")]
+    public ReadingQuestionTrial RelevanceReadingQuestionTrial { get; set; }
+    [JsonIgnore]
+    [ForeignKey("ReadingQuestionCriterionTrialId")]
+    public ReadingQuestionCriterionTrial ReadingQuestionCriterionTrial { get; set; }
+
+    [JsonIgnore]
+    public List<ReadingTableQuestionTrial> ReadingTableQuestionTrialList { get; set; }
+    [JsonIgnore]
+    [ForeignKey("GroupId")]
+    public ReadingQuestionTrial GroupInfo { get; set; }
+
+    [NotMapped]
+    public List<string> ParentTriggerValueList
     {
-        #region 导航属性
-        /// <summary>
-        /// 分页标准
-        /// </summary>
-        [ForeignKey("ReadingCriterionPageId")]
-        [JsonIgnore]
-        public ReadingCriterionPage ReadingCriterionPage { get; set; }
-        [JsonIgnore]
-        [ForeignKey("ParentId")]
-        public ReadingQuestionTrial ParentReadingQuestionTrial { get; set; }
-        [JsonIgnore]
-        [ForeignKey("RelevanceId")]
-        public ReadingQuestionTrial RelevanceReadingQuestionTrial { get; set; }
-        [JsonIgnore]
-        [ForeignKey("ReadingQuestionCriterionTrialId")]
-        public ReadingQuestionCriterionTrial ReadingQuestionCriterionTrial { get; set; }
-
-        [JsonIgnore]
-        public List<ReadingTableQuestionTrial> ReadingTableQuestionTrialList { get; set; }
-        [JsonIgnore]
-        [ForeignKey("GroupId")]
-        public ReadingQuestionTrial GroupInfo { get; set; }
-
-        [NotMapped]
-        public List<string> ParentTriggerValueList
+        get
         {
-            get
+            try
             {
-                try
-                {
-                    return this.ParentTriggerValue.Split(',').ToList();
-                }
-                catch (Exception)
-                {
-
-                    return new List<string>();
-                }
+                return this.ParentTriggerValue.Split(',').ToList();
             }
-
-        }
-        [NotMapped]
-        public List<string> RelevanceValueList
-        {
-            get
-            {
-                try
-                {
-                    return this.RelevanceValue.Split(',').ToList();
-                }
-                catch (Exception)
-                {
-
-                    return new List<string>();
-                }
-            }
-
-        }
-        [NotMapped]
-        public List<CalculateInfo> CalculateQuestionList
-        {
-            get
+            catch (Exception)
             {
 
-                try
-                {
-                    var result = JsonConvert.DeserializeObject<List<CalculateInfo>>(this.CalculateQuestions);
-                    return result == null ? new List<CalculateInfo>() : result;
-                }
-                catch (Exception)
-                {
-
-                    return new List<CalculateInfo>();
-                }
-
+                return new List<string>();
             }
         }
 
-        [NotMapped]
-        public List<string> HighlightAnswerList
-        {
-            get
-            {
-
-                try
-                {
-                    var result = JsonConvert.DeserializeObject<List<string>>(this.HighlightAnswer);
-                    return result == null ? new List<string>() : result;
-                }
-                catch (Exception)
-                {
-
-                    return new List<string>();
-                }
-
-            }
-        }
-        #endregion
-        public bool IsAdditional { get; set; }
-        /// <summary>
-        /// 项目标准Id
-        /// </summary>
-        public Guid ReadingQuestionCriterionTrialId { get; set; }
-
-        /// <summary>
-        /// 项目Id
-        /// </summary>
-        public Guid TrialId { get; set; }
-
-        /// <summary>
-        /// 类型
-        /// </summary>
-        public string Type { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 父问题触发
-        /// </summary>
-        public string ParentTriggerValue { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 问题名称
-        /// </summary>
-        public string QuestionName { get; set; } = string.Empty;
-
-        /// <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; } = string.Empty;
-
-        public bool IsEnable { get; set; }
-
-        /// <summary>
-        /// 是否是裁判问题
-        /// </summary>
-        public bool IsJudgeQuestion { get; set; }
-
-        /// <summary>
-        /// 病灶类型
-        /// </summary>
-        public LesionType? LesionType { get; set; }
-
-        /// <summary>
-        /// 问题类型
-        /// </summary>
-        public QuestionType? QuestionType { get; set; }
-
-        /// <summary>
-        /// 全局阅片显示类型
-        /// </summary>
-        public GlobalReadingShowType GlobalReadingShowType { get; set; } = GlobalReadingShowType.NotShow;
-        /// <summary>
-        /// 转化显示类型
-        /// </summary>
-        public ConvertShowType ConvertShowType { get; set; } = ConvertShowType.All;
-
-        /// <summary>
-        /// 备注
-        /// </summary>
-        public string Remark { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 分组
-        /// </summary>
-        public string GroupName { get; set; } = string.Empty;
-        /// <summary>
-        /// 系统问题ID
-        /// </summary>
-        public Guid? ReadingQuestionSystemId { get; set; }
-
-        /// <summary>
-        /// 系统标准的ParentId
-        /// </summary>
-        public Guid? SystemParentId { 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; } = JudgeTypeEnum.AnswerDisaffinity;
-
-        /// <summary>
-        /// 裁判百分比或绝对值的相差值
-        /// </summary>
-        public decimal? JudgeDifferenceValue { get; set; }
-
-        /// <summary>
-        /// 裁判百分比或绝对值的相差值匹配规则
-        /// </summary>
-        public JudgeDifferenceType JudgeDifferenceType { get; set; }
-        /// <summary>
-        /// 标准分页Id
-        /// </summary>
-        public Guid? ReadingCriterionPageId { get; set; }
-
-        /// <summary>
-        /// 关联ID
-        /// </summary>
-        public Guid? RelevanceId { get; set; }
-
-        /// <summary>
-        /// 关联Value
-        /// </summary>
-        public string RelevanceValue { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 图片数量
-        /// </summary>
-        public int ImageCount { get; set; } = 1;
-
-        /// <summary>
-        /// 是否显示
-        /// </summary>
-        public ShowQuestion ShowQuestion { get; set; } = ShowQuestion.Show;
-
-        /// <summary>
-        /// 默认值
-        /// </summary>
-        public string DefaultValue { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 最大问题数
-        /// </summary>
-        public int? MaxQuestionCount { get; set; }
-
-        /// <summary>
-        /// 最大答案长度
-        /// </summary>
-        public int? MaxAnswerLength { get; set; }
-
-        /// <summary>
-        /// 文件类型
-        /// </summary>
-        public string FileType { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 是否显示在Dicom阅片中
-        /// </summary>
-        public bool IsShowInDicom { get; set; } = false;
-        /// <summary>
-        /// 序号标记
-        /// </summary>
-        public string OrderMark { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 字典code
-        /// </summary>
-        public string DictionaryCode { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 问题类型
-        /// </summary>
-        public TableQuestionType? QuestionGenre { get; set; }
-
-        /// <summary>
-        /// 数值类型
-        /// </summary>
-        public ValueOfType? ValueType { get; set; }
-
-        /// <summary>
-        /// 单位
-        /// </summary>
-        public ValueUnit? Unit { get; set; }
-
-        /// <summary>
-        /// 自定义单位
-        /// </summary>
-        public string CustomUnit { get; set; } = string.Empty;
-        /// <summary>
-        /// 自定义计算标记
-        /// </summary>
-        public CustomCalculateMark? CustomCalculateMark { get; set; }
-
-        /// <summary>
-        /// 限制编辑
-        /// </summary>
-        public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
-
-        /// <summary>
-        /// 限制显示
-        /// </summary>
-        public LimitShow LimitShow { get; set; } = LimitShow.AllShow;
-
-        /// <summary>
-        /// 自定义计算标记
-        /// </summary>
-        public string CalculateQuestions { get; set; } = "[]";
-
-        /// <summary>
-        /// 数据来源
-        /// </summary>
-        public DataSources DataSource { get; set; } = DataSources.ManualEntry;
-
-        /// <summary>
-        /// 问题英文名称
-        /// </summary>
-        public string QuestionEnName { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 问题英文分组
-        /// </summary>
-        public string GroupEnName { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 分类算法
-        /// </summary>
-        public string ClassifyAlgorithms { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 分类问题Id
-        /// </summary>
-        public Guid? ClassifyQuestionId { get; set; }
-
-        /// <summary>
-        /// 是否复制病灶
-        /// </summary>
-        public bool IsCopyLesions { get; set; } = false;
-
-        /// <summary>
-        /// 分组ID
-        /// </summary>
-        public Guid? GroupId { get; set; }
-        /// <summary>
-        /// 分组分类
-        /// </summary>
-        public GroupClassify? GroupClassify { get; set; }
-        /// <summary>
-        /// 问题分类
-        /// </summary>
-        public QuestionClassify? QuestionClassify { get; set; }
-        /// <summary>
-        /// 高亮问题的答案
-        /// </summary>
-        public string HighlightAnswer { get; set; } = "[]";
-    }
-    public class CalculateInfo
-    {
-        public bool IsTable { get; set; }
-
-        public Guid? QuestionId { get; set; }
-
-        public Guid? TableQuestionId { get; set; }
-
     }
+    [NotMapped]
+    public List<string> RelevanceValueList
+    {
+        get
+        {
+            try
+            {
+                return this.RelevanceValue.Split(',').ToList();
+            }
+            catch (Exception)
+            {
+
+                return new List<string>();
+            }
+        }
+
+    }
+    [NotMapped]
+    public List<CalculateInfo> CalculateQuestionList
+    {
+        get
+        {
+
+            try
+            {
+                var result = JsonConvert.DeserializeObject<List<CalculateInfo>>(this.CalculateQuestions);
+                return result == null ? new List<CalculateInfo>() : result;
+            }
+            catch (Exception)
+            {
+
+                return new List<CalculateInfo>();
+            }
+
+        }
+    }
+
+    [NotMapped]
+    public List<string> HighlightAnswerList
+    {
+        get
+        {
+
+            try
+            {
+                var result = JsonConvert.DeserializeObject<List<string>>(this.HighlightAnswer);
+                return result == null ? new List<string>() : result;
+            }
+            catch (Exception)
+            {
+
+                return new List<string>();
+            }
+
+        }
+    }
+    #endregion
+    public bool IsAdditional { get; set; }
+    [Comment("项目标准Id")]
+    public Guid ReadingQuestionCriterionTrialId { get; set; }
+
+    [Comment("项目Id")]
+    public Guid TrialId { get; set; }
+
+    [Comment("类型")]
+    public string Type { get; set; } = string.Empty;
+
+    [Comment("父问题触发")]
+    public string ParentTriggerValue { get; set; } = string.Empty;
+
+    [Comment("问题名称")]
+    public string QuestionName { get; set; } = string.Empty;
+
+    [Comment("是否是必须")]
+    public IsRequired IsRequired { get; set; }
+
+    [Comment("排序")]
+    public int ShowOrder { get; set; }
+
+    [Comment("父问题ID")]
+    public Guid? ParentId { get; set; }
+    [Comment("类型值")]
+    public string TypeValue { get; set; } = string.Empty;
+
+    public bool IsEnable { get; set; }
+
+    [Comment("是否是裁判问题")]
+    public bool IsJudgeQuestion { get; set; }
+
+    [Comment("病灶类型")]
+    public LesionType? LesionType { get; set; }
+
+    [Comment("问题类型")]
+    public QuestionType? QuestionType { get; set; }
+
+    [Comment("全局阅片显示类型")]
+    public GlobalReadingShowType GlobalReadingShowType { get; set; } = GlobalReadingShowType.NotShow;
+    [Comment("转化显示类型")]
+    public ConvertShowType ConvertShowType { get; set; } = ConvertShowType.All;
+
+    [Comment("备注")]
+    public string Remark { get; set; } = string.Empty;
+
+    [Comment("分组")]
+    public string GroupName { get; set; } = string.Empty;
+    [Comment("系统问题ID")]
+    public Guid? ReadingQuestionSystemId { get; set; }
+
+    [Comment("系统标准的ParentId")]
+    public Guid? SystemParentId { get; set; }
+
+    [Comment("答案分组")]
+    public string AnswerGroup { get; set; } = string.Empty;
+
+    [Comment("答案组合")]
+    public string AnswerCombination { get; set; } = string.Empty;
+
+    [Comment("裁判类型")]
+    public JudgeTypeEnum JudgeType { get; set; } = JudgeTypeEnum.AnswerDisaffinity;
+
+    [Comment("裁判百分比或绝对值的相差值")]
+    public decimal? JudgeDifferenceValue { get; set; }
+
+    [Comment("裁判百分比或绝对值的相差值匹配规则")]
+    public JudgeDifferenceType JudgeDifferenceType { get; set; }
+    [Comment("标准分页Id")]
+    public Guid? ReadingCriterionPageId { get; set; }
+
+    [Comment("关联ID")]
+    public Guid? RelevanceId { get; set; }
+
+    [Comment("关联Value")]
+    public string RelevanceValue { get; set; } = string.Empty;
+
+    [Comment("图片数量")]
+    public int ImageCount { get; set; } = 1;
+
+    [Comment("是否显示")]
+    public ShowQuestion ShowQuestion { get; set; } = ShowQuestion.Show;
+
+    [Comment("默认值")]
+    public string DefaultValue { get; set; } = string.Empty;
+
+    [Comment("最大问题数")]
+    public int? MaxQuestionCount { get; set; }
+
+    [Comment("最大答案长度")]
+    public int? MaxAnswerLength { get; set; }
+
+    [Comment("文件类型")]
+    public string FileType { get; set; } = string.Empty;
+
+    [Comment("是否显示在Dicom阅片中")]
+    public bool IsShowInDicom { get; set; } = false;
+    [Comment("序号标记")]
+    public string OrderMark { get; set; } = string.Empty;
+
+    [Comment("字典code")]
+    public string DictionaryCode { get; set; } = string.Empty;
+
+    [Comment("问题类型")]
+    public TableQuestionType? QuestionGenre { get; set; }
+
+    [Comment("数值类型")]
+    public ValueOfType? ValueType { get; set; }
+
+    [Comment("单位")]
+    public ValueUnit? Unit { get; set; }
+
+    [Comment("自定义单位")]
+    public string CustomUnit { get; set; } = string.Empty;
+    [Comment("自定义计算标记")]
+    public CustomCalculateMark? CustomCalculateMark { get; set; }
+
+    [Comment("限制编辑")]
+    public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
+
+    [Comment("限制显示")]
+    public LimitShow LimitShow { get; set; } = LimitShow.AllShow;
+
+    [Comment("自定义计算标记")]
+    public string CalculateQuestions { get; set; } = "[]";
+
+    [Comment("数据来源")]
+    public DataSources DataSource { get; set; } = DataSources.ManualEntry;
+
+    [Comment("问题英文名称")]
+    public string QuestionEnName { get; set; } = string.Empty;
+
+    [Comment("问题英文分组")]
+    public string GroupEnName { get; set; } = string.Empty;
+
+    [Comment("分类算法")]
+    public string ClassifyAlgorithms { get; set; } = string.Empty;
+
+    [Comment("分类问题Id")]
+    public Guid? ClassifyQuestionId { get; set; }
+
+    [Comment("是否复制病灶")]
+    public bool IsCopyLesions { get; set; } = false;
+
+    [Comment("分组ID")]
+    public Guid? GroupId { get; set; }
+    [Comment("分组分类")]
+    public GroupClassify? GroupClassify { get; set; }
+    [Comment("问题分类")]
+    public QuestionClassify? QuestionClassify { get; set; }
+    [Comment("高亮问题的答案")]
+    public string HighlightAnswer { get; set; } = "[]";
+}
+public class CalculateInfo
+{
+    public bool IsTable { get; set; }
+
+    public Guid? QuestionId { get; set; }
+
+    public Guid? TableQuestionId { get; set; }
+
 }

IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingSystemCriterionDictionary.cs

@@ -1,30 +1,24 @@
 using IRaCIS.Core.Domain.Share;
 
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+
+[Table("ReadingSystemCriterionDictionary")]
+public class ReadingSystemCriterionDictionary : BaseAddAuditEntity
 {
-    ///<summary>
-    ///ReadingCriterionDictionary
-    ///</summary>
-    [Table("ReadingSystemCriterionDictionary")]
-    public class ReadingSystemCriterionDictionary : BaseAddAuditEntity
-    {
-        #region µ¼º½ÊôÐÔ
+    #region µ¼º½ÊôÐÔ
 
-        [JsonIgnore]
-        [ForeignKey("DictionaryId")]
-        public Dictionary Dictionary { get; set; }
-        #endregion
-        public Guid CriterionId { get; set; }
-        public Guid DictionaryId { get; set; }
-        public bool IsSystemCriterion { get; set; } = false;
+    [JsonIgnore]
+    [ForeignKey("DictionaryId")]
+    public Dictionary Dictionary { get; set; }
+    #endregion
+    public Guid CriterionId { get; set; }
+    public Guid DictionaryId { get; set; }
+    public bool IsSystemCriterion { get; set; } = false;
 
-        public string ParentCode { get; set; } = string.Empty;
-        public bool IsBaseLineUse { get; set; } = false;
-        public bool IsFollowVisitUse { get; set; } = false;
+    public string ParentCode { get; set; } = string.Empty;
+    public bool IsBaseLineUse { get; set; } = false;
+    public bool IsFollowVisitUse { get; set; } = false;
 
-        /// <summary>
-        /// ±ê×¼×Öµä·Ö×é
-        /// </summary>
-        public CrterionDictionaryGroup CrterionDictionaryGroup { get; set; } = CrterionDictionaryGroup.General;
-    }
+    [Comment("±ê×¼×Öµä·Ö×é")]
+    public CrterionDictionaryGroup CrterionDictionaryGroup { get; set; } = CrterionDictionaryGroup.General;
 }

IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs

@@ -1,191 +1,133 @@
 using IRaCIS.Core.Domain.Share;
 using System.Linq;
 
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+[Comment("系统表格问题")]
+[Table("ReadingTableQuestionSystem")]
+public class ReadingTableQuestionSystem : BaseAddAuditEntity
 {
-    ///<summary>
-    ///系统表格问题
-    ///</summary>
-    [Table("ReadingTableQuestionSystem")]
-    public class ReadingTableQuestionSystem : BaseAddAuditEntity
+    #region 导航属性
+    [ForeignKey("DependParentId")]
+    [JsonIgnore]
+    public ReadingTableQuestionSystem DependParentQuestion { get; set; }
+
+    [NotMapped]
+    public List<string> ParentTriggerValueList
     {
-        #region 导航属性
-        [ForeignKey("DependParentId")]
-        [JsonIgnore]
-        public ReadingTableQuestionSystem DependParentQuestion { get; set; }
-
-        [NotMapped]
-        public List<string> ParentTriggerValueList
+        get
         {
-            get
+            try
             {
-                try
-                {
-                    return this.ParentTriggerValue.Split(',').ToList();
-                }
-                catch (Exception)
-                {
-
-                    return new List<string>();
-                }
+                return this.ParentTriggerValue.Split(',').ToList();
             }
-
-        }
-        [NotMapped]
-        public List<string> RelevanceValueList
-        {
-            get
+            catch (Exception)
             {
-                try
-                {
-                    return this.RelevanceValue.Split(',').ToList();
-                }
-                catch (Exception)
-                {
 
-                    return new List<string>();
-                }
+                return new List<string>();
             }
-
         }
-        #endregion
 
-        /// <summary>
-        /// 系统表的问题Id    ReadingQuestionSystem的Id
-        /// </summary>
-        public Guid ReadingQuestionId { get; set; }
-
-        public string Type { get; set; } = string.Empty;
-        public Guid? ParentId { get; set; }
-
-        /// <summary>
-        ///父问题触发值
-        /// </summary>
-        public string ParentTriggerValue { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 问题名称
-        /// </summary>
-        public string QuestionName { get; set; } = string.Empty;
-
-        /// <summary>
-        /// IsRequired
-        /// </summary>
-        public IsRequired IsRequired { get; set; }
-
-        /// <summary>
-        /// 排序号
-        /// </summary>
-        public int ShowOrder { get; set; }
-
-        /// <summary>
-        /// 值
-        /// </summary>
-        public string TypeValue { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 是否启用
-        /// </summary>
-        public bool IsEnable { get; set; }
-
-        public string Remark { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 显示父问题
-        /// </summary>
-        public Guid? RelevanceId { get; set; }
-
-        /// <summary>
-        /// 显示父问题的值
-        /// </summary>
-        public string RelevanceValue { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 是否显示
-        /// </summary>
-        public int ShowQuestion { get; set; }
-
-        /// <summary>
-        /// 最大问题数
-        /// </summary>
-        public int? MaxRowCount { get; set; }
-
-        /// <summary>
-        /// 数据表名称
-        /// </summary>
-        public string DataTableName { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 数据列
-        /// </summary>
-        public string DataTableColumn { get; set; } = string.Empty;
-        /// <summary>
-        /// 关联父问题
-        /// </summary>
-        public Guid? DependParentId { get; set; }
-
-        /// <summary>
-        /// 是否关联
-        /// </summary>
-        public IsDepend IsDepend { get; set; }
-
-        /// <summary>
-        /// 表格问题类型
-        /// </summary>
-        public TableQuestionType? TableQuestionType { get; set; }
-
-        /// <summary>
-        /// 系统标准Id
-        /// </summary>
-        public Guid SystemCriterionId { get; set; }
-
-        /// <summary>
-        /// 问题标识
-        /// </summary>
-        public QuestionMark? QuestionMark { get; set; }
-
-        /// <summary>
-        /// 字典code
-        /// </summary>
-        public string DictionaryCode { get; set; } = string.Empty;
-        /// <summary>
-        /// 数值类型
-        /// </summary>
-        public ValueOfType? ValueType { get; set; }
-
-        /// <summary>
-        /// 单位
-        /// </summary>
-        public ValueUnit? Unit { get; set; }
-
-        /// <summary>
-        /// 问题英文名称
-        /// </summary>
-        public string QuestionEnName { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 数据来源
-        /// </summary>
-        public DataSources DataSource { get; set; } = DataSources.ManualEntry;
-
-        /// <summary>
-        /// 限制编辑
-        /// </summary>
-        public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
-
-        /// <summary>
-        /// 最大答案长度
-        /// </summary>
-        public int? MaxAnswerLength { get; set; }
-
-        /// <summary>
-        /// 文件类型
-        /// </summary>
-        public string? FileType { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 问题分类
-        /// </summary>
-        public QuestionClassify? QuestionClassify { get; set; }
     }
+    [NotMapped]
+    public List<string> RelevanceValueList
+    {
+        get
+        {
+            try
+            {
+                return this.RelevanceValue.Split(',').ToList();
+            }
+            catch (Exception)
+            {
+
+                return new List<string>();
+            }
+        }
+
+    }
+    #endregion
+
+    [Comment("系统表的问题Id    ReadingQuestionSystem的Id")]
+    public Guid ReadingQuestionId { get; set; }
+
+    public string Type { get; set; } = string.Empty;
+    public Guid? ParentId { get; set; }
+
+    [Comment("父问题触发值")]
+    public string ParentTriggerValue { get; set; } = string.Empty;
+
+    [Comment("问题名称")]
+    public string QuestionName { get; set; } = string.Empty;
+
+    
+    public IsRequired IsRequired { get; set; }
+
+    [Comment("排序号")]
+    public int ShowOrder { get; set; }
+
+    [Comment("值")]
+    public string TypeValue { get; set; } = string.Empty;
+
+    [Comment("是否启用")]
+    public bool IsEnable { get; set; }
+
+    public string Remark { get; set; } = string.Empty;
+
+    [Comment("显示父问题")]
+    public Guid? RelevanceId { get; set; }
+
+    [Comment("显示父问题的值")]
+    public string RelevanceValue { get; set; } = string.Empty;
+
+    [Comment("是否显示")]
+    public int ShowQuestion { get; set; }
+
+    [Comment("最大问题数")]
+    public int? MaxRowCount { get; set; }
+
+    [Comment("数据表名称")]
+    public string DataTableName { get; set; } = string.Empty;
+
+    [Comment("数据列")]
+    public string DataTableColumn { get; set; } = string.Empty;
+    [Comment("关联父问题")]
+    public Guid? DependParentId { get; set; }
+
+    [Comment("是否关联")]
+    public IsDepend IsDepend { get; set; }
+
+    [Comment("表格问题类型")]
+    public TableQuestionType? TableQuestionType { get; set; }
+
+    [Comment("系统标准Id")]
+    public Guid SystemCriterionId { get; set; }
+
+    [Comment("问题标识")]
+    public QuestionMark? QuestionMark { get; set; }
+
+    [Comment("字典code")]
+    public string DictionaryCode { get; set; } = string.Empty;
+    [Comment("数值类型")]
+    public ValueOfType? ValueType { get; set; }
+
+    [Comment("单位")]
+    public ValueUnit? Unit { get; set; }
+
+    [Comment("问题英文名称")]
+    public string QuestionEnName { get; set; } = string.Empty;
+
+    [Comment("数据来源")]
+    public DataSources DataSource { get; set; } = DataSources.ManualEntry;
+
+    [Comment("限制编辑")]
+    public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
+
+    [Comment("最大答案长度")]
+    public int? MaxAnswerLength { get; set; }
+
+    [Comment("文件类型")]
+    public string? FileType { get; set; } = string.Empty;
+
+    [Comment("问题分类")]
+    public QuestionClassify? QuestionClassify { get; set; }
 }

IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs

@@ -1,184 +1,148 @@
 using IRaCIS.Core.Domain.Share;
 using System.Linq;
 
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+[Comment("项目阅片问题")]
+[Table("ReadingTableQuestionTrial")]
+public class ReadingTableQuestionTrial : BaseAddAuditEntity
 {
-    ///<summary>
-    /// 项目阅片问题
-    ///</summary>
-    [Table("ReadingTableQuestionTrial")]
-    public class ReadingTableQuestionTrial : BaseAddAuditEntity
+    #region 导航属性
+    [JsonIgnore]
+    [ForeignKey("DependParentId")]
+    public ReadingTableQuestionTrial DependParentQuestion { get; set; }
+
+    [JsonIgnore]
+    [ForeignKey("ReadingQuestionId")]
+    public ReadingQuestionTrial ReadingQuestionTrial { get; set; }
+    [NotMapped]
+    public List<string> ParentTriggerValueList
     {
-        #region 导航属性
-        [JsonIgnore]
-        [ForeignKey("DependParentId")]
-        public ReadingTableQuestionTrial DependParentQuestion { get; set; }
-
-        [JsonIgnore]
-        [ForeignKey("ReadingQuestionId")]
-        public ReadingQuestionTrial ReadingQuestionTrial { get; set; }
-        [NotMapped]
-        public List<string> ParentTriggerValueList
+        get
         {
-            get
+            try
             {
-                try
-                {
-                    return this.ParentTriggerValue.Split(',').ToList();
-                }
-                catch (Exception)
-                {
-
-                    return new List<string>();
-                }
+                return this.ParentTriggerValue.Split(',').ToList();
             }
-
-        }
-        [NotMapped]
-        public List<string> RelevanceValueList
-        {
-            get
+            catch (Exception)
             {
-                try
-                {
-                    return this.RelevanceValue.Split(',').ToList();
-                }
-                catch (Exception)
-                {
-
-                    return new List<string>();
-                }
-            }
-
-        }
-        [NotMapped]
-        public List<CalculateInfo> CalculateQuestionList
-        {
-            get
-            {
-                try
-                {
-                    var result = JsonConvert.DeserializeObject<List<CalculateInfo>>(this.CalculateQuestions);
-                    return result == null ? new List<CalculateInfo>() : result;
-                }
-                catch (Exception)
-                {
-
-                    return new List<CalculateInfo>();
-                }
 
+                return new List<string>();
             }
         }
-        #endregion
 
-        public Guid TrialId { get; set; }
-
-        /// <summary>
-        /// 项目问题的Id ReadingQuestionTrial的id
-        /// </summary>
-        public Guid ReadingQuestionId { get; set; }
-        public string Type { get; set; } = string.Empty;
-        public Guid? ParentId { get; set; }
-
-        public string ParentTriggerValue { get; set; } = string.Empty;
-        public string QuestionName { get; set; } = string.Empty;
-        public IsRequired IsRequired { get; set; }
-
-        public int ShowOrder { get; set; }
-
-        public string TypeValue { get; set; } = string.Empty;
-        public bool IsEnable { get; set; }
-
-        public string Remark { get; set; } = string.Empty;
-        public Guid? RelevanceId { get; set; }
-
-        public string RelevanceValue { get; set; } = string.Empty;
-
-        public int ShowQuestion { get; set; }
-        public int? MaxRowCount { get; set; }
-
-        public string DataTableName { get; set; } = string.Empty;
-
-        public string DataTableColumn { get; set; } = string.Empty;
-
-        public TableQuestionType? TableQuestionType { get; set; }
-
-        public Guid? DependParentId { get; set; }
-
-        public IsDepend IsDepend { get; set; }
-        public Guid TrialCriterionId { get; set; }
-
-        /// <summary>
-        /// 问题标识
-        /// </summary>
-        public QuestionMark? QuestionMark { get; set; }
-        /// <summary>
-        /// 字典code
-        /// </summary>
-        public string DictionaryCode { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 数值类型
-        /// </summary>
-        public ValueOfType? ValueType { get; set; }
-
-        /// <summary>
-        /// 单位
-        /// </summary>
-        public ValueUnit? Unit { get; set; }
-
-        /// <summary>
-        /// 自定义单位
-        /// </summary>
-        public string CustomUnit { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 自定义计算标记
-        /// </summary>
-        public CustomCalculateMark? CustomCalculateMark { get; set; }
-
-        /// <summary>
-        /// 限制编辑
-        /// </summary>
-        public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
-
-        /// <summary>
-        /// 自定义计算标记
-        /// </summary>
-        public string CalculateQuestions { get; set; } = "[]";
-
-        /// <summary>
-        /// 问题英文名称
-        /// </summary>
-        public string QuestionEnName { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 数据来源
-        /// </summary>
-        public DataSources DataSource { get; set; } = DataSources.ManualEntry;
-
-        /// <summary>
-        /// 最大答案长度
-        /// </summary>
-        public int? MaxAnswerLength { get; set; }
-
-        /// <summary>
-        /// 文件类型
-        /// </summary>
-        public string FileType { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 问题分类
-        /// </summary>
-        public QuestionClassify? QuestionClassify { get; set; }
-        /// <summary>
-        /// 复制病灶的时候 是否复制这个问题
-        /// </summary>
-        public bool IsCopy { get; set; } = false;
-
-        /// <summary>
-        /// 系统表格问题Id
-        /// </summary>
-        public Guid? SystemTableQuestionId { get; set; }
     }
+    [NotMapped]
+    public List<string> RelevanceValueList
+    {
+        get
+        {
+            try
+            {
+                return this.RelevanceValue.Split(',').ToList();
+            }
+            catch (Exception)
+            {
+
+                return new List<string>();
+            }
+        }
+
+    }
+    [NotMapped]
+    public List<CalculateInfo> CalculateQuestionList
+    {
+        get
+        {
+            try
+            {
+                var result = JsonConvert.DeserializeObject<List<CalculateInfo>>(this.CalculateQuestions);
+                return result == null ? new List<CalculateInfo>() : result;
+            }
+            catch (Exception)
+            {
+
+                return new List<CalculateInfo>();
+            }
+
+        }
+    }
+    #endregion
+
+    public Guid TrialId { get; set; }
+
+    [Comment("项目问题的Id ReadingQuestionTrial的id")]
+    public Guid ReadingQuestionId { get; set; }
+    public string Type { get; set; } = string.Empty;
+    public Guid? ParentId { get; set; }
+
+    public string ParentTriggerValue { get; set; } = string.Empty;
+    public string QuestionName { get; set; } = string.Empty;
+    public IsRequired IsRequired { get; set; }
+
+    public int ShowOrder { get; set; }
+
+    public string TypeValue { get; set; } = string.Empty;
+    public bool IsEnable { get; set; }
+
+    public string Remark { get; set; } = string.Empty;
+    public Guid? RelevanceId { get; set; }
+
+    public string RelevanceValue { get; set; } = string.Empty;
+
+    public int ShowQuestion { get; set; }
+    public int? MaxRowCount { get; set; }
+
+    public string DataTableName { get; set; } = string.Empty;
+
+    public string DataTableColumn { get; set; } = string.Empty;
+
+    public TableQuestionType? TableQuestionType { get; set; }
+
+    public Guid? DependParentId { get; set; }
+
+    public IsDepend IsDepend { get; set; }
+    public Guid TrialCriterionId { get; set; }
+
+    [Comment("问题标识")]
+    public QuestionMark? QuestionMark { get; set; }
+    [Comment("字典code")]
+    public string DictionaryCode { get; set; } = string.Empty;
+
+    [Comment("数值类型")]
+    public ValueOfType? ValueType { get; set; }
+
+    [Comment("单位")]
+    public ValueUnit? Unit { get; set; }
+
+    [Comment("自定义单位")]
+    public string CustomUnit { get; set; } = string.Empty;
+
+    [Comment("自定义计算标记")]
+    public CustomCalculateMark? CustomCalculateMark { get; set; }
+
+    [Comment("限制编辑")]
+    public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
+
+    [Comment("自定义计算标记")]
+    public string CalculateQuestions { get; set; } = "[]";
+
+    [Comment("问题英文名称")]
+    public string QuestionEnName { get; set; } = string.Empty;
+
+    [Comment("数据来源")]
+    public DataSources DataSource { get; set; } = DataSources.ManualEntry;
+
+    [Comment("最大答案长度")]
+    public int? MaxAnswerLength { get; set; }
+
+    [Comment("文件类型")]
+    public string FileType { get; set; } = string.Empty;
+
+    [Comment("问题分类")]
+    public QuestionClassify? QuestionClassify { get; set; }
+    [Comment("复制病灶的时候 是否复制这个问题")]
+    public bool IsCopy { get; set; } = false;
+
+    [Comment("系统表格问题Id")]
+    public Guid? SystemTableQuestionId { get; set; }
 }

IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTrialCriterionDictionary.cs

@@ -1,31 +1,27 @@
 using IRaCIS.Core.Domain.Share;
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+
+[Table("ReadingTrialCriterionDictionary")]
+public class ReadingTrialCriterionDictionary : BaseAddAuditEntity
 {
-    ///<summary>
-    ///ReadingTrialCriterionDictionary
-    ///</summary>
-    [Table("ReadingTrialCriterionDictionary")]
-    public class ReadingTrialCriterionDictionary : BaseAddAuditEntity
-    {
 
-        #region 导航属性
-        [JsonIgnore]
-        [ForeignKey("DictionaryId")]
-        public Dictionary Dictionary { get; set; }
+    #region 导航属性
+    [JsonIgnore]
+    [ForeignKey("DictionaryId")]
+    public Dictionary Dictionary { get; set; }
 
-        [ForeignKey("CriterionId")]
-        [JsonIgnore]
-        public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
-        #endregion
-        public Guid CriterionId { get; set; }
+    [ForeignKey("CriterionId")]
+    [JsonIgnore]
+    public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
+    #endregion
+    public Guid CriterionId { get; set; }
 
-        public Guid DictionaryId { get; set; }
-        public string ParentCode { get; set; } = string.Empty;
+    public Guid DictionaryId { get; set; }
+    public string ParentCode { get; set; } = string.Empty;
 
-        public bool IsBaseLineUse { get; set; }
+    public bool IsBaseLineUse { get; set; }
 
-        public bool IsFollowVisitUse { get; set; }
+    public bool IsFollowVisitUse { get; set; }
 
-        public CrterionDictionaryGroup CrterionDictionaryGroup { get; set; }
-    }
+    public CrterionDictionaryGroup CrterionDictionaryGroup { get; set; }
 }