导航属性优化整理

IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadModule.cs

@@ -12,19 +12,48 @@ namespace IRaCIS.Core.Domain.Models
 	///读片模块
 	///</summary>
 	[Table("ReadModule")]
-	public class ReadModule : BaseFullAuditDeleteEntity
-	{
+	public class ReadModule : BaseFullDeleteAuditEntity
+    {
+        #region 导航属性
 
         [JsonIgnore]
-		public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
+        /// <summary>
+        /// 受试者
+        /// </summary>
+        [ForeignKey("SubjectId")]
+
+        public Subject Subject { get; set; }
+
+        [JsonIgnore]
+        /// <summary>
+        /// 阅片期配置
+        /// </summary>
+        [ForeignKey("ReadingPeriodSetId")]
+        public ReadingPeriodSet ReadingPeriodSet { get; set; }
+
+        [JsonIgnore]
+        /// <summary>
+        /// 访视
+        /// </summary>
+        [ForeignKey("SubjectVisitId")]
+        public SubjectVisit SubjectVisit { get; set; }
+
+        [JsonIgnore]
+        [ForeignKey("TrialId")]
+        public Trial Trial { get; set; }
 
 
-		[JsonIgnore]
-		public List<VisitTask> ModuleTaskList { get; set; }
+        [JsonIgnore]
+        public List<ReadModuleCriterionFrom> ReadModuleCriterionFromList { get; set; } = new List<ReadModuleCriterionFrom>();
+
+
+        [JsonIgnore]
+        public List<VisitTask> ModuleTaskList { get; set; }
+        [JsonIgnore]
+        public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
+        #endregion
+
 
-		/// <summary>
-		/// 受试者ID
-		/// </summary>
 		public Guid SubjectId { get; set; }
 
 		public Guid TrialReadingCriterionId { get; set; }
@@ -44,27 +73,16 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public bool? IsUrgent { get; set; }
 
-		/// <summary>
-		/// 访视ID
-		/// </summary>
 		public Guid SubjectVisitId { get; set; }
 
 
-
 		/// <summary>
 		/// 阅片计划ID
 		/// </summary>
 		public Guid? ReadingPeriodSetId { get; set; }
 
-
-
-		/// <summary>
-		/// 项目ID
-		/// </summary>
 		public Guid TrialId { get; set; }
 
-	
-
 
 		public bool IsCRCConfirm { get; set; } = false;
 
@@ -88,55 +106,11 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
         public bool? IsClinicalDataBlind { get; set; }
 
-        ///// <summary>
-        ///// 
-        ///// </summary>
-        //public decimal VisitNum { get; set; }
-
-        //      [JsonIgnore]
-        ///// <summary>
-        ///// 对应
-        ///// </summary>
-        //[ForeignKey("ReadModuleId")]
-        //public ReadModule ReadModuleModel { get; set; }
-
-        [JsonIgnore]
-		/// <summary>
-		/// 受试者
-		/// </summary>
-		[ForeignKey("SubjectId")]
-
-		public Subject Subject { get; set; }
-
-		[JsonIgnore]
-		/// <summary>
-		/// 阅片期配置
-		/// </summary>
-		[ForeignKey("ReadingPeriodSetId")] 
-		public ReadingPeriodSet ReadingPeriodSet { get; set; }
-
-		[JsonIgnore]
-		/// <summary>
-		/// 访视
-		/// </summary>
-		[ForeignKey("SubjectVisitId")]
-		public SubjectVisit SubjectVisit { get; set; }
-
-        [JsonIgnore]
-        [ForeignKey("TrialId")]
-        public Trial Trial { get; set; }
-
-
-        [JsonIgnore]
-        public List<ReadModuleCriterionFrom> ReadModuleCriterionFromList { get; set; } = new List<ReadModuleCriterionFrom>();
-
         /// <summary>
         /// 阅片配置的类型
         /// </summary>
         public ReadingSetType ReadingSetType { get; set; }
 
-
-
 		public ReadingStatusEnum ReadingStatus { get; set; } = ReadingStatusEnum.TaskAllocate;
 	}