导航属性优化整理

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

@@ -13,58 +13,37 @@ namespace IRaCIS.Core.Domain.Models
 	 /// 
 	 ///</summary>
 	 [Table("ReadingTaskQuestionMark")]	
-	 public class ReadingTaskQuestionMark : BaseAuditAddEntity
+	 public class ReadingTaskQuestionMark : BaseAddAuditEntity
 	 {
-	 
+        #region 导航属性
+        [JsonIgnore]
+        [ForeignKey("QuestionId")]
+        public ReadingQuestionTrial ReadingQuestionTrial { get; set; }
+
+        [JsonIgnore]
+        [ForeignKey("VisitTaskId")]
+        public VisitTask VisitTask { get; set; }
+        #endregion
+
+
+        public Guid VisitTaskId { get; set; }
 
-	
-		/// <summary>
-        /// 任务Id
-        /// </summary>
-		[Required]
-		public Guid VisitTaskId { get; set; }
-	
-		/// <summary>
-        /// 问题Id
-        /// </summary>
-		[Required]
 		public Guid QuestionId { get; set; }
-	
-		/// <summary>
-        /// InstanceId
-        /// </summary>
+
 		public Guid? InstanceId { get; set; }
-	
-		/// <summary>
-        /// SeriesId
-        /// </summary>
+
 		public Guid? SeriesId { get; set; }
 	
-		/// <summary>
-        /// StudyId
-        /// </summary>
 
 		public Guid? StudyId { get; set; }
 	
-		/// <summary>
-        /// MarkTool
-        /// </summary>
+
 		public string MarkTool { get; set; } = string.Empty;
 
-        /// <summary>
-        /// PicturePath
-        /// </summary>
         public string PicturePath { get; set; } = string.Empty;
 
-        /// <summary>
-        /// NumberOfFrames
-        /// </summary>
         public int? NumberOfFrames { get; set; } 
 
-        /// <summary>
-        /// MeasureData
-        /// </summary>
-        [Required]
 		public string MeasureData { get; set; } = string.Empty;
 
 
@@ -75,19 +54,10 @@ namespace IRaCIS.Core.Domain.Models
 
         public string? OrderMarkName { get; set; } = string.Empty;
 
-        /// <summary>
-        /// InstanceId
-        /// </summary>
         public Guid? OtherInstanceId { get; set; }
 
-        /// <summary>
-        /// SeriesId
-        /// </summary>
         public Guid? OtherSeriesId { get; set; }
 
-        /// <summary>
-        /// StudyId
-        /// </summary>
         public Guid? OtherStudyId { get; set; }
 
         public string? OtherMarkTool { get; set; }
@@ -97,13 +67,7 @@ namespace IRaCIS.Core.Domain.Models
         public int? OtherNumberOfFrames { get; set; }
         public string?  OtherMeasureData { get; set; } = string.Empty;
 
-		[JsonIgnore]
-		[ForeignKey("QuestionId")]
-		public ReadingQuestionTrial ReadingQuestionTrial { get; set; }
 
-		[JsonIgnore]
-		[ForeignKey("VisitTaskId")]
-		public VisitTask VisitTask { get; set; }
 	}