整理实体

IRaCIS.Core.Domain/Allocation/TaskConsistentRule.cs

@@ -14,48 +14,27 @@ namespace IRaCIS.Core.Domain.Models
 	///TaskConsistentRule
 	///</summary>
 	[Table("TaskConsistentRule")]
-	public class TaskConsistentRule : Entity, IAuditUpdate, IAuditAdd
-	{
-
-
-		public Trial Trial { get; set; }
-
-		public Guid CreateUserId { get; set; }	
-
-		public DateTime CreateTime { get; set; }
-	
-		public DateTime UpdateTime { get; set; }
-	
-		public Guid UpdateUserId { get; set; }
-	
+	public class TaskConsistentRule : BaseFullAuditEntity
+    {
+		
 		public Guid TrialId { get; set; }
 	
-	
 		public int PlanSubjectCount { get; set; }
 	
 		public int PlanVisitCount { get; set; }
 	
 		public int IntervalWeeks { get; set; }
 
-
 		public bool IsHaveReadingPeriod { get; set; }
-	
-	
-		public bool IsGenerateGlobalTask { get; set; }
-		
+
+		public bool IsGenerateGlobalTask { get; set; }	
 
 		public int BlindSubjectNumberOfPlaces { get; set; } 
 
 		public string BlindTrialSiteCode { get; set; } = string.Empty;
 
-
 		public bool IsSelfAnalysis { get; set; }
 
-		//public Guid? CompareDoctorUserId { get; set; }
-		//public User AnalysisDoctorUser { get; set; }
-		//public Guid AnalysisDoctorUserId { get; set; }
-		//public List<VisitTask> DoctorVisitTaskList { get; set; }
-
 		public bool IsEnable { get; set; }
 
 		public string Note { get; set; }
@@ -63,13 +42,17 @@ namespace IRaCIS.Core.Domain.Models
 
 		public Guid TrialReadingCriterionId { get; set; }
 
+
+
+
+		#region 导航属性
 		[JsonIgnore]
-		[ForeignKey("TrialReadingCriterionId")]
-		public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
+        public Trial Trial { get; set; }
 
-
-		//[Projectable]
-		//public List<VisitTask> DoctorConsistentTaskList => DoctorVisitTaskList.Where(t => t.IsAnalysisCreate && t.TaskConsistentRuleId ==  Id).ToList();
-	}
+        [JsonIgnore]
+        [ForeignKey("TrialReadingCriterionId")]
+        public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
+        #endregion
+    }
 
 }