From 2142ee6b82b6fdbead50191952c5465f39fbd62f Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Thu, 1 Dec 2022 13:53:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Reading/ReadingCriterion/ReadingQuestionService.cs      | 2 +-
 .../ReadingCriterionQuestion/ReadingQuestionTrial.cs        | 6 +++---
 .../ReadingCriterionQuestion/ReadingTableQuestionTrial.cs   | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs
index 5262997e8..5b9a214bf 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs
@@ -518,7 +518,7 @@ namespace IRaCIS.Application.Services
         {
 
             var readingTableQuestionSystemQueryable = _readingTableQuestionTrialRepository
-            .WhereIf(inDto.TableQuestionType != null, x => x.TableQuestionType == inDto.TableQuestionType!)
+            .WhereIf(inDto.TableQuestionType != null, x => x.TableQuestionType == inDto.TableQuestionType)
             .Where(x => x.ReadingQuestionId == inDto.ReadingQuestionId).ProjectTo<ReadingTableQuestionTrialView>(_mapper.ConfigurationProvider);
 
             var result = await readingTableQuestionSystemQueryable.OrderBy(x => x.ShowOrder).ToListAsync();
diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs
index f6a4fcaab..a125c3e88 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs
@@ -235,7 +235,7 @@ namespace IRaCIS.Core.Domain.Models
 		public List<ReadingTableQuestionTrial> ReadingTableQuestionTrialList { get; set; }
 
         [JsonIgnore]
-		[NotMapped]
+	
 		public List<string> ParentTriggerValueList
         {
             get
@@ -254,7 +254,7 @@ namespace IRaCIS.Core.Domain.Models
         }
 
 		[JsonIgnore]
-		[NotMapped]
+	
 		public List<string> RelevanceValueList
 		{
 			get
@@ -273,7 +273,7 @@ namespace IRaCIS.Core.Domain.Models
 		}
 
 		[JsonIgnore]
-		[NotMapped]
+	
 		public List<CalculateInfo> CalculateQuestionList
 		{
 			get
diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs
index 7a686c40b..975c78f61 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs
@@ -184,7 +184,7 @@ namespace IRaCIS.Core.Domain.Models
 		public ReadingQuestionTrial ReadingQuestionTrial { get; set; }
 
 		[JsonIgnore]
-		[NotMapped]
+		
 		public List<string> ParentTriggerValueList
 		{
 			get
@@ -203,7 +203,7 @@ namespace IRaCIS.Core.Domain.Models
 		}
 
 		[JsonIgnore]
-		[NotMapped]
+		
 		public List<string> RelevanceValueList
 		{
 			get
@@ -222,7 +222,7 @@ namespace IRaCIS.Core.Domain.Models
 		}
 
 		[JsonIgnore]
-		[NotMapped]
+	
 		public List<CalculateInfo> CalculateQuestionList
 		{
 			get