修改

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

@@ -5,6 +5,7 @@ using IRaCIS.Core.Domain.Share;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace IRaCIS.Core.Domain.Models
 {
@@ -233,11 +234,77 @@ namespace IRaCIS.Core.Domain.Models
 
 		public List<ReadingTableQuestionTrial> ReadingTableQuestionTrialList { get; set; }
 
+        [JsonIgnore]
+		[NotMapped]
+		public List<string> ParentTriggerValueList
+        {
+            get
+            {
+                try
+                {
+                    return this.ParentTriggerValue.Split(',').ToList();
+                }
+                catch (Exception)
+                {
+
+                    return new List<string>();
+                }
+            }
+
+        }
+
+		[JsonIgnore]
+		[NotMapped]
+		public List<string> RelevanceValueList
+		{
+			get
+			{
+				try
+				{
+					return this.RelevanceValue.Split(',').ToList();
+				}
+				catch (Exception)
+				{
+
+					return new List<string>();
+				}
+			}
+
+		}
+
+		[JsonIgnore]
+		[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>();
+				}
+
+			}
+		}
 
 	}
 
 
-	
+	public class CalculateInfo
+    {
+		public bool IsTable { get; set; }
+
+		public Guid? QuestionId { get; set; }
+
+		public Guid? TableQuestionId { get; set; }
+
+	}
 
 
 

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

@@ -7,6 +7,9 @@ using System;
 using IRaCIS.Core.Domain.Share;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using System.Collections.Generic;
+using System.Linq;
+
 namespace IRaCIS.Core.Domain.Models
 {
 	 ///<summary>
@@ -180,6 +183,64 @@ namespace IRaCIS.Core.Domain.Models
 		[ForeignKey("ReadingQuestionId")]
 		public ReadingQuestionTrial ReadingQuestionTrial { get; set; }
 
+		[JsonIgnore]
+		[NotMapped]
+		public List<string> ParentTriggerValueList
+		{
+			get
+			{
+				try
+				{
+					return this.ParentTriggerValue.Split(',').ToList();
+				}
+				catch (Exception)
+				{
+
+					return new List<string>();
+				}
+			}
+
+		}
+
+		[JsonIgnore]
+		[NotMapped]
+		public List<string> RelevanceValueList
+		{
+			get
+			{
+				try
+				{
+					return this.RelevanceValue.Split(',').ToList();
+				}
+				catch (Exception)
+				{
+
+					return new List<string>();
+				}
+			}
+
+		}
+
+		[JsonIgnore]
+		[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>();
+				}
+
+			}
+		}
+
 	}