From 07003b13275ebbb4e8448edbf1db6c009be96e14 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 26 Aug 2022 15:56:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BB=E5=AD=A6=E5=AE=A1=E6=A0=B8=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Reading/ReadingMedicineSystemQuestion.cs  |  2 ++
 .../Reading/ReadingMedicineTrialQuestion.cs   |  1 +
 .../Reading/ReadingQuestionSystem.cs          |  4 ++-
 .../Reading/ReadingQuestionTrial.cs           |  7 ++---
 .../Common/AuditingData.cs                    | 27 +++++++++++++++++++
 5 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/IRaCIS.Core.Domain/Reading/ReadingMedicineSystemQuestion.cs b/IRaCIS.Core.Domain/Reading/ReadingMedicineSystemQuestion.cs
index 3f6c629ff..49b4348d9 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingMedicineSystemQuestion.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingMedicineSystemQuestion.cs
@@ -81,6 +81,8 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public ReadingCategory ReadingCategory { get; set; }
 
+		[JsonIgnore]
+
 		[ForeignKey("ParentId")]
 		public ReadingMedicineSystemQuestion ParentQuestion { get; set; }
 
diff --git a/IRaCIS.Core.Domain/Reading/ReadingMedicineTrialQuestion.cs b/IRaCIS.Core.Domain/Reading/ReadingMedicineTrialQuestion.cs
index c43228a9a..f019bdea6 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingMedicineTrialQuestion.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingMedicineTrialQuestion.cs
@@ -91,6 +91,7 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public ReadingCategory ReadingCategory { get; set; }
 
+        [JsonIgnore]
 		[ForeignKey("ParentId")]
 		public ReadingMedicineTrialQuestion ParentQuestion { get; set; }
 
diff --git a/IRaCIS.Core.Domain/Reading/ReadingQuestionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingQuestionSystem.cs
index 7bd86fbfe..b518c011a 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingQuestionSystem.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingQuestionSystem.cs
@@ -129,14 +129,16 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public Guid CreateUserId { 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; }
 
diff --git a/IRaCIS.Core.Domain/Reading/ReadingQuestionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingQuestionTrial.cs
index 72c19597d..da374a06e 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingQuestionTrial.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingQuestionTrial.cs
@@ -167,14 +167,15 @@ namespace IRaCIS.Core.Domain.Models
 		/// 分页标准
 		/// </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; }
 
diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
index 1dbc6a600..9cf11fd2b 100644
--- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
+++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
@@ -487,6 +487,31 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                 });
             }
 
+            //系统 医学审核问题
+            foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(ReadingMedicineSystemQuestion)))
+            {
+                var entity = item.Entity as ReadingMedicineSystemQuestion;
+
+                await InsertInspection<ReadingMedicineSystemQuestion>(entity, type, x => new InspectionConvertDTO()
+                {
+                    IsDistinctionInterface = false,
+                });
+            }
+
+            //项目医学审核问题
+            foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(ReadingMedicineTrialQuestion)))
+            {
+                var entity = item.Entity as ReadingMedicineTrialQuestion;
+
+                await InsertInspection<ReadingMedicineTrialQuestion>(entity, type, x => new InspectionConvertDTO()
+                {
+                    IsDistinctionInterface = false,
+                    ObjectRelationParentId = x.TrialId
+
+                });
+            }
+
+
             //Qc 问题
             foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(QCQuestion)))
             {
@@ -823,6 +848,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                 });
             }
 
+         
+
             //项目临床数据配置
             foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(ClinicalDataTrialSet)))
             {