整理实体

IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs

@@ -13,40 +13,70 @@ using Newtonsoft.Json;
 
 namespace IRaCIS.Core.Domain.Models
 {
+    public class OSSImageInfo
+    {
+        public string FileName { get; set; }
+
+        public string ImagePath { get; set; }
+    }
     ///<summary>
     ///TaskMedicalReview
     ///</summary>
     [Table("TaskMedicalReview")]
-    public class TaskMedicalReview : Entity, IAuditUpdate, IAuditAdd
+    public class TaskMedicalReview : BaseFullAuditEntity
     {
+        #region 导航属性
+
         [JsonIgnore]
         public User LatestReplyUser { get; set; }
 
+        [JsonIgnore]
+        public User MedicalManagerUser { get; set; }
+
+        [JsonIgnore]
+        [ForeignKey("VisitTaskId")]
+        public VisitTask VisitTask { get; set; }
+
+        [JsonIgnore]
+        public List<ReadingMedicalReviewDialog> ReadingMedicalReviewDialogList { get; set; }
+
+        [JsonIgnore]
+        public Trial Trial { get; set; }
+
+
+
+
+        /// <summary>
+        /// 文件
+        /// </summary>
+        [NotMapped]
+        public List<OSSImageInfo> FileList
+        {
+            get
+            {
+
+
+                try
+                {
+                    var result = JsonConvert.DeserializeObject<List<OSSImageInfo>>(this.ImagePath);
+                    return result == null ? new List<OSSImageInfo>() : result;
+                }
+                catch (Exception)
+                {
+
+                    return new List<OSSImageInfo>();
+                }
+
+            }
+        }
+
+        [NotMapped]
+        public List<Guid> PDRelationTaskIdList => PDRelationTaskIdListStr.Split('|', StringSplitOptions.RemoveEmptyEntries).Select(t => Guid.Parse(t)).ToList();
+
+        #endregion
+
         public Guid? LatestReplyUserId { get; set; }
 
-        /// <summary>
-        /// CreateUserId
-        /// </summary>
-        [Required]
-        public Guid CreateUserId { get; set; }
-
-        /// <summary>
-        /// CreateTime
-        /// </summary>
-        [Required]
-        public DateTime CreateTime { get; set; }
-
-        /// <summary>
-        /// UpdateTime
-        /// </summary>
-        [Required]
-        public DateTime UpdateTime { get; set; }
-
-        /// <summary>
-        /// UpdateUserId
-        /// </summary>
-        [Required]
-        public Guid UpdateUserId { get; set; }
 
         /// <summary>
         /// 分配时间
@@ -59,43 +89,25 @@ namespace IRaCIS.Core.Domain.Models
         [Required]
         public MedicalReviewAuditState AuditState { get; set; }
 
-
-
-		/// <summary>
-		/// 审核通过时间
-		/// </summary>
-		public DateTime? AuditSignTime { get; set; }
+        /// <summary>
+        /// 审核通过时间
+        /// </summary>
+        public DateTime? AuditSignTime { get; set; }
 
         /// <summary>
         /// 阅片人是否认同
         /// </summary>
         public MedicalReviewDoctorUserIdea DoctorUserIdeaEnum { get; set; }
 
-        /// <summary>
-        /// MedicalManagerUserId
-        /// </summary>
         public Guid? MedicalManagerUserId { get; set; }
 
-        public User MedicalManagerUser { get; set; }
+
 
         public Guid VisitTaskId { get; set; }
 
-        [ForeignKey("VisitTaskId")]
-        public VisitTask VisitTask { get; set; }
 
         public Guid TrialId { get; set; }
 
-        public Trial Trial { get; set; }
-
-        /// <summary>
-        /// 冗余  废弃
-        /// </summary>
-        //public Guid DoctorUserId { get; set; }
-
-        //[JsonIgnore]
-        //public TaskMedicalReviewRule TaskMedicalReviewRule { get; set; }
-
-
         /// <summary>
         /// 是否有问题
         /// </summary>
@@ -151,10 +163,6 @@ namespace IRaCIS.Core.Domain.Models
         /// </summary>
         public string FileName { get; set; } = string.Empty;
 
-        [JsonIgnore]
-        public List<ReadingMedicalReviewDialog> ReadingMedicalReviewDialogList { get; set; }
-
-
         /// <summary>
         /// 是否发送消息
         /// </summary>
@@ -171,55 +179,19 @@ namespace IRaCIS.Core.Domain.Models
         /// </summary>
         public string DialogCloseReason { get; set; } = string.Empty;
 
-
         /// <summary>
         /// 无效的 为True无效
         /// </summary>
         public bool IsInvalid { get; set; }
 
-        /// <summary>
-        /// 文件
-        /// </summary>
-        [NotMapped]
-        public List<OSSImageInfo> FileList
-        {
-            get
-            {
-
-
-                try
-                {
-                   var result= JsonConvert.DeserializeObject<List<OSSImageInfo>>(this.ImagePath);
-                   return result==null?new List<OSSImageInfo>() : result;
-                }
-                catch (Exception)
-                {
-
-                    return new List<OSSImageInfo>();
-                }
-
-            }
-        }
-
-
         public bool IsAutoGenerate { get; set; }
 
         //  | 分割
-        public string PDRelationTaskIdListStr { get; set; }=string.Empty;
+        public string PDRelationTaskIdListStr { get; set; } = string.Empty;
+
 
-        [NotMapped]
-        public List<Guid> PDRelationTaskIdList=> PDRelationTaskIdListStr.Split('|',StringSplitOptions.RemoveEmptyEntries).Select(t=> Guid.Parse(t) ).ToList();
     }
 
-    #region 文件对象
 
-    public class OSSImageInfo
-    {
-        public string FileName { get; set; }
-
-        public string ImagePath { get; set; }
-    }
-
-    #endregion
 
 }