导航属性优化整理

IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingGlobalTaskInfo.cs

@@ -9,49 +9,45 @@ namespace IRaCIS.Core.Domain.Models
 	 /// 阅片全局任务信息
 	 ///</summary>
 	 [Table("ReadingGlobalTaskInfo")]	
-	 public class ReadingGlobalTaskInfo : BaseAuditAddEntity
-	 {
-	 
-		/// <summary>
+	 public class ReadingGlobalTaskInfo : BaseAddAuditEntity
+    {
+        #region 导航属性
+        [JsonIgnore]
+        [ForeignKey("TaskId")]
+        public VisitTask VisitTask { get; set; }
+
+        [JsonIgnore]
+        [ForeignKey("GlobalTaskId")]
+        public VisitTask GlobalVisitTask { get; set; }
+
+
+        [JsonIgnore]
+        [ForeignKey("QuestionId")]
+        public ReadingQuestionTrial TrialReadingQuestion { get; set; }
+        #endregion
+
+        /// <summary>
         /// 全局任务Id
         /// </summary>
-		public Guid GlobalTaskId { get; set; }
+        public Guid GlobalTaskId { get; set; }
 	
 		/// <summary>
         /// 原任务ID
         /// </summary>
 		
 		public Guid TaskId { get; set; }
-
-        [JsonIgnore]
-		[ForeignKey("TaskId")]
-		public VisitTask VisitTask { get; set; }
-
-		[JsonIgnore]
-        [ForeignKey("GlobalTaskId")]
-		public VisitTask GlobalVisitTask { get; set; }
-
-
+    
 		/// <summary>
 		/// 问题ID
 		/// </summary>
 		public Guid? QuestionId { get; set; }
 
-		[JsonIgnore]
-        [ForeignKey("QuestionId")]
-		public ReadingQuestionTrial TrialReadingQuestion { get; set; }
-
-
 		/// <summary>
 		/// 问题答案
 		/// </summary>
 
 		public string Answer { get; set; }
-	
 
-		/// <summary>
-        /// TrialId
-        /// </summary>
 	
 		public Guid TrialId { get; set; }
 
@@ -60,9 +56,6 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public GlobalAnswerType GlobalAnswerType { get; set; }
 
-		/// <summary>
-		/// SubjectId
-		/// </summary>
 		public Guid SubjectId { get; set; }
 	 
 	 }