标准，标准问题稽查记录

IRaCIS.Core.Domain/Allocation/SubjectUser.cs

@@ -17,7 +17,7 @@ namespace IRaCIS.Core.Domain.Models
 	 [Table("SubjectUser")]	
 	 public class SubjectUser : Entity, IAuditUpdate, IAuditAdd
 	 {
-	   
+		[JsonIgnore]
 		public Trial Trial { get; set; }
 		public Guid TrialId { get; set; }
 
@@ -59,6 +59,7 @@ namespace IRaCIS.Core.Domain.Models
 
 		public Guid DoctorUserId { get; set; }
 
+		[JsonIgnore]
 		public User DoctorUser { get; set; }
 
 		public Arm ArmEnum { get; set; }
@@ -68,11 +69,13 @@ namespace IRaCIS.Core.Domain.Models
 		//该属性有值 说明该医生被替换了 分配的时候 要过滤掉
 		public Guid? OrignalSubjectUserId { get; set; }
 
-        //Parent
+		[JsonIgnore]
-        [ForeignKey("OrignalSubjectUserId")]
+		//Parent
+		[ForeignKey("OrignalSubjectUserId")]
 		public SubjectUser OrignalSubjectUser { get; set; }
 
-		//ChildList
+        //ChildList
+        [JsonIgnore]
 		public List<SubjectUser> EarlierSubjectUserList { get; set; }
 
         //public List<VisitTask> SubjectArmVisitTaskList { get; set; }

IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionSystem.cs

@@ -57,6 +57,7 @@ namespace IRaCIS.Core.Domain.Models
         [JsonIgnore]
 		public List<ReadingQuestionSystem> ReadingQuestionSystemList { get; set; } = new List<ReadingQuestionSystem>();
 
+		[JsonIgnore]
 		[ForeignKey("CriterionId")]
 		public Dictionary Dictionary { get; set; }
 

IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionTrial.cs

@@ -104,8 +104,11 @@ namespace IRaCIS.Core.Domain.Models
 		/// 项目
 		/// </summary>
 		[ForeignKey("TrialId")]
+        [JsonIgnore]
 		public Trial Trial { get; set; }
 
+		[JsonIgnore]
+
 		public List<ReadingQuestionTrial> ReadingQuestionTrialList = new List<ReadingQuestionTrial>();
 	}
 

IRaCIS.Core.Domain/Reading/ReadingTableQuestionTrial.cs

@@ -136,7 +136,7 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public QuestionMark? QuestionMark { get; set; }
 
-
+        [JsonIgnore]
 		[ForeignKey("DependParentId")]
 		public ReadingTableQuestionTrial DependParentQuestion { get; set; }
 

IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs

@@ -143,6 +143,106 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
             #region 已修改
 
+            #region 阅片单元配置
+
+            //系统阅片标准
+            foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(ReadingQuestionCriterionSystem)))
+            {
+                var type = GetEntityAuditOpt(item);
+
+                var entity = item.Entity as ReadingQuestionCriterionSystem;
+
+
+                await InsertInspection<ReadingQuestionCriterionSystem>(entity, type, x => new InspectionConvertDTO()
+                {
+                    IsDistinctionInterface = false
+
+                });
+            }
+            //项目阅片标准
+            foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(ReadingQuestionCriterionTrial)))
+            {
+                var type = GetEntityAuditOpt(item);
+
+                var entity = item.Entity as ReadingQuestionCriterionTrial;
+
+
+                await InsertInspection<ReadingQuestionCriterionTrial>(entity, type, x => new InspectionConvertDTO()
+                {
+                    IsDistinctionInterface = false,
+
+                    ObjectRelationParentId=x.TrialId
+
+                });
+            }
+
+            //系统标准问题
+            foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(ReadingQuestionSystem)))
+            {
+                var type = GetEntityAuditOpt(item);
+
+                var entity = item.Entity as ReadingQuestionSystem;
+
+
+                await InsertInspection<ReadingQuestionSystem>(entity, type, x => new InspectionConvertDTO()
+                {
+                    IsDistinctionInterface = false
+
+                });
+            }
+            //项目标准问题
+            foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(ReadingQuestionTrial)))
+            {
+                var type = GetEntityAuditOpt(item);
+
+                var entity = item.Entity as ReadingQuestionTrial;
+
+
+                await InsertInspection<ReadingQuestionTrial>(entity, type, x => new InspectionConvertDTO()
+                {
+                    IsDistinctionInterface = false,
+
+                    ObjectRelationParentId = x.TrialId
+
+                });
+            }
+
+            //系统标准表格问题
+            foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(ReadingTableQuestionSystem)))
+            {
+
+                var type = GetEntityAuditOpt(item);
+
+                var entity = item.Entity as ReadingTableQuestionSystem;
+
+
+                await InsertInspection<ReadingTableQuestionSystem>(entity, type, x => new InspectionConvertDTO()
+                {
+                    IsDistinctionInterface = false
+
+                });
+            }
+            //项目标准表格问题
+            foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(ReadingTableQuestionTrial)))
+            {
+                var type = GetEntityAuditOpt(item);
+
+                var entity = item.Entity as ReadingTableQuestionTrial;
+
+
+                await InsertInspection<ReadingTableQuestionTrial>(entity, type, x => new InspectionConvertDTO()
+                {
+                    IsDistinctionInterface = false,
+
+                    ObjectRelationParentId = x.TrialId
+
+                });
+            }
+
+
+            #endregion
+
+
             // 系统文件签署  父层级未记录稽查（系统文档初始数据）
             foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(SystemDocConfirmedUser)))
             {
@@ -394,7 +494,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                 var obj = new object() { };
 
                 //裁判任务
-                if (entity.JudgeResultTaskId != null && (_userInfo.RequestUrl == "ReadingImageTask/saveJudgeVisitTaskResult"|| _userInfo.RequestUrl == "ReadingImageTask/saveJudgeVisitTaskResult"))
+                if (entity.JudgeResultTaskId != null && (_userInfo.RequestUrl == "ReadingImageTask/saveJudgeVisitTaskResult" || _userInfo.RequestUrl == "ReadingImageTask/saveJudgeVisitTaskResult"))
                 {
                     var list = await _dbContext.VisitTask.Where(t => t.TaskState == TaskState.Effect && t.SubjectId == entity.SubjectId && t.VisitTaskNum == entity.VisitTaskNum).Select(t => new { t.Id, t.DoctorUser.FullName, t.ArmEnum }).OrderBy(t => t.ArmEnum).ToListAsync();
 
@@ -1453,9 +1553,6 @@ namespace IRaCIS.Core.Infra.EFCore.Common
             }
 
 
-
-
-
             //一致性分析规则
 
             foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(TaskConsistentRule)))