导航属性优化整理

IRaCIS.Core.Domain/Visit/SubjectVisit.cs

@@ -7,31 +7,95 @@ using IRaCIS.Core.Domain.Share;
 namespace IRaCIS.Core.Domain.Models
 {
     [Table("SubjectVisit")]
-    public class SubjectVisit : BaseFullAuditDeleteEntity
+    public class SubjectVisit : BaseFullDeleteAuditEntity
     {
 
 
-
-
-
-
-        public Guid TrialSiteId { get; set; }
+        #region 导航属性
 
         [JsonIgnore]
         public TrialSite TrialSite { get; set; }
 
+        [JsonIgnore]
+        public VisitStage VisitStage { get; set; }
+        [JsonIgnore]
+        [ForeignKey("OutPlanPreviousVisitId")]
+        public SubjectVisit OutPlanPreviousVisit { get; set; }
 
 
 
+        [JsonIgnore]
+        [ForeignKey("ClinicalDataSignUserId")]
+        public User ClinicalDataSignUser { get; set; }
+
+        [ForeignKey("ForwardUserId")]
+        public User ForwardUser { get; set; }
+
+
+        [JsonIgnore]
+        [ForeignKey("PreliminaryAuditUserId")]
+        public User PreliminaryAuditUser { get; set; }
+
+        [JsonIgnore]
+        [ForeignKey("ReviewAuditUserId")]
+        public User ReviewAuditUser { get; set; }
+
+        [JsonIgnore]
+        [ForeignKey("CurrentActionUserId")]
+        public User CurrentActionUser { get; set; }
+        [JsonIgnore]
+        [ForeignKey("SubmitUserId")]
+        public User SubmitUser { get; set; }
+
+        //导航属性
+        [JsonIgnore]
+        [ForeignKey("TrialId")]
+        public Trial Trial { get; set; }
+
+
+
+        [JsonIgnore]
+        [ForeignKey("SubjectId")]
+        public Subject Subject { get; set; }
+
+
+        [JsonIgnore]
+        public List<PreviousHistory> PreviousHistoryList { get; set; }
+        [JsonIgnore]
+        public List<PreviousOther> PreviousOtherList { get; set; }
+        [JsonIgnore]
+        public List<PreviousSurgery> PreviousSurgeryList { get; set; }
+        [JsonIgnore]
+        public List<PreviousPDF> PreviousPDFList { get; set; }
+        [JsonIgnore]
+        public List<ReadingClinicalData> ReadingClinicalDataList { get; set; }
+        [JsonIgnore]
+        public List<CheckChallengeDialog> CheckChallengeDialogList { get; set; } = new List<CheckChallengeDialog>();
+        [JsonIgnore]
+        public List<DicomStudy> StudyList { get; set; } = new List<DicomStudy>();
+        [JsonIgnore]
+        public List<NoneDicomStudy> NoneDicomStudyList { get; set; } = new List<NoneDicomStudy>();
+
+        [JsonIgnore]
+        public List<QCChallenge> QCChallengeList { get; set; } = new List<QCChallenge>();
+        [JsonIgnore]
+        public List<QCChallengeDialog> QCChallengeDialogList { get; set; } = new List<QCChallengeDialog>();
+        [JsonIgnore]
+        public List<VisitTask> VisitTaskList { get; set; } = new List<VisitTask>();
+
+        [JsonIgnore]
+        public List<SubjectCriteriaEvaluationVisitFilter> SubjectCriteriaEvaluationVisitFilterList { get; set; }
+        #endregion
+
+
+
+        public Guid TrialSiteId { get; set; }
 
         //一个访视  对应有对应Site的  TrialSiteCode   
 
         public Guid TrialId { get; set; }
         public Guid SubjectId { get; set; }
 
-
-        [JsonIgnore]
-        public VisitStage VisitStage { get; set; }
         public Guid? VisitStageId { get; set; }
         public int VisitDay { get; set; }
         public string VisitName { get; set; } = string.Empty;
@@ -40,11 +104,8 @@ namespace IRaCIS.Core.Domain.Models
 
         [Column(TypeName = "decimal(18,1)")]
         public decimal VisitNum { get; set; }
-        //public string AnonymousVisitName { get; set; } = string.Empty;
         public string BlindName { get; set; } = string.Empty;
 
-
-
         public string SVUPDES { get; set; } = string.Empty;
         public DateTime? SVSTDTC { get; set; }
         public DateTime? SVENDTC { get; set; }
@@ -65,7 +126,6 @@ namespace IRaCIS.Core.Domain.Models
         public Guid? Auditor { get; set; }
         
 
-
         //核查状态
         public CheckStateEnum CheckState { get; set; }
 
@@ -127,7 +187,6 @@ namespace IRaCIS.Core.Domain.Models
         public CheckChanllengeTypeEnum CheckChallengeState { get; set; }
         public PDStateEnum PDState { get; set; } = PDStateEnum.None;
 
-        //public bool IsOutEnromentVisit { get; set; } = false;
 
         public DateTime? CheckPassedTime { get; set; }
 
@@ -135,34 +194,7 @@ namespace IRaCIS.Core.Domain.Models
         /// 上一访视
         /// </summary>
         public Guid? OutPlanPreviousVisitId { get; set; }
-
-        [JsonIgnore]
-        [ForeignKey("OutPlanPreviousVisitId")]
-        public SubjectVisit OutPlanPreviousVisit { get; set; }
-
-        //public Guid? ClinicalDataSignUserId { get; set; }
-
-        //public DateTime? ClinicalDataSignTime { get; set; }
-
-        [JsonIgnore]
-        [ForeignKey("ClinicalDataSignUserId")]
-        public User ClinicalDataSignUser { get; set; }
-
-        [ForeignKey("ForwardUserId")]
-        public User ForwardUser { get; set; }
-
-
-        [JsonIgnore]
-        [ForeignKey("PreliminaryAuditUserId")]
-        public User PreliminaryAuditUser { get; set; }
-
-        [JsonIgnore]
-        [ForeignKey("ReviewAuditUserId")]
-        public User ReviewAuditUser { get; set; }
-
-        [JsonIgnore]
-        [ForeignKey("CurrentActionUserId")]
-        public User CurrentActionUser { get; set; }
+   
 
         public RequestBackStateEnum RequestBackState { get; set; }
 
@@ -187,54 +219,9 @@ namespace IRaCIS.Core.Domain.Models
         /// </summary>
         public string CloseTheReason { get; set; }
 
-
-     
-
-
         public Guid? SubmitUserId { get; set; }
 
-        [JsonIgnore]
-        [ForeignKey("SubmitUserId")]
-        public User SubmitUser { get; set; }
-
-        //导航属性
-        [JsonIgnore]
-        [ForeignKey("TrialId")]
-        public Trial Trial { get; set; }
-
-
-
-        [JsonIgnore]
-        [ForeignKey("SubjectId")]
-        public Subject Subject { get; set; }
-
-
-        [JsonIgnore]
-        public List<PreviousHistory> PreviousHistoryList { get; set; }
-        [JsonIgnore]
-        public List<PreviousOther> PreviousOtherList { get; set; }
-        [JsonIgnore]
-        public List<PreviousSurgery> PreviousSurgeryList { get; set; }
-        [JsonIgnore]
-        public List<PreviousPDF> PreviousPDFList { get; set; }
-        [JsonIgnore]
-        public List<ReadingClinicalData> ReadingClinicalDataList { get; set; }
-        [JsonIgnore]
-        public List<CheckChallengeDialog> CheckChallengeDialogList { get; set; } = new List<CheckChallengeDialog>();
-        [JsonIgnore]
-        public List<DicomStudy> StudyList { get; set; } = new List<DicomStudy>();
-        [JsonIgnore]
-        public List<NoneDicomStudy> NoneDicomStudyList { get; set; } = new List<NoneDicomStudy>();
-
-        [JsonIgnore]
-        public List<QCChallenge> QCChallengeList { get; set; } = new List<QCChallenge>();
-        [JsonIgnore]
-        public List<QCChallengeDialog> QCChallengeDialogList { get; set; } = new List<QCChallengeDialog>();
-        [JsonIgnore]
-        public List<VisitTask> VisitTaskList { get; set; } = new List<VisitTask>();
-
-        [JsonIgnore]
-        public List<SubjectCriteriaEvaluationVisitFilter> SubjectCriteriaEvaluationVisitFilterList { get; set; }
+       
         public ReadingStatusEnum ReadingStatus { get; set; }
 
         public string VisitImageZipPath { get; set; } = string.Empty;