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

@@ -1,7 +1,5 @@
 using IRaCIS.Core.Domain.Share;
-using Newtonsoft.Json;
 using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
 
 namespace IRaCIS.Core.Application.Service.Reading.Dto
 {
@@ -852,27 +850,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public ExportIdentification? ExportIdentification { get; set; }
 
-        [Comment("导出结果")]
+        /// <summary>
-        public string ExportResultStr { get; set; } = "[]";
+        /// 导出结果
-
+        /// </summary>
-        [NotMapped]
+        public ExportResult? ExportResult { get; set; }
-        public List<ExportResult> ExportResult
-        {
-            get
-            {
-                try
-                {
-                    var result = JsonConvert.DeserializeObject<List<ExportResult>>(this.ExportResultStr);
-                    return result == null ? new List<ExportResult>() : result;
-                }
-                catch (Exception)
-                {
-
-                    return new List<ExportResult>();
-                }
-
-            }
-        }
 
         /// <summary>
         /// 分组
@@ -1143,25 +1124,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         [Comment("导出标识")]
         public ExportIdentification? ExportIdentification { get; set; }
 
-        public string ExportResultStr { get; set; } = "[]";
+        [Comment("导出结果")]
-
+        public ExportResult? ExportResult { get; set; }
-        public List<ExportResult> ExportResult
-        {
-            get
-            {
-                try
-                {
-                    var result = JsonConvert.DeserializeObject<List<ExportResult>>(this.ExportResultStr);
-                    return result == null ? new List<ExportResult>() : result;
-                }
-                catch (Exception)
-                {
-
-                    return new List<ExportResult>();
-                }
-
-            }
-        }
 
         /// <summary>
         /// 数值类型
@@ -1709,11 +1673,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public ExportIdentification? ExportIdentification { get; set; }
 
-
+        /// <summary>
-        [Comment("导出结果")]
+        /// 导出结果
-        public string ExportResultStr { get; set; } = "[]";
+        /// </summary>
-
+        public ExportResult? ExportResult { get; set; }
-        public List<ExportResult> ExportResult { get; set; } = new List<ExportResult>();
 
         /// <summary>
         /// 数值类型
@@ -1938,12 +1901,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public ExportIdentification? ExportIdentification { get; set; }
 
-        [Comment("导出结果")]
+        /// <summary>
-        public string ExportResultStr { get; set; } = "[]";
+        /// 导出结果
-
+        /// </summary>
-        public List<ExportResult> ExportResult { get; set; } = new List<ExportResult>();
+        public ExportResult? ExportResult { get; set; }
-    
-
 
         public bool IsAdditional { get; set; }
 

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

@@ -233,8 +233,6 @@ namespace IRaCIS.Core.Application.Service
         {
             indto.ParentTriggerValue = string.Join(',', indto.ParentTriggerValueList);
             indto.RelevanceValue = string.Join(',', indto.RelevanceValueList);
-
-            indto.ExportResultStr = JsonConvert.SerializeObject(indto.ExportResult);
             indto.HighlightAnswer = JsonConvert.SerializeObject(indto.HighlightAnswerList);
             if (indto.Id != null)
             {
@@ -400,7 +398,6 @@ namespace IRaCIS.Core.Application.Service
                 throw new BusinessValidationFailedException(_localizer["ReadingQuestion_IdDup"]);
             }
             indto.ParentTriggerValue = string.Join(',', indto.ParentTriggerValueList);
-            indto.ExportResultStr = JsonConvert.SerializeObject(indto.ExportResult);
             indto.RelevanceValue = string.Join(',', indto.RelevanceValueList);
             indto.HighlightAnswer = JsonConvert.SerializeObject(indto.HighlightAnswerList);
 

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

@@ -195,24 +195,5 @@ public class ReadingQuestionSystem : BaseAddAuditEntity
     public ExportIdentification? ExportIdentification { get; set; }
 
     [Comment("导出结果")]
-    public string ExportResultStr { get; set; } = "[]";
+    public ExportResult? ExportResult { get; set; }
-
-    [NotMapped]
-    public List<ExportResult> ExportResult
-    {
-        get
-        {
-            try
-            {
-                var result = JsonConvert.DeserializeObject<List<ExportResult>>(this.ExportResultStr);
-                return result == null ? new List<ExportResult>() : result;
-            }
-            catch (Exception)
-            {
-
-                return new List<ExportResult>();
-            }
-
-        }
-    }
 }

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

@@ -260,26 +260,7 @@ public class ReadingQuestionTrial : BaseAddAuditEntity
     public ExportIdentification? ExportIdentification { get; set; }
 
     [Comment("导出结果")]
-    public string ExportResultStr { get; set; } = "[]";
+    public ExportResult? ExportResult { get; set; }
-
-    [NotMapped]
-    public List<ExportResult> ExportResult
-    {
-        get
-        {
-            try
-            {
-                var result = JsonConvert.DeserializeObject<List<ExportResult>>(this.ExportResultStr);
-                return result == null ? new List<ExportResult>() : result;
-            }
-            catch (Exception)
-            {
-
-                return new List<ExportResult>();
-            }
-
-        }
-    }
 }
 public class CalculateInfo
 {