Merge branch 'Test_IRC_Net8' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test_IRC_Net8

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

@@ -318,6 +318,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
     public class ReadingTableQuestionTrialAddOrEdit
     {
 
+        public Guid? ClassifyTableQuestionId { get; set; }
+
+        public string ClassifyAlgorithms { get; set; } = string.Empty;
+
+
         /// <summary>
         /// 自定义计算标记
         /// </summary>
@@ -462,6 +467,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public ValueOfType? ValueType { get; set; }
 
+        public bool IsCopy { get; set; } = false;
+
+        public Guid? ClassifyTableQuestionId { get; set; }
+
+        public string ClassifyAlgorithms { get; set; } = string.Empty;
+
         /// <summary>
         /// 问题分类
         /// </summary>
@@ -834,6 +845,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public Guid Id { get; set; }
 
+        /// <summary>
+        /// 导出标识
+        /// </summary>
+        public ExportIdentification? ExportIdentification { get; set; }
+
+        /// <summary>
+        /// 导出结果
+        /// </summary>
+        public ExportResult? ExportResult { get; set; }
+
         /// <summary>
         /// 分组
         /// </summary>
@@ -1098,6 +1119,14 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
     public class ReadingQuestionSystemView
     {
+
+
+        [Comment("导出标识")]
+        public ExportIdentification? ExportIdentification { get; set; }
+
+        [Comment("导出结果")]
+        public ExportResult? ExportResult { get; set; }
+
         /// <summary>
         /// 数值类型
         /// </summary>
@@ -1636,6 +1665,19 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
     }
     public class AddOrUpdateReadingQuestionSystemInDto
     {
+
+
+
+        /// <summary>
+        /// 导出标识
+        /// </summary>
+        public ExportIdentification? ExportIdentification { get; set; }
+
+        /// <summary>
+        /// 导出结果
+        /// </summary>
+        public ExportResult? ExportResult { get; set; }
+
         /// <summary>
         /// 数值类型
         /// </summary>
@@ -1854,6 +1896,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public Guid? Id { get; set; }
 
+        /// <summary>
+        /// 导出标识
+        /// </summary>
+        public ExportIdentification? ExportIdentification { get; set; }
+
+        /// <summary>
+        /// 导出结果
+        /// </summary>
+        public ExportResult? ExportResult { get; set; }
+
         public bool IsAdditional { get; set; }
 
         /// <summary>

IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs

@@ -667,6 +667,9 @@ namespace IRaCIS.Core.Application.Service.RC
             // 标准的默认值 标准默认值
             foreach (var criterion in needAddCriterionList)
             {
+
+
+
                 switch (criterion.CriterionType)
                 {
                     case CriterionType.IVUS: