精简实体修改

IRaCIS.Core.Domain/Allocation/SubjectTaskCategory.cs

@@ -17,6 +17,24 @@ namespace IRaCIS.Core.Domain.Models
     [Table("SubjectTaskCategory")]
     public class SubjectTaskCategory : BaseAuditAddEntity
     {
+
+
+        #region 导航属性
+
+        [JsonIgnore]
+        [ForeignKey("SouceReadModuleId")]
+        public ReadModule ReadModule { get; set; }
+
+
+        [JsonIgnore]
+        [ForeignKey("SourceSubjectVisitId")]
+        public SubjectVisit SubjectVisit { get; set; }
+
+        [JsonIgnore]
+        public Subject Subject { get; set; }
+
+        #endregion
+
         public Guid TrialId { get; set; }
        
         public string TaskName { get; set; } = string.Empty;
@@ -32,23 +50,11 @@ namespace IRaCIS.Core.Domain.Models
 
         public Guid SubjectId { get; set; }
 
-        public Subject Subject { get; set; }
 
 
 
 
-        #region 导航属性
 
-        [JsonIgnore]
-        [ForeignKey("SouceReadModuleId")]
-        public ReadModule ReadModule { get; set; }
-
-
-        [JsonIgnore]
-        [ForeignKey("SourceSubjectVisitId")]
-        public SubjectVisit SubjectVisit { get; set; }
-
-        #endregion
 
     }
 

IRaCIS.Core.Domain/Allocation/SubjectUser.cs

@@ -18,33 +18,6 @@ namespace IRaCIS.Core.Domain.Models
 	 public class SubjectUser : BaseFullAuditEntity
 	 {
 
-		public Guid TrialId { get; set; }
-
-		public Guid TrialReadingCriterionId { get; set; }
-		
-		public DateTime? AssignTime { get; set; }
-
-		public Guid SubjectId { get; set; }
-
-		public Subject Subject { get; set; }
-
-
-		public Guid DoctorUserId { get; set; }
-
-		[JsonIgnore]
-		public User DoctorUser { get; set; }
-
-		public Arm ArmEnum { get; set; }
-
-		public bool IsConfirmed { get; set; } = true;
-
-		//该属性有值 说明该医生被替换了 分配的时候 要过滤掉
-		public Guid? OrignalSubjectUserId { get; set; }
-
-
-
-
-
         #region 导航属性
         [JsonIgnore]
         public Trial Trial { get; set; }
@@ -57,7 +30,35 @@ namespace IRaCIS.Core.Domain.Models
         //ChildList
         [JsonIgnore]
         public List<SubjectUser> EarlierSubjectUserList { get; set; }
+
+
+        [JsonIgnore]
+        public User DoctorUser { get; set; }
         #endregion
+
+        public Guid TrialId { get; set; }
+
+		public Guid TrialReadingCriterionId { get; set; }
+		
+		public DateTime? AssignTime { get; set; }
+
+		public Guid SubjectId { get; set; }
+
+		public Subject Subject { get; set; }
+
+
+		public Guid DoctorUserId { get; set; }
+
+
+		public Arm ArmEnum { get; set; }
+
+		public bool IsConfirmed { get; set; } = true;
+
+		//该属性有值 说明该医生被替换了 分配的时候 要过滤掉
+		public Guid? OrignalSubjectUserId { get; set; }
+
+
+
     }
 
 }	 

IRaCIS.Core.Domain/Allocation/TaskAllocationRule.cs

@@ -17,6 +17,18 @@ namespace IRaCIS.Core.Domain.Models
     [Table("TaskAllocationRule")]
     public class TaskAllocationRule : BaseFullAuditEntity
     {
+        #region 导航属性
+
+        [ForeignKey("DoctorUserId")]
+        [JsonIgnore]
+        public User DoctorUser { get; set; }
+
+        [JsonIgnore]
+        public Enroll Enroll { get; set; }
+
+        [JsonIgnore]
+        public Trial Trial { get; set; }
+        #endregion
 
         public Guid TrialId { get; set; }
      
@@ -38,18 +50,7 @@ namespace IRaCIS.Core.Domain.Models
 
 
 
-        #region 导航属性
 
-        [ForeignKey("DoctorUserId")]
-        [JsonIgnore]
-        public User DoctorUser { get; set; }
-
-        [JsonIgnore]
-        public Enroll Enroll { get; set; }
-
-        [JsonIgnore]
-        public Trial Trial { get; set; }
-        #endregion
 
     }
 

IRaCIS.Core.Domain/Allocation/TaskConsistentRule.cs

@@ -17,7 +17,16 @@ namespace IRaCIS.Core.Domain.Models
 	public class TaskConsistentRule : BaseFullAuditEntity
     {
 
-		public Guid TrialId { get; set; }
+        #region 导航属性
+        [JsonIgnore]
+        public Trial Trial { get; set; }
+
+        [JsonIgnore]
+        [ForeignKey("TrialReadingCriterionId")]
+        public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
+        #endregion
+
+        public Guid TrialId { get; set; }
 	
 		public int PlanSubjectCount { get; set; }
 	
@@ -45,14 +54,7 @@ namespace IRaCIS.Core.Domain.Models
 
 
 
-		#region 导航属性
-		[JsonIgnore]
-        public Trial Trial { get; set; }
 
-        [JsonIgnore]
-        [ForeignKey("TrialReadingCriterionId")]
-        public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
-        #endregion
     }
 
 }	 

IRaCIS.Core.Domain/Allocation/TaskInfluence.cs

@@ -16,24 +16,21 @@ namespace IRaCIS.Core.Domain.Models
     public class TaskInfluence : BaseAuditAddEntity
     {
 
+        #region 导航属性
+        [JsonIgnore]
+        public VisitTask OriginalTask { get; set; }
+        [JsonIgnore]
+        public VisitTask InfluenceTask { get; set; }
+        #endregion
+
         public Guid OriginalTaskId { get; set; }
 
-        public VisitTask OriginalTask { get; set; }
-
-        public VisitTask InfluenceTask { get; set; }
-
-
         public Guid InfluenceTaskId { get; set; }
 
-
-
         //对影响任务进行的操作
         public ReReadingOrBackOptType OptType { get; set; }
 
 
-        #region 导航属性
-
-        #endregion
 
     }
 

IRaCIS.Core.Domain/Allocation/TaskMedicalReviewRule.cs

@@ -18,7 +18,11 @@ namespace IRaCIS.Core.Domain.Models
 	 public class TaskMedicalReviewRule :BaseFullAuditEntity
 	 {
 
-		public Guid DoctorUserId { get; set; }
+        #region 导航属性
+
+        #endregion
+
+        public Guid DoctorUserId { get; set; }
 	
 		public bool IsEnable { get; set; }
 	
@@ -39,9 +43,6 @@ namespace IRaCIS.Core.Domain.Models
 
 
 
-        #region 导航属性
-
-        #endregion
 
 
     }

IRaCIS.Core.Domain/Common/Dictionary.cs

@@ -7,16 +7,30 @@ using System.ComponentModel.DataAnnotations.Schema;
 namespace IRaCIS.Core.Domain.Models
 {
     [Table("Dictionary")]
-    public partial class Dictionary : Entity, IAuditUpdate, IAuditAdd
+    public partial class Dictionary : BaseFullAuditEntity
     {
+        #region µ¼º½ÊôÐÔ
         [JsonIgnore]
         public List<DoctorDictionary> DoctorDicRelationList { get; set; } = new List<DoctorDictionary>();
 
+
+        [JsonIgnore]
+        [ForeignKey("ConfigTypeId")]
+        public Dictionary ConfigDictionary { get; set; }
+
+        [JsonIgnore]
+        [ForeignKey("ParentId")]
+        public Dictionary Parent { get; set; }
+        [JsonIgnore]
+        public List<Dictionary> ChildList { get; set; } = new List<Dictionary>();
+
+        #endregion
+
+
         public string ChildGroup { get; set; }
 
         public int ChildCodeEnum { get; set; }
 
-
         public DicDataTypeEnum DataTypeEnum { get; set; }
 
 
@@ -32,13 +46,6 @@ namespace IRaCIS.Core.Domain.Models
 
         public int ShowOrder { get; set; }
 
-
-        public Guid UpdateUserId { get; set; }
-        public DateTime UpdateTime { get; set; }
-        public Guid CreateUserId { get; set; }
-        public DateTime CreateTime { get; set; }
-
-
         public string Code { get; set; }
 
         public Guid? ParentId { get; set; }
@@ -47,16 +54,6 @@ namespace IRaCIS.Core.Domain.Models
 
         public Guid? ConfigTypeId { get; set; }
 
-        [JsonIgnore]
-        [ForeignKey("ConfigTypeId")]
-        public Dictionary ConfigDictionary { get; set; }
-
-        [JsonIgnore]
-        [ForeignKey("ParentId")]
-        public Dictionary Parent { get; set; }
-        [JsonIgnore]
-        public List<Dictionary> ChildList { get; set; } = new List<Dictionary>();
-
 
 
 

IRaCIS.Core.Domain/Common/EmailNoticeConfig.cs

@@ -16,13 +16,16 @@ namespace IRaCIS.Core.Domain.Models
     ///EmailNoticeConfig
     ///</summary>
     [Table("EmailNoticeConfig")]
-    public class EmailNoticeConfig : Entity, IAuditUpdate, IAuditAdd, ISoftDelete
+    public class EmailNoticeConfig : BaseFullAuditDeleteEntity
     {
+        #region 导航属性
         [JsonIgnore]
         public List<TrialEmailNoticeConfig> TrialEmailNoticeConfigList { get; set; }
 
         [JsonIgnore]
         public List<EmailNoticeUserType> EmailNoticeUserTypeList { get; set; } = new List<EmailNoticeUserType>();
+        #endregion
+
         public string Code { get; set; } = String.Empty;
 
         public EmailBusinessScenario BusinessScenarioEnum { get; set; }
@@ -66,9 +69,6 @@ namespace IRaCIS.Core.Domain.Models
         public string AttachNameCN { get; set; } = string.Empty;
 
 
-
-
-
         public SysEmailLevel SystemLevel { get; set; }
 
         /// <summary>
@@ -77,34 +77,13 @@ namespace IRaCIS.Core.Domain.Models
         public bool IsDistinguishCriteria { get; set; }
 
 
-        /// <summary>
         /// 是否需要回执
-        /// </summary>
-        [Required]
         public bool IsReturnRequired { get; set; }
 
         public bool IsAutoSend { get; set; }
 
         public bool IsEnable { get; set; }
      
-        [Required]
-        public DateTime CreateTime { get; set; }
-
-
-        [Required]
-        public Guid CreateUserId { get; set; }
-
-
-        [Required]
-        public Guid UpdateUserId { get; set; }
-        [Required]
-        public DateTime UpdateTime { get; set; }
-
-        public bool IsDeleted { get; set; }
-
-        public DateTime? DeletedTime { get; set; }
-
-        public Guid? DeleteUserId { get; set; }
 
     }
 

IRaCIS.Core.Domain/Common/ExploreRecommend.cs

@@ -13,43 +13,24 @@ namespace IRaCIS.Core.Domain.Models
 	 ///ExploreRecommend
 	 ///</summary>
 	 [Table("ExploreRecommend")]	
-	 public class ExploreRecommend : Entity, IAuditUpdate, IAuditAdd,ISoftDelete
+	 public class ExploreRecommend : BaseFullAuditDeleteEntity
 	 {
-		public string ExploreType { get; set; } = string.Empty;
+        #region 导航属性
 
+        #endregion
+
+        public string ExploreType { get; set; } = string.Empty;
 
         public string Version { get; set; }=string.Empty;
 	
-
 		public string Title { get; set; } = string.Empty;
 
-
-        public DateTime CreateTime { get; set; }
-	
-
-		public Guid CreateUserId { get; set; }
-	
-
-		public Guid UpdateUserId { get; set; }
-	
-
-		public DateTime UpdateTime { get; set; }
-	
-
-		public bool IsDeleted { get; set; }
-	
-
 		public string DownloadUrl { get; set; } = string.Empty;
 
-
         public string Path { get; set; } = string.Empty;
 
         public string FileName { get; set; } = string.Empty;
 
-        public DateTime? DeletedTime { get; set; }
-
-        public Guid? DeleteUserId { get; set; }
-
     }
 
 }	 

IRaCIS.Core.Domain/Common/FrontAuditConfig.cs

@@ -15,9 +15,11 @@ namespace IRaCIS.Core.Domain.Models
     ///FrontAuditConfig
     ///</summary>
     [Table("FrontAuditConfig")]
-    public class FrontAuditConfig : Entity, IAuditUpdate, IAuditAdd
+    public class FrontAuditConfig : BaseFullAuditEntity
     {
+        #region 导航属性
 
+        #endregion
         public string Value { get; set; } = String.Empty;
 
         public string ValueCN { get; set; } = String.Empty;
@@ -26,12 +28,7 @@ namespace IRaCIS.Core.Domain.Models
 
         public string DescriptionCN { get; set; } = String.Empty;
 
-        public DateTime CreateTime { get; set; }
       
-        public Guid CreateUserId { get; set; }
-        public DateTime UpdateTime { get; set; }
-
-        public Guid UpdateUserId { get; set; }
 
         /// <summary>
         /// 是否有签名

IRaCIS.Core.Domain/Common/Internationalization.cs

@@ -13,21 +13,14 @@ namespace IRaCIS.Core.Domain.Models
 	 ///Internationalization
 	 ///</summary>
 	 [Table("Internationalization")]	
-	 public class Internationalization : Entity, IAuditUpdate, IAuditAdd
+	 public class Internationalization : BaseFullAuditEntity
 	 {
-		public int ShowOrder { get; set; }
+        #region 导航属性
+        [JsonIgnore]
+        public PublishLog PublishLog { get; set; }
 
-
+        #endregion
-		public Guid CreateUserId { get; set; }
+        public int ShowOrder { get; set; }
-	
-
-		public DateTime CreateTime { get; set; }
-	
-
-		public DateTime UpdateTime { get; set; }
-	
-
-		public Guid UpdateUserId { get; set; }
 	
 		/// <summary>
 		/// 0 1  2 预翻译 已确认  废除
@@ -52,8 +45,6 @@ namespace IRaCIS.Core.Domain.Models
 		//关联版本历史记录表Id
 		public Guid? PublishLogId { get; set; }
 
-		[JsonIgnore]
-		public PublishLog PublishLog { get; set; }
 
 
 

IRaCIS.Core.Domain/Common/PublishLog.cs

@@ -13,42 +13,21 @@ namespace IRaCIS.Core.Domain.Models
 	 ///PublishLog
 	 ///</summary>
 	 [Table("PublishLog")]	
-	 public class PublishLog : Entity, IAuditUpdate, IAuditAdd
+	 public class PublishLog : BaseFullAuditEntity
 	 {
 	 
 
-
-		[Required]
 		public string Version { get; set; }
 	
 		public DateTime? PublishTime { get; set; }
 	
-
-		[Required]
 		public string UpdateContent { get; set; }
 	
-
-		[Required]
-		public DateTime CreateTime { get; set; }
-	
-
-		[Required]
-		public Guid CreateUserId { get; set; }
-	
-
-		[Required]
-		public Guid UpdateUserId { get; set; }
-	
-
-		[Required]
-		public DateTime UpdateTime { get; set; }
-
 		//0 开发中 ，已发布
 		public int State { get; set; }
 
 		public bool IsCurrentVersion { get; set; }
 
-
      }
 
 }	 

IRaCIS.Core.Domain/Common/SystemBasicData.cs

@@ -14,62 +14,37 @@ namespace IRaCIS.Core.Domain.Models
 	 ///SystemBasicData
 	 ///</summary>
 	 [Table("SystemBasicData")]	
-	 public class SystemBasicData : Entity, IAuditUpdate, IAuditAdd
+	 public class SystemBasicData : BaseFullAuditEntity
 	 {
 
-		[Required]
+        #region 导航属性
-		public string Name { get; set; }=string.Empty;
+        [JsonIgnore]
+        [ForeignKey("ParentId")]
+        public SystemBasicData Parent { get; set; }
+
+        #endregion
 
 
-		[Required]
+        public string Name { get; set; }=string.Empty;
+	
 		public string Value { get; set; } = string.Empty;
 
-
-		[Required]
 		public string Description { get; set; } = string.Empty;
 
-
-		[Required]
 		public int ShowOrder { get; set; }
 
-		[Required]
-		public DateTime CreateTime { get; set; }
-	
-
-		[Required]
-		public Guid CreateUserId { get; set; }
-	
-
-		[Required]
-		public DateTime UpdateTime { get; set; }
-
-		[Required]
-		public Guid UpdateUserId { get; set; }
-	
-
-		[Required]
 		public string Code { get; set; }	
 
-
 		public Guid? ParentId { get; set; }
 
-		[JsonIgnore]
-		[ForeignKey("ParentId")]
-		public SystemBasicData Parent { get; set; }
-
 
 		 public string ValueCN { get; set; } = string.Empty;
 
 		public bool IsEnable { get; set; }
 
-
 		public BasicDataTypeEnum  BasicDataTypeEnum { get; set; }
 		
 
-
-		
-		
-
 	}
 
 }	 

IRaCIS.Core.Domain/Common/VerificationCode.cs

@@ -5,9 +5,8 @@ using System.ComponentModel.DataAnnotations.Schema;
 namespace IRaCIS.Core.Domain.Models
 {
     [Table("VerificationCode")]
-    public class VerificationCode:Entity, IAuditAdd
+    public class VerificationCode:BaseAuditAddEntity
     {
-        //public Guid Id { get; set; }
        
         public Guid UserId { get; set; } = Guid.Empty;
 
@@ -20,15 +19,11 @@ namespace IRaCIS.Core.Domain.Models
 
         public bool HasSend { get; set; }
 
-
         //发送的邮箱或者手机
         public string EmailOrPhone { get; set; }
 
-
         //过期时间
        public DateTime ExpirationTime { get; set; }
 
-        public Guid CreateUserId { get; set; }
-        public DateTime CreateTime { get; set; }
     }
 }

IRaCIS.Core.Domain/Dcotor/Attachment.cs

@@ -14,7 +14,7 @@ namespace IRaCIS.Core.Domain.Models
     //    HighestDegreeCertificate=7//最高学历证书
     //}
     [Table("Attachment")]
-    public partial class Attachment : Entity, IAuditAdd
+    public partial class Attachment : BaseAuditAddEntity
     {
 
         [JsonIgnore]
@@ -27,8 +27,7 @@ namespace IRaCIS.Core.Domain.Models
         public string Code { get; set; } = string.Empty;
         public DateTime? ExpiryDate { get; set; }
         public string FileName { get; set; } = string.Empty;
-        public DateTime CreateTime { get; set; }
+
-        public Guid CreateUserId { get; set; } = Guid.Empty;
         //language=1 中文， 2为英文
         public int Language { get; set; } = 0;
 

IRaCIS.Core.Domain/Dcotor/Doctor.cs

@@ -7,23 +7,45 @@ using System.ComponentModel.DataAnnotations.Schema;
 namespace IRaCIS.Core.Domain.Models
 {
     [Table("Doctor")]
-    public partial class Doctor : Entity, IAuditUpdate, IAuditAdd
+    public partial class Doctor : BaseFullAuditEntity
     {
+        #region µ¼º½ÊôÐÔ
 
         //µ¼º½ÊôÐÔ
         [JsonIgnore]
-        public  List<DoctorDictionary> DoctorDicRelationList { get; set; }=new List<DoctorDictionary>();
+        public List<DoctorDictionary> DoctorDicRelationList { get; set; } = new List<DoctorDictionary>();
         [JsonIgnore]
         public List<TrialExperienceCriteria> TrialExperienceCriteriaList { get; set; }
 
 
-        //// UserDoctor表关联  一个医生 可被多个用户管理
-        //[JsonIgnore]
-        //public  List<UserDoctor>  UserList { get; set; }
-
         [JsonIgnore]
         public List<Enroll> EnrollList { get; set; }
 
+        [JsonIgnore]
+        [ForeignKey("HospitalId")]
+        public Hospital Hospital { get; set; }
+        [JsonIgnore]
+        [ForeignKey("SpecialityId")]
+        public virtual Dictionary Speciality { get; set; }
+        [JsonIgnore]
+        [ForeignKey("DepartmentId")]
+        public virtual Dictionary Department { get; set; }
+
+        [JsonIgnore]
+        [ForeignKey("RankId")]
+        public virtual Dictionary Rank { get; set; }
+
+        [JsonIgnore]
+        [ForeignKey("PositionId")]
+        public virtual Dictionary Position { get; set; }
+        [JsonIgnore]
+        public List<Attachment> AttachmentList { get; set; }
+        [JsonIgnore]
+        public List<DoctorCriterionFile> CriterionFileList { get; set; }
+
+        [JsonIgnore]
+        public User User { get; set; }
+        #endregion
 
 
         public string ReviewerCode { get; set; } 
@@ -83,8 +105,6 @@ namespace IRaCIS.Core.Domain.Models
         [StringLength(100)]
         public string RankOther { get; set; } = string.Empty;
 
-
-
         public Guid? PositionId { get; set; } = Guid.Empty;
 
 
@@ -98,16 +118,10 @@ namespace IRaCIS.Core.Domain.Models
         [StringLength(200)]
         public string HospitalOther { get; set; } = string.Empty;
 
-
-
-
-
         [StringLength(100)]
         public string ReadingTypeOther { get; set; } = string.Empty;
 
 
-
-
         [StringLength(100)]
         public string SubspecialityOther { get; set; } = string.Empty;
 
@@ -142,12 +156,6 @@ namespace IRaCIS.Core.Domain.Models
         public bool AcceptingNewTrial { get; set; } = false;
         public bool ActivelyReading { get; set; } = false;
 
-        public Guid CreateUserId { get; set; }
-        public DateTime CreateTime { get; set; }
-
-        public Guid UpdateUserId { get; set; }
-        public DateTime UpdateTime { get; set; }
-
         public DateTime? LastLoginTime { get; set; }
 
         public Guid AuditUserId { get; set; } = Guid.Empty;
@@ -165,34 +173,6 @@ namespace IRaCIS.Core.Domain.Models
         public string SubspecialityOtherCN { get; set; } = string.Empty;
         public string SpecialityOtherCN { get; set; } = string.Empty;
 
-        [JsonIgnore]
-        [ForeignKey("HospitalId")]
-        public Hospital Hospital { get; set; }
-        [JsonIgnore]
-        [ForeignKey("SpecialityId")]
-        public virtual Dictionary Speciality { get; set; }
-        [JsonIgnore]
-        [ForeignKey("DepartmentId")]
-        public virtual Dictionary Department { get; set; }
-
-        [JsonIgnore]
-        [ForeignKey("RankId")]
-        public virtual Dictionary Rank { get; set; }
-
-        [JsonIgnore]
-        [ForeignKey("PositionId")]
-        public virtual Dictionary Position { get; set; }
-        [JsonIgnore]
-        public List<Attachment> AttachmentList { get; set; }
-        [JsonIgnore]
-        public List<DoctorCriterionFile> CriterionFileList { get; set; }
-
-        [JsonIgnore]
-        public User User { get; set; }
-
-
-        //[JsonIgnore]
-        //public List<VisitTask> VisitTaskList { get; set; }
 
         public bool IsVirtual { get; set; }
 

IRaCIS.Core.Domain/Dcotor/DoctorCriterionFile.cs

@@ -13,13 +13,17 @@ namespace IRaCIS.Core.Domain.Models
 	 ///DoctorCriterionFile
 	 ///</summary>
 	 [Table("DoctorCriterionFile")]	
-	 public class DoctorCriterionFile : Entity, IAuditAdd
+	 public class DoctorCriterionFile :BaseAuditAddEntity
 	 {
-
+        #region 导航属性
-		/// <summary>
+        [JsonIgnore]
+        [ForeignKey("DoctorId")]
+        public Doctor Doctor { get; set; }
+        #endregion
+        /// <summary>
         /// 文件名称
         /// </summary>
-		public string FileName { get; set; }
+        public string FileName { get; set; }
 	
 		/// <summary>
         /// 文件路径
@@ -46,24 +50,14 @@ namespace IRaCIS.Core.Domain.Models
         /// </summary>
 		public CriterionFileType FileType { get; set; }
 	
-		/// <summary>
-        /// CreateUserId
-        /// </summary>
-		public Guid CreateUserId { get; set; }
 
-		/// <summary>
-        /// CreateTime
-        /// </summary>
-		public DateTime CreateTime { get; set; }
 
 		/// <summary>
 		/// 是否启用
 		/// </summary>
 		public bool IsEnable { get; set; } = true;
 
-		[JsonIgnore]
+		
-		[ForeignKey("DoctorId")]
-		public Doctor Doctor { get; set; }
 
 		public string CriterionName { get; set; }
 		public Guid? TrialReadingCriterionId { get; set; }

IRaCIS.Core.Domain/Dcotor/DoctorDictionary.cs

@@ -7,13 +7,16 @@ namespace IRaCIS.Core.Domain.Models
     [Table("DoctorDictionary")]
     public partial class DoctorDictionary : Entity
     {
+        #region 导航属性
         [JsonIgnore]
         [ForeignKey("DoctorId")]
-        public  Doctor Doctor { get; set; }
+        public Doctor Doctor { get; set; }
 
         [JsonIgnore]
         [ForeignKey("DictionaryId")]
-        public  Dictionary Dictionary { get; set; }
+        public Dictionary Dictionary { get; set; }
+        #endregion
+
 
         [StringLength(50)]
         public string KeyName { get; set; } = string.Empty;

IRaCIS.Core.Domain/Dcotor/DoctorWorkload.cs

@@ -5,8 +5,11 @@ using System.ComponentModel.DataAnnotations.Schema;
 namespace IRaCIS.Core.Domain.Models
 {
     [Table("DoctorWorkload")]
-    public partial class Workload : Entity, IAuditUpdate, IAuditAdd
+    public partial class Workload :BaseFullAuditEntity
     {
+        #region 导航属性
+
+        #endregion
         [Required]
         public Guid TrialId { get; set; }
 
@@ -43,12 +46,5 @@ namespace IRaCIS.Core.Domain.Models
         public bool IsLock { get; set; } = false;
 
 
-        public Guid CreateUserId { get; set; }
-
-        public DateTime CreateTime { get; set; }
-
-        public Guid UpdateUserId { get; set; }
-
-        public DateTime UpdateTime { get; set; }
     }
 }

IRaCIS.Core.Domain/Dcotor/Education.cs

@@ -5,8 +5,11 @@ using System.ComponentModel.DataAnnotations.Schema;
 namespace IRaCIS.Core.Domain.Models
 {
     [Table("Education")]
-    public partial class Education : Entity, IAuditUpdate, IAuditAdd
+    public partial class Education : BaseFullAuditEntity
     {
+        #region 导航属性
+
+        #endregion
         public Guid DoctorId { get; set; }
 
         [Column(TypeName = "date")]
@@ -55,15 +58,7 @@ namespace IRaCIS.Core.Domain.Models
         [StringLength(50)]
         public string CityCN { get; set; } = string.Empty;
 
-
-
         public int ShowOrder { get; set; }
 
-        public Guid CreateUserId { get; set; }
-        public DateTime CreateTime { get; set; } = DateTime.Now;
-
-
-        public Guid UpdateUserId { get; set; }
-        public DateTime UpdateTime { get; set; }
     }
 }

IRaCIS.Core.Domain/Dcotor/EnrollReadingCriterion.cs

@@ -13,42 +13,23 @@ namespace IRaCIS.Core.Domain.Models
 	 ///EnrollReadingCriterion
 	 ///</summary>
 	 [Table("EnrollReadingCriterion")]	
-	 public class EnrollReadingCriterion : Entity, IAuditAdd
+	 public class EnrollReadingCriterion :BaseAuditAddEntity
 	 {
+        #region 导航属性
 
         [JsonIgnore]
         [ForeignKey("EnrollId")]
         public Enroll Enroll { get; set; }
+        #endregion
 
-        /// <summary>
-        /// EnrollId
-        /// </summary>
-        [Required]
-		public Guid EnrollId { get; set; }
 
-		/// <summary>
+        public Guid EnrollId { get; set; }
-        /// TrialReadingCriterionId
+	
-        /// </summary>
-		[Required]
 		public Guid TrialReadingCriterionId { get; set; }
 	
-		/// <summary>
-        /// IsJoinAnalysis
-        /// </summary>
-		[Required]
 		public bool IsJoinAnalysis { get; set; }
 	
-		/// <summary>
-        /// CreateTime
-        /// </summary>
-		[Required]
-		public DateTime CreateTime { get; set; }
 
-		/// <summary>
-        /// CreateUserId
-        /// </summary>
-		[Required]
-		public Guid CreateUserId { get; set; }
 	 
 	 }
 

IRaCIS.Core.Domain/Dcotor/Postgraduate.cs

@@ -5,9 +5,11 @@ using System.ComponentModel.DataAnnotations.Schema;
 namespace IRaCIS.Core.Domain.Models
 {
     [Table("Postgraduate")]
-    public partial class Postgraduate : Entity, IAuditUpdate, IAuditAdd
+    public partial class Postgraduate : BaseFullAuditEntity
     {
-        // public Guid Id { get; set; }
+        #region 导航属性
+
+        #endregion
 
         public Guid DoctorId { get; set; }
 
@@ -17,7 +19,6 @@ namespace IRaCIS.Core.Domain.Models
         [Column(TypeName = "date")]
         public DateTime? EndDate { get; set; }
 
-
         [StringLength(50)]
         public string Training { get; set; } = string.Empty;
 
@@ -38,11 +39,6 @@ namespace IRaCIS.Core.Domain.Models
         [StringLength(100)]
         public string City { get; set; } = string.Empty;
 
-        public Guid CreateUserId { get; set; }
-        public DateTime CreateTime { get; set; } = DateTime.Now;
-        public Guid UpdateUserId { get; set; }
-        public DateTime UpdateTime { get; set; }
-
         [StringLength(50)]  
         public string TrainingCN { get; set; } = string.Empty;
 

IRaCIS.Core.Domain/Dcotor/ResearchPublication.cs

@@ -4,17 +4,16 @@ using System.ComponentModel.DataAnnotations.Schema;
 namespace IRaCIS.Core.Domain.Models
 {
     [Table("ResearchPublication")]
-    public partial class ResearchPublication : Entity, IAuditUpdate, IAuditAdd
+    public partial class ResearchPublication : BaseFullAuditEntity
     {
+        #region 导航属性
+
+        #endregion
         public Guid DoctorId { get; set; }
         public string Research { get; set; } = string.Empty;
         public string Grants { get; set; } = string.Empty;
         public string Publications { get; set; } = string.Empty;
         public string AwardsHonors { get; set; } = string.Empty;
-        public Guid UpdateUserId { get; set; }
-        public DateTime UpdateTime { get; set; } = DateTime.Now;
-        public Guid CreateUserId { get; set; }
-        public DateTime CreateTime { get; set; }=DateTime.Now;
         
         public string ResearchCN { get; set; } = string.Empty;
         public string GrantsCN { get; set; } = string.Empty;

IRaCIS.Core.Domain/Dcotor/TrialExperience.cs

@@ -6,19 +6,17 @@ using System.ComponentModel.DataAnnotations.Schema;
 namespace IRaCIS.Core.Domain.Models
 {
     [Table("TrialExperience")]
-    public partial class TrialExperience : Entity, IAuditUpdate, IAuditAdd
+    public partial class TrialExperience : BaseFullAuditEntity
     {
+        #region 导航属性
 
+        [JsonIgnore]
         public List<TrialExperienceCriteria> ExperienceCriteriaList { get; set; }
+        #endregion
 
 
         public Guid DoctorId { get; set; }
 
-        //[StringLength(100)]
-        //public string Term { get; set; }
-        //[StringLength(100)]
-        //public string EvaluationCriteria { get; set; }
-
         public Guid? PhaseId { get; set; }
 
         public Dictionary Phase { get; set; }
@@ -26,10 +24,6 @@ namespace IRaCIS.Core.Domain.Models
         [StringLength(512)]
         public string EvaluationContent { get; set; }
 
-        public Guid CreateUserId { get; set; }
-        public DateTime CreateTime { get; set; } = DateTime.Now;
-        public Guid UpdateUserId { get; set; }
-        public DateTime UpdateTime { get; set; }
 
         public int VisitReadingCount { get; set; }
 

IRaCIS.Core.Domain/Dcotor/TrialExperienceCriteria.cs

@@ -5,12 +5,16 @@ namespace IRaCIS.Core.Domain.Models
 {
     public class TrialExperienceCriteria:Entity
     {
+        #region 导航属性
+        [JsonIgnore]
+        [ForeignKey("EvaluationCriteriaId")]
+        public Dictionary EvaluationCriteria { get; set; }
+        #endregion
         public Guid DoctorId { get; set; }
         public Guid TrialExperienceId { get; set; }
         public Guid EvaluationCriteriaId { get; set; }
 
-        [ForeignKey("EvaluationCriteriaId")]
+
-        public Dictionary EvaluationCriteria { get; set; }
 
 
 

IRaCIS.Core.Domain/Dcotor/UserDoctor.cs

@@ -9,14 +9,18 @@ namespace IRaCIS.Core.Domain.Models
     [Table("UserDoctor")]
     public partial class UserDoctor : Entity
     {
+        #region 导航属性
+        [JsonIgnore]
+        public Doctor Doctor { get; set; }
+        [JsonIgnore]
+        public User User { get; set; }
+        #endregion
+
         [ForeignKey("User")]
         public Guid UserId { get; set; }
 
         [ForeignKey("Doctor")]
         public Guid DoctorId { get; set; }
 
-        public Doctor Doctor { get; set; }
-
-        public User User { get; set; }
     }
 }

IRaCIS.Core.Domain/Dcotor/Vacation.cs

@@ -4,15 +4,15 @@ using System.ComponentModel.DataAnnotations.Schema;
 namespace IRaCIS.Core.Domain.Models
 {
     [Table("Vacation")]
-    public class Vacation : Entity, IAuditUpdate, IAuditAdd
+    public class Vacation : BaseFullAuditEntity
     {
+        #region 导航属性
+
+        #endregion
         public Guid DoctorId { get; set; }
         public DateTime StartDate { get; set; }
         public DateTime EndDate { get; set; }
         public int Status { get; set; } = 1;
-        public Guid UpdateUserId { get; set; }
+
-        public DateTime UpdateTime { get; set; }
-        public Guid CreateUserId { get; set; }
-        public DateTime CreateTime { get; set; }
     }
 }

IRaCIS.Core.Domain/Document/SystemDocConfirmedUser.cs

@@ -12,9 +12,12 @@ namespace IRaCIS.Core.Domain.Models
     ///SystemDocConfirmedUser
     ///</summary>
     [Table("SystemDocConfirmedUser")]
-    public class SystemDocConfirmedUser : Entity, IAuditAdd,ISoftDelete
+    public class SystemDocConfirmedUser : BaseAuditAddEntity, ISoftDelete
 
-     {
+    {
+        #region 导航属性
+
+        #endregion
         [JsonIgnore]
         public SystemDocument SystemDocument { get; set; }
 
@@ -46,9 +49,7 @@ namespace IRaCIS.Core.Domain.Models
 
         public string SignText { get; set; } = string.Empty;
 
-        public Guid CreateUserId { get; set; }
 
-        public DateTime CreateTime { get; set; }
 
         /// <summary>
         /// 是否废除

IRaCIS.Core.Domain/Document/SystemDocNeedConfirmedUserType.cs

@@ -14,22 +14,18 @@ namespace IRaCIS.Core.Domain.Models
 	 [Table("SystemDocNeedConfirmedUserType")]	
 	 public class SystemDocNeedConfirmedUserType : Entity
 	 {
-		[JsonIgnore]
+        #region 导航属性
-		[ForeignKey("NeedConfirmUserTypeId")]
+        [JsonIgnore]
-		public UserType UserTypeRole { get; set; }
+        [ForeignKey("NeedConfirmUserTypeId")]
+        public UserType UserTypeRole { get; set; }
+
+        [JsonIgnore]
+        public SystemDocument SystemDocument { get; set; }
+        #endregion
+
 
-		[JsonIgnore]
-		public SystemDocument SystemDocument { get; set; }
-		/// <summary>
-		/// SystemDocumentId
-		/// </summary>
-		[Required]
 		public Guid SystemDocumentId { get; set; }
 	
-		/// <summary>
-        /// NeedConfirmUserTypeId
-        /// </summary>
-		[Required]
 		public Guid NeedConfirmUserTypeId { get; set; }
 	 
 	 }

IRaCIS.Core.Domain/Document/SystemDocument.cs

@@ -13,70 +13,30 @@ namespace IRaCIS.Core.Domain.Models
 	 ///SystemDocument
 	 ///</summary>
 	 [Table("SystemDocument")]	
-	 public class SystemDocument : Entity, IAuditUpdate, IAuditAdd,ISoftDelete
+	 public class SystemDocument : BaseFullAuditDeleteEntity
 	 {
+        #region 导航属性
         [JsonIgnore]
-		public List<SystemDocConfirmedUser> SystemDocConfirmedUserList { get; set; }
+        public List<SystemDocConfirmedUser> SystemDocConfirmedUserList { get; set; }
-		[JsonIgnore]
+        [JsonIgnore]
-		public List<SystemDocNeedConfirmedUserType> NeedConfirmedUserTypeList { get; set; }
+        public List<SystemDocNeedConfirmedUserType> NeedConfirmedUserTypeList { get; set; }
-
+        [JsonIgnore]
-
+        [ForeignKey("FileTypeId")]
-
-		[JsonIgnore]
-		[ForeignKey("FileTypeId")]
         public Dictionary FileType { get; set; }
-
+        #endregion
 
 
         public Guid FileTypeId { get; set; }
 
-		/// <summary>
+
-		/// Name
-		/// </summary>
-		[Required]
 		public string Name { get; set; } = string.Empty;
 
-
-
-
 		public int SignViewMinimumMinutes { get; set; }
 
-		/// <summary>
+
-		/// Path
-		/// </summary>
-		[Required]
 		public string Path { get; set; } = string.Empty;
 
-		/// <summary>
-		/// CreateTime
-		/// </summary>
-		[Required]
-		public DateTime CreateTime { get; set; }
 
-		/// <summary>
-        /// CreateUserId
-        /// </summary>
-		[Required]
-		public Guid CreateUserId { get; set; }
-	
-		/// <summary>
-        /// UpdateTime
-        /// </summary>
-		[Required]
-		public DateTime UpdateTime { get; set; }
-	
-		/// <summary>
-        /// UpdateUserId
-        /// </summary>
-		[Required]
-		public Guid UpdateUserId { get; set; }
-
-
-        public DateTime? DeletedTime { get; set; }
-
-		public bool IsDeleted { get; set; }
-
-		public Guid? DeleteUserId { get; set; }
 
 	}
 

IRaCIS.Core.Domain/Document/TrialDocConfirmedUser.cs

@@ -12,35 +12,27 @@ namespace IRaCIS.Core.Domain.Models
 	 ///TrialDocUserTypeConfirmUser
 	 ///</summary>
 	 [Table("TrialDocConfirmedUser")]	
-	 public class TrialDocConfirmedUser : Entity, IAuditAdd,ISoftDelete
+	 public class TrialDocConfirmedUser : BaseAuditAddEntity,ISoftDelete
 	{
-		//public Guid TrialId { get; set; }
+        #region 导航属性
 
-		//public TrialUser TrialUser { get; set; }
+        [JsonIgnore]
-		[JsonIgnore]
+        [ForeignKey("ConfirmUserId")]
-		public TrialDocument TrialDocument { get; set; }
+        public User User { get; set; }
+        [JsonIgnore]
+        public TrialDocument TrialDocument { get; set; }
+        #endregion
 
 
-		/// <summary>
-		/// TrialDocumentId
-		/// </summary>
-		[Required]
-		public Guid TrialDocumentId { get; set; }
 
-		/// <summary>
+
-        /// ConfirmTime
+        public Guid TrialDocumentId { get; set; }
-        /// </summary>
+
+
 		public DateTime? ConfirmTime { get; set; }
 	
-		/// <summary>
-        /// ConfirmUserId
-        /// </summary>
-		[Required]
-		public Guid ConfirmUserId { get; set; }
 
-		[JsonIgnore]
+		public Guid ConfirmUserId { get; set; }
-		[ForeignKey("ConfirmUserId")]
-		public User User { get; set; }
 
 
 		public DateTime? SignFirstViewTime { get; set; }
@@ -48,9 +40,7 @@ namespace IRaCIS.Core.Domain.Models
 
 		public string SignText { get; set; } = string.Empty;
 
-		public Guid CreateUserId { get; set; }
 
-		public DateTime CreateTime { get; set; }
 
 		/// <summary>
 		/// 是否废除

IRaCIS.Core.Domain/Document/TrialDocNeedConfirmedUserType.cs

@@ -15,28 +15,21 @@ namespace IRaCIS.Core.Domain.Models
 	 [Table("TrialDocNeedConfirmedUserType")]	
 	 public class TrialDocNeedConfirmedUserType : Entity
 	 {
-		[JsonIgnore]
+        #region 导航属性
-		[ForeignKey("NeedConfirmUserTypeId")]
+        [JsonIgnore]
-		public UserType UserTypeRole { get; set; }
+        [ForeignKey("NeedConfirmUserTypeId")]
+        public UserType UserTypeRole { get; set; }
 
-		[JsonIgnore]
+        [JsonIgnore]
-		public TrialDocument TrialDocument { get; set; }
+        public TrialDocument TrialDocument { get; set; }
+        #endregion
 
+        public Guid TrialDocumentId { get; set; }
 	
-		/// <summary>
-		/// TrialDocumentId
-		/// </summary>
-		[Required]
-		public Guid TrialDocumentId { get; set; }
-	
-	
-		[Required]
 		public Guid NeedConfirmUserTypeId { get; set; }
 
 
-        //[ForeignKey("NeedConfirmUserTypeId")]
 
-        //public UserTypeRole UserTypeRole { get; set; }
 
     }
 

IRaCIS.Core.Domain/Document/TrialDocument.cs

@@ -13,83 +13,36 @@ namespace IRaCIS.Core.Domain.Models
 	 ///TrialDocument
 	 ///</summary>
 	 [Table("TrialDocument")]	
-	 public class TrialDocument : Entity, IAuditUpdate, IAuditAdd
+	 public class TrialDocument : BaseFullAuditDeleteEntity
 	 {
+        #region 导航属性
+        [JsonIgnore]
+        public List<TrialDocConfirmedUser> TrialDocConfirmedUserList { get; set; }
+        [JsonIgnore]
+        public List<TrialDocNeedConfirmedUserType> NeedConfirmedUserTypeList { get; set; }
+        [JsonIgnore]
+        public Trial Trial { get; set; }
 
-		//需要确认的项目用户 通过TrialId 关联 用中间表过滤
+        [JsonIgnore]
-
+        [ForeignKey("FileTypeId")]
-		[JsonIgnore]
+        public Dictionary FileType { get; set; }
-		public List<TrialDocConfirmedUser> TrialDocConfirmedUserList { get; set; }
+        #endregion
-		[JsonIgnore]
+        //需要确认的项目用户 通过TrialId 关联 用中间表过滤
-		public  List<TrialDocNeedConfirmedUserType> NeedConfirmedUserTypeList { get; set; }
-		[JsonIgnore]
-		public Trial Trial { get; set; }
-
-		[JsonIgnore]
-		[ForeignKey("FileTypeId")]
-		public Dictionary FileType { get; set; }
 
 
-		public Guid FileTypeId { get; set; } 
+        public Guid FileTypeId { get; set; } 
 
-
-
-		/// <summary>
-		/// Name
-		/// </summary>
-		[Required]
 		public string Name { get; set; } = string.Empty;
 
-		/// <summary>
-		/// Path
-		/// </summary>
-		[Required]
 		public string Path { get; set; } = string.Empty;
 
-		/// <summary>
-		/// TrialId
-		/// </summary>
-		[Required]
 		public Guid TrialId { get; set; }
 
-		/// <summary>
-		/// Description
-		/// </summary>
-		[Required]
 		public string Description { get; set; } = string.Empty;
 
-
-
 		public int SignViewMinimumMinutes { get; set; }
 
-		/// <summary>
-		/// CreateTime
-		/// </summary>
-		[Required]
-		public DateTime CreateTime { get; set; }
 		
-		/// <summary>
-        /// CreateUserId
-        /// </summary>
-		[Required]
-		public Guid CreateUserId { get; set; }
-	
-		/// <summary>
-        /// UpdateTime
-        /// </summary>
-		[Required]
-		public DateTime UpdateTime { get; set; }
-	
-		/// <summary>
-        /// UpdateUserId
-        /// </summary>
-		[Required]
-		public Guid UpdateUserId { get; set; }
-
-        public DateTime? DeletedTime { get; set; }
-
-
-		public bool IsDeleted { get; set; }
 
 	}
 

IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs

@@ -16,13 +16,29 @@ namespace IRaCIS.Core.Domain.Models
     ///TrialEmailNoticeConfig
     ///</summary>
     [Table("TrialEmailNoticeConfig")]
-    public class TrialEmailNoticeConfig : Entity, IAuditUpdate, IAuditAdd, ISoftDelete
+    public class TrialEmailNoticeConfig : BaseFullAuditDeleteEntity
     {
+        #region 导航属性
         [JsonIgnore]
 
         public Trial Trial { get; set; }
 
-        [Required]
+
+        [JsonIgnore]
+        public List<TrialEmailNoticeUser> TrialEmailNoticeUserList { get; set; } = new List<TrialEmailNoticeUser>();
+        [JsonIgnore]
+        public List<TrialEmailBlackUser> TrialEmailBlackUserList { get; set; } = new List<TrialEmailBlackUser>();
+
+
+        [JsonIgnore]
+
+        public EmailNoticeConfig SysEmailNoticeConfig { get; set; }
+        [ForeignKey("TrialReadingCriterionId")]
+        [JsonIgnore]
+        public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
+
+        #endregion
+
         public Guid TrialId { get; set; }
 
 
@@ -30,7 +46,6 @@ namespace IRaCIS.Core.Domain.Models
 
         public int SMTPServerPort { get; set; }
 
-        [Required]
         public string AuthorizationCode { get; set; } = string.Empty;
 
 
@@ -39,10 +54,6 @@ namespace IRaCIS.Core.Domain.Models
 
         public string FromEmail { get; set; } = string.Empty;
 
-        [JsonIgnore]
-        public List<TrialEmailNoticeUser> TrialEmailNoticeUserList { get; set; } = new List<TrialEmailNoticeUser>();
-
-        public List<TrialEmailBlackUser> TrialEmailBlackUserList { get; set; } = new List<TrialEmailBlackUser>();
 
 
         /// <summary> 业务模块 /// </summary>
@@ -81,10 +92,6 @@ namespace IRaCIS.Core.Domain.Models
         public string EmailHtmlContentCN { get; set; } = string.Empty;
 
 
-
-        [JsonIgnore]
-
-        public EmailNoticeConfig SysEmailNoticeConfig { get; set; }
         public Guid? SysEmailNoticeConfigId { get; set; }
 
 
@@ -106,28 +113,6 @@ namespace IRaCIS.Core.Domain.Models
 
         public Guid? TrialReadingCriterionId { get; set; }
 
-        [ForeignKey("TrialReadingCriterionId")]
-        [JsonIgnore]
-        public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
-
-        [Required]
-        public Guid CreateUserId { get; set; }
-
-        [Required]
-        public DateTime CreateTime { get; set; }
-
-        [Required]
-        public Guid UpdateUserId { get; set; }
-
-        [Required]
-        public DateTime UpdateTime { get; set; }
-
-        public bool IsDeleted { get; set; }
-
-        public DateTime? DeletedTime { get; set; }
-
-        public Guid? DeleteUserId { get; set; }
-
 
     }
 

IRaCIS.Core.Domain/Financial/ExchangeRate.cs

@@ -4,15 +4,12 @@ using System.ComponentModel.DataAnnotations.Schema;
 namespace IRaCIS.Core.Domain.Models
 {
     [Table("ExchangeRate")]
-    public class ExchangeRate : Entity, IAuditUpdate, IAuditAdd
+    public class ExchangeRate : BaseFullAuditEntity
     {
         public string YearMonth { get; set; }
 
         [Column(TypeName = "decimal(18,2)")]
         public decimal Rate { get; set; }
-        public Guid UpdateUserId { get; set; }
+
-        public DateTime UpdateTime { get; set; }
-        public Guid CreateUserId { get; set; }
-        public DateTime CreateTime { get; set; }
     }
 }

IRaCIS.Core.Domain/Financial/Payment.cs

@@ -6,7 +6,7 @@ namespace IRaCIS.Core.Domain.Models
 {
 
     [Table("Payment")]
-    public partial class Payment : Entity, IAuditUpdate, IAuditAdd
+    public partial class Payment : BaseFullAuditEntity
     {
         public Guid DoctorId { get; set; }
         public string YearMonth { get; set; } = string.Empty;
@@ -36,14 +36,6 @@ namespace IRaCIS.Core.Domain.Models
         [StringLength(500)]
         public string Note { get; set; } = string.Empty;
 
-        //public double TaxCNY { get; set; }
-        //public double ActuallyPaidCNY { get; set; }
-        //public double BankTransferCNY { get; set; }
 
-
-        public Guid UpdateUserId { get; set; }
-        public DateTime UpdateTime { get; set; }
-        public Guid CreateUserId { get; set; }
-        public DateTime CreateTime { get; set; }
     }
 }

IRaCIS.Core.Domain/Financial/PaymentAdjustment.cs

@@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 namespace IRaCIS.Core.Domain.Models
 {
     [Table("PaymentAdjustment")]
-    public partial class PaymentAdjustment : Entity, IAuditUpdate, IAuditAdd
+    public partial class PaymentAdjustment : BaseFullAuditEntity
     {
         public Guid ReviewerId { get; set; }
 
@@ -25,9 +25,5 @@ namespace IRaCIS.Core.Domain.Models
         public bool IsLock { get; set; } = false;
         public string Note { get; set; } = string.Empty;
 
-        public Guid CreateUserId { get; set; } = Guid.Empty;
-        public DateTime CreateTime { get; set; } = DateTime.Now;
-        public Guid UpdateUserId { get; set; } = Guid.Empty;
-        public DateTime UpdateTime { get; set; } = DateTime.Now;
     }
 }

IRaCIS.Core.Domain/Financial/PaymentDetail.cs

@@ -5,7 +5,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 namespace IRaCIS.Core.Domain.Models
 {
     [Table("PaymentDetail")]
-    public partial class PaymentDetail : Entity, IAuditUpdate, IAuditAdd
+    public partial class PaymentDetail : BaseFullAuditEntity
     {
         public Guid PaymentId { get; set; }
         public Guid DoctorId { get; set; }
@@ -40,9 +40,5 @@ namespace IRaCIS.Core.Domain.Models
         public int ShowTypeOrder { get; set; }
         public int ShowCodeOrder { get; set; }
 
-        public Guid UpdateUserId { get; set; }
-        public DateTime UpdateTime { get; set; }
-        public Guid CreateUserId { get; set; }
-        public DateTime CreateTime { get; set; }
     }
 }

IRaCIS.Core.Domain/Financial/RankPrice.cs

@@ -5,7 +5,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 namespace IRaCIS.Core.Domain.Models
 {
     [Table("RankPrice")]
-    public partial class RankPrice : Entity, IAuditUpdate, IAuditAdd
+    public partial class RankPrice : BaseFullAuditEntity
     {
         [StringLength(200)]
         public string RankName { get; set; }
@@ -40,10 +40,5 @@ namespace IRaCIS.Core.Domain.Models
         [Column(TypeName = "decimal(18,2)")]
         public decimal RefresherTraining { get; set; }
         public int ShowOrder { get; set; }
-
-        public DateTime CreateTime { get; set; }
-        public Guid CreateUserId { get; set; } = Guid.Empty;
-        public DateTime UpdateTime { get; set; }
-        public Guid UpdateUserId { get; set; } = Guid.Empty;
     }
 }

IRaCIS.Core.Domain/Financial/ReviewerPayInformation.cs

@@ -5,7 +5,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 namespace IRaCIS.Core.Domain.Models
 {
     [Table("DoctorPayInformation")]
-    public partial class ReviewerPayInformation : Entity, IAuditAdd, IAuditUpdate
+    public partial class ReviewerPayInformation : BaseFullAuditEntity
     {
         public Guid DoctorId { get; set; }
         [StringLength(200)]
@@ -24,9 +24,5 @@ namespace IRaCIS.Core.Domain.Models
         [Column(TypeName = "decimal(18,2)")]
         public decimal Additional { get; set; }
 
-        public DateTime CreateTime { get; set; }
-        public Guid CreateUserId { get; set; } = Guid.Empty;
-        public DateTime UpdateTime { get; set; }
-        public Guid UpdateUserId { get; set; } = Guid.Empty;
     }
 }

IRaCIS.Core.Domain/Financial/TrialPaymentPrice.cs

@@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 namespace IRaCIS.Core.Domain.Models
 {
     [Table("TrialPaymentPrice")]
-    public partial class TrialPaymentPrice : Entity, IAuditAdd, IAuditUpdate
+    public partial class TrialPaymentPrice : BaseFullAuditEntity
     {
         public Guid TrialId { get; set; }
 
@@ -19,16 +19,11 @@ namespace IRaCIS.Core.Domain.Models
         [Column(TypeName = "decimal(18,2)")]
         public decimal AdjustmentMultiple { get; set; } = 1;
 
-
-
         /// <summary>
         /// 是否有 为新项目
         /// </summary>
         public bool? IsNewTrial { get; set; } = false;
 
-        public DateTime CreateTime { get; set; }
+
-        public Guid CreateUserId { get; set; }
-        public DateTime UpdateTime { get; set; }
-        public Guid UpdateUserId { get; set; }
     }
 }

IRaCIS.Core.Domain/Financial/TrialRevenuesPrice.cs

@@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 namespace IRaCIS.Core.Domain.Models
 {
     [Table("TrialRevenuesPrice")]
-    public class TrialRevenuesPrice : Entity, IAuditUpdate, IAuditAdd
+    public class TrialRevenuesPrice : BaseFullAuditEntity
     {
         public Guid TrialId { get; set; }
 
@@ -38,9 +38,5 @@ namespace IRaCIS.Core.Domain.Models
         [Column(TypeName = "decimal(18,2)")]
         public decimal RefresherTraining { get; set; }
 
-        public Guid UpdateUserId { get; set; }
-        public DateTime UpdateTime { get; set; }
-        public Guid CreateUserId { get; set; }
-        public DateTime CreateTime { get; set; }
     }
 }

IRaCIS.Core.Domain/Financial/VolumeReward.cs

@@ -4,15 +4,12 @@ using System.ComponentModel.DataAnnotations.Schema;
 namespace IRaCIS.Core.Domain.Models
 {
     [Table("VolumeReward")]
-    public partial class VolumeReward : Entity, IAuditUpdate, IAuditAdd
+    public partial class VolumeReward : BaseFullAuditEntity
     {
         [Column(TypeName = "decimal(18,2)")]
         public decimal Price { get; set; }
         public int Min { get; set; }
         public int Max { get; set; }
-        public Guid UpdateUserId { get; set; }
+
-        public DateTime UpdateTime { get; set; }
-        public Guid CreateUserId { get; set; }
-        public DateTime CreateTime { get; set; }
     }
 }

IRaCIS.Core.Domain/Image/DicomInstance.cs

@@ -5,7 +5,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 namespace IRaCIS.Core.Domain.Models
 {
     [Table("DicomInstance")]
-    public class DicomInstance : Entity, IAuditAdd, IAuditUpdate
+    public class DicomInstance : BaseFullAuditEntity
     {
         [JsonIgnore]
         [ForeignKey("SeriesId")]
@@ -48,11 +48,6 @@ namespace IRaCIS.Core.Domain.Models
         public bool Anonymize { get; set; }
         public string Path { get; set; }
 
-        public Guid CreateUserId { get; set; }
-        public DateTime CreateTime { get; set; } = DateTime.Now;
-        public Guid UpdateUserId { get; set; }
-        public DateTime UpdateTime { get; set; } = DateTime.Now;
-
         public string HtmlPath { get; set; }=string.Empty;
 
     }

IRaCIS.Core.Domain/Image/DicomSeries.cs

@@ -6,7 +6,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 namespace IRaCIS.Core.Domain.Models
 {
     [Table("DicomSeries")]
-    public class DicomSeries : Entity, IAuditAdd, IAuditUpdate, ISoftDelete
+    public class DicomSeries : BaseFullAuditDeleteEntity
     {
         [JsonIgnore]
         [ForeignKey("StudyId")]
@@ -50,15 +50,6 @@ namespace IRaCIS.Core.Domain.Models
 
         public string BodyPartForEdit { get; set; } = string.Empty;
 
-        public Guid CreateUserId { get; set; }
-        public DateTime CreateTime { get; set; } = DateTime.Now;
-        public Guid UpdateUserId { get; set; }
-        public DateTime UpdateTime { get; set; } = DateTime.Now;
-
-        public DateTime? DeletedTime { get; set; }
-
-        public Guid? DeleteUserId { get; set; }
-        public bool IsDeleted {get;set;}
         public bool IsReading { get; set; } = true;
 
         public string ImageResizePath { get; set; }=string.Empty;

IRaCIS.Core.Domain/Image/DicomStudy.cs

@@ -6,7 +6,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 namespace IRaCIS.Core.Domain.Models
 {
     [Table("DicomStudy")]
-    public class DicomStudy : Entity, IAuditUpdate, IAuditAdd, ISoftDelete
+    public class DicomStudy : BaseFullAuditDeleteEntity
     {
         //一个检查 由多个人管理
         //public List<TrialSiteUser> TrialSiteUserList { get; set; } = new List<TrialSiteUser>();
@@ -76,10 +76,6 @@ namespace IRaCIS.Core.Domain.Models
         [ForeignKey("SubjectVisitId")]
         public SubjectVisit SubjectVisit { get; set; }
 
-        public Guid UpdateUserId { get; set; }
-        public DateTime UpdateTime { get; set; } = DateTime.Now;
-        public Guid CreateUserId { get; set; }
-        public DateTime CreateTime { get; set; } = DateTime.Now;
 
         [JsonIgnore]
         [ForeignKey("CreateUserId")]
@@ -93,13 +89,6 @@ namespace IRaCIS.Core.Domain.Models
 
         public List<ReadingConsistentClinicalData> ReadingConsistentClinicalDataList { get; set; }
 
-        //软删除
-        public bool IsDeleted { get; set; }
-
-        public DateTime? DeletedTime { get; set; }
-
-        public Guid? DeleteUserId { get; set; }
-
 
         public bool IsFromPACS { get; set; }
 

IRaCIS.Core.Domain/Image/DicomStudyMonitor.cs

@@ -12,7 +12,7 @@ namespace IRaCIS.Core.Domain.Models
     ///DicomStudyMonitor
     ///</summary>
     [Table("StudyMonitor")]
-    public class StudyMonitor : Entity, IAuditAdd
+    public class StudyMonitor : BaseAuditAddEntity
     {
 
 
@@ -30,9 +30,6 @@ namespace IRaCIS.Core.Domain.Models
         [ForeignKey("StudyId")]
         public TaskStudy TaskStudy { get; set; }
 
-        public DateTime CreateTime { get; set; }
-
-        public Guid CreateUserId { get; set; }
 
         //可能是Dicom  也可能是非Dicom  该字段废弃
         public Guid StudyId { get; set; }

IRaCIS.Core.Domain/Image/SCPImageUpload.cs

@@ -14,17 +14,8 @@ namespace IRaCIS.Core.Domain.Models
 	 ///SCPImageUpload
 	 ///</summary>
 	 [Table("SCPImageUpload")]	
-	 public class SCPImageUpload : Entity, IAuditAdd
+	 public class SCPImageUpload : BaseAuditAddEntity
-	 {
+    {
-	 
-
-
-		[Required]
-		public DateTime CreateTime { get; set; }
-	
-
-		[Required]
-		public Guid CreateUserId { get; set; }
 	 
 
 		[Required]

IRaCIS.Core.Domain/Image/SCPInstance.cs

@@ -5,7 +5,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 namespace IRaCIS.Core.Domain.Models
 {
     [Table("SCPInstance")]
-    public class SCPInstance : Entity, IAuditAdd, IAuditUpdate
+    public class SCPInstance : BaseFullAuditEntity
     {
         [JsonIgnore]
         [ForeignKey("SeriesId")]
@@ -43,10 +43,6 @@ namespace IRaCIS.Core.Domain.Models
         public bool Anonymize { get; set; }
         public string Path { get; set; } = string.Empty;
 
-        public Guid CreateUserId { get; set; }
-        public DateTime CreateTime { get; set; } = DateTime.Now;
-        public Guid UpdateUserId { get; set; }
-        public DateTime UpdateTime { get; set; } = DateTime.Now;
 
 
     }

IRaCIS.Core.Domain/Image/SCPPatient.cs

@@ -6,7 +6,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 namespace IRaCIS.Core.Domain.Models
 {
     [Table("SCPPatient")]
-    public class SCPPatient : Entity, IAuditUpdate, IAuditAdd
+    public class SCPPatient : BaseFullAuditEntity
     {
         public List<SCPStudy> SCPStudyList { get; set; }
 
@@ -16,12 +16,6 @@ namespace IRaCIS.Core.Domain.Models
         public string PatientSex { get; set; } = string.Empty;
         public string PatientBirthDate { get; set; } = string.Empty;
 
-        public Guid UpdateUserId { get; set; }
-        public DateTime UpdateTime { get; set; } = DateTime.Now;
-        public Guid CreateUserId { get; set; }
-        public DateTime CreateTime { get; set; } = DateTime.Now;
-
-
         public DateTime? EarliestStudyTime { get; set; }
 
         public DateTime? LatestStudyTime { get; set; }

IRaCIS.Core.Domain/Image/SCPSeries.cs

@@ -6,7 +6,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 namespace IRaCIS.Core.Domain.Models
 {
     [Table("SCPSeries")]
-    public class SCPSeries : Entity, IAuditAdd, IAuditUpdate, ISoftDelete
+    public class SCPSeries : BaseFullAuditDeleteEntity
     {
         [JsonIgnore]
         [ForeignKey("StudyId")]
@@ -40,15 +40,6 @@ namespace IRaCIS.Core.Domain.Models
     
         public string BodyPartForEdit { get; set; } = string.Empty;
 
-        public Guid CreateUserId { get; set; }
-        public DateTime CreateTime { get; set; } = DateTime.Now;
-        public Guid UpdateUserId { get; set; }
-        public DateTime UpdateTime { get; set; } = DateTime.Now;
-
-        public DateTime? DeletedTime { get; set; }
-
-        public Guid? DeleteUserId { get; set; }
-        public bool IsDeleted {get;set;}
         public bool IsReading { get; set; } = true;
 
         public string ImageResizePath { get; set; }=string.Empty;

IRaCIS.Core.Domain/Image/SCPStudy.cs

@@ -6,7 +6,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 namespace IRaCIS.Core.Domain.Models
 {
     [Table("SCPStudy")]
-    public class SCPStudy : Entity, IAuditUpdate, IAuditAdd, ISoftDelete
+    public class SCPStudy : BaseFullAuditDeleteEntity
     {
 
 
@@ -64,19 +64,6 @@ namespace IRaCIS.Core.Domain.Models
 
 
 
-        public Guid UpdateUserId { get; set; }
-        public DateTime UpdateTime { get; set; } = DateTime.Now;
-        public Guid CreateUserId { get; set; }
-        public DateTime CreateTime { get; set; } = DateTime.Now;
-
-
-        //软删除
-        public bool IsDeleted { get; set; }
-
-        public DateTime? DeletedTime { get; set; }
-
-        public Guid? DeleteUserId { get; set; }
-
         public string CallingAE { get; set; } = string.Empty;
 
         public string CalledAE { get; set; } = string.Empty;

IRaCIS.Core.Domain/Image/SystemAnonymization.cs

@@ -12,69 +12,23 @@ namespace IRaCIS.Core.Domain.Models
 	 ///SystemAnonymization
 	 ///</summary>
 	 [Table("SystemAnonymization")]	
-	 public class SystemAnonymization : Entity, IAuditUpdate, IAuditAdd
+	 public class SystemAnonymization : BaseFullAuditEntity
 	 {
 	 
-		
-	
-		/// <summary>
-        /// Group
-        /// </summary>
-		[Required]
 		public string Group { get; set; } = String.Empty;
 
-		/// <summary>
-		/// Element
-		/// </summary>
-		[Required]
 		public string Element { get; set; } = String.Empty;
 
-		/// <summary>
+
-		/// TagDescription
-		/// </summary>
-		[Required]
 		public string TagDescription { get; set; } = String.Empty;
 
-		/// <summary>
+
-		/// TagDescriptionCN
-		/// </summary>
-		[Required]
 		public string TagDescriptionCN { get; set; } 
 
-		/// <summary>
-		/// CreateUserId
-		/// </summary>
-		[Required]
-		public Guid CreateUserId { get; set; }
 		
-		/// <summary>
-        /// UpdateTime
-        /// </summary>
-		[Required]
-		public DateTime UpdateTime { get; set; }
-	
-		/// <summary>
-        /// UpdateUserId
-        /// </summary>
-		[Required]
-		public Guid UpdateUserId { get; set; }
-	
-		/// <summary>
-        /// ReplaceValue
-        /// </summary>
-		[Required]
 		public string ReplaceValue { get; set; } = String.Empty;
 
-		/// <summary>
-		/// CreateTime
-		/// </summary>
-		[Required]
-		public DateTime CreateTime { get; set; }
 
-		/// <summary>
-		/// ValueRepresentation
-		/// </summary>
-		[Required]
 		public string ValueRepresentation { get; set; } = String.Empty;
 
 

IRaCIS.Core.Domain/Image/TaskInstance.cs

@@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace IRaCIS.Core.Domain.Models
 {
-    public class TaskInstance : Entity, IAuditAdd, IAuditUpdate
+    public class TaskInstance : BaseFullAuditEntity
     {
         [JsonIgnore]
         [ForeignKey("SeriesId")]
@@ -46,10 +46,6 @@ namespace IRaCIS.Core.Domain.Models
         public bool Anonymize { get; set; }
         public string Path { get; set; }
 
-        public Guid CreateUserId { get; set; }
-        public DateTime CreateTime { get; set; } = DateTime.Now;
-        public Guid UpdateUserId { get; set; }
-        public DateTime UpdateTime { get; set; } = DateTime.Now;
     
         public string HtmlPath { get; set; }=string.Empty;
 

IRaCIS.Core.Domain/Image/TaskSeries.cs

@@ -5,7 +5,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace IRaCIS.Core.Domain.Models
 {
-    public class TaskSeries : Entity, IAuditAdd, IAuditUpdate, ISoftDelete
+    public class TaskSeries : BaseFullAuditDeleteEntity
     {
         [JsonIgnore]
         [ForeignKey("StudyId")]
@@ -45,15 +45,6 @@ namespace IRaCIS.Core.Domain.Models
 
         public string BodyPartForEdit { get; set; } = string.Empty;
 
-        public Guid CreateUserId { get; set; }
-        public DateTime CreateTime { get; set; } = DateTime.Now;
-        public Guid UpdateUserId { get; set; }
-        public DateTime UpdateTime { get; set; } = DateTime.Now;
-
-        public DateTime? DeletedTime { get; set; }
-
-        public Guid? DeleteUserId { get; set; }
-        public bool IsDeleted {get;set;}
         public bool IsReading { get; set; } = true;
 
         public string ImageResizePath { get; set; }=string.Empty;

IRaCIS.Core.Domain/Image/TaskStudy.cs

@@ -5,7 +5,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace IRaCIS.Core.Domain.Models
 {
-    public class TaskStudy : Entity, IAuditUpdate, IAuditAdd, ISoftDelete
+    public class TaskStudy : BaseFullAuditDeleteEntity
     {
 
         [JsonIgnore]
@@ -74,22 +74,13 @@ namespace IRaCIS.Core.Domain.Models
         [ForeignKey("SubjectId")]
         public Subject Subject { get; set; }
 
-        public Guid UpdateUserId { get; set; }
+     
-        public DateTime UpdateTime { get; set; } = DateTime.Now;
-        public Guid CreateUserId { get; set; }
-        public DateTime CreateTime { get; set; } = DateTime.Now;
 
         [JsonIgnore]
         [ForeignKey("CreateUserId")]
         public User Uploader { get; set; }
 
 
-		//软删除
-		public bool IsDeleted { get; set; }
-
-        public DateTime? DeletedTime { get; set; }
-
-        public Guid? DeleteUserId { get; set; }
 
 
     }

IRaCIS.Core.Domain/Image/TrialDicomAE.cs

@@ -13,21 +13,11 @@ namespace IRaCIS.Core.Domain.Models
 	 ///DicomAE
 	 ///</summary>
 	 [Table("TrialDicomAE")]	
-	 public class TrialDicomAE : Entity, IAuditUpdate, IAuditAdd
+	 public class TrialDicomAE : BaseFullAuditEntity
 	 {
 
         public Guid TrialId { get; set; }
       
-        public DateTime CreateTime { get; set; }
-	
-
-		public Guid CreateUserId { get; set; }
-	
-
-		public Guid UpdateUserId { get; set; }
-	
-
-		public DateTime UpdateTime { get; set; }
 
 		public string CalledAE { get; set; } = string.Empty;
 

IRaCIS.Core.Domain/Institution/CRO.cs

@@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 namespace IRaCIS.Core.Domain.Models
 {
     [Table("CROCompany")]
-    public partial class CRO : Entity, IAuditUpdate, IAuditAdd
+    public partial class CRO : BaseFullAuditEntity
     {
         public string CROName { get; set; } = string.Empty;
         public string CRONameCN { get; set; } = string.Empty;
@@ -13,10 +13,6 @@ namespace IRaCIS.Core.Domain.Models
 
         public bool IsTrialLevel { get; set; }
 
-        public DateTime CreateTime { get; set; }
-        public Guid CreateUserId { get; set; }
-        public Guid UpdateUserId { get; set; }
-        public DateTime UpdateTime { get; set; }
 
         public Guid? TrialId { get; set; }
     }

IRaCIS.Core.Domain/Institution/Hospital.cs

@@ -5,7 +5,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 namespace IRaCIS.Core.Domain.Models
 {
     [Table("Hospital")]
-    public class Hospital : Entity, IAuditUpdate, IAuditAdd
+    public class Hospital : BaseFullAuditEntity
     {
         public string HospitalName { get; set; } = string.Empty;
         public string UniversityAffiliated { get; set; } = string.Empty;
@@ -20,12 +20,6 @@ namespace IRaCIS.Core.Domain.Models
         public string CityCN { get; set; } = string.Empty;
 
 
-        public DateTime CreateTime { get; set; }
-        public Guid CreateUserId { get; set; } = Guid.Empty;
-
-        public DateTime UpdateTime { get; set; } = DateTime.Now;
-        public Guid UpdateUserId { get; set; } = Guid.Empty;
-
         /// <summary>
         /// 中心Id
         /// </summary>

IRaCIS.Core.Domain/Institution/Site.cs

@@ -5,7 +5,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 namespace IRaCIS.Core.Domain.Models
 {
     [Table("Site")]
-    public partial class Site : Entity, IAuditUpdate, IAuditAdd
+    public partial class Site : BaseFullAuditEntity
     {
         [JsonIgnore]
         [ForeignKey("HospitalId")]
@@ -33,10 +33,6 @@ namespace IRaCIS.Core.Domain.Models
         public string ContactName { get; set; } = string.Empty;
         public string ContactPhone { get; set; } = string.Empty;
 
-        public Guid CreateUserId { get; set; } = Guid.Empty;
-        public DateTime CreateTime { get; set; } = DateTime.Now;
-        public Guid UpdateUserId { get; set; } = Guid.Empty;
-        public DateTime UpdateTime { get; set; } = DateTime.Now;
 
 
         //导航属性

IRaCIS.Core.Domain/Institution/Sponsor.cs

@@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 namespace IRaCIS.Core.Domain.Models
 {
     [Table("Sponsor")]
-    public partial class Sponsor : Entity, IAuditUpdate, IAuditAdd
+    public partial class Sponsor : BaseFullAuditEntity
     {
         public string SponsorName { get; set; } = String.Empty;
         public string SponsorNameCN { get; set; } = String.Empty;
@@ -13,11 +13,6 @@ namespace IRaCIS.Core.Domain.Models
 
         public bool IsTrialLevel { get; set; }
 
-        public DateTime CreateTime { get; set; } = DateTime.Now;
-        public Guid CreateUserId { get; set; } = Guid.Empty;
-        public DateTime UpdateTime { get; set; } = DateTime.Now;
-        public Guid UpdateUserId { get; set; } = Guid.Empty;
-
 
         public Guid? TrialId { get; set; }
     }

IRaCIS.Core.Domain/Management/Menu.cs

@@ -5,7 +5,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 namespace IRaCIS.Core.Domain.Models
 {
     [Table("Menu")]
-    public class Menu : Entity, IAuditUpdate, IAuditAdd
+    public class Menu : BaseFullAuditEntity
     {
         [JsonIgnore]
         public List<UserTypeMenu> UserTypeMenuList { get; set; }
@@ -55,10 +55,6 @@ namespace IRaCIS.Core.Domain.Models
 
         public string LanguageMark { get; set; }
 
-        public DateTime CreateTime { get; set; } = DateTime.Now;
-        public Guid CreateUserId { get; set; } = Guid.Empty;
-        public DateTime UpdateTime { get; set; } = DateTime.Now;
-        public Guid UpdateUserId { get; set; } = Guid.Empty;
 
     }
 }

IRaCIS.Core.Domain/Management/Notice/SystemNotice.cs

@@ -16,7 +16,7 @@ namespace IRaCIS.Core.Domain.Models
     ///SystemNotice
     ///</summary>
     [Table("SystemNotice")]
-    public class SystemNotice : Entity, IAuditUpdate, IAuditAdd
+    public class SystemNotice : BaseFullAuditEntity
     {
         [JsonIgnore]
         public  List<SystemNoticeUserType> NoticeUserTypeList { get; set; }=new List<SystemNoticeUserType>();
@@ -27,36 +27,8 @@ namespace IRaCIS.Core.Domain.Models
         public User CreateUser { get; set; }
 
 
-        /// <summary>
-        /// NoticeContent
-        /// </summary>
-        [Required]
         public string NoticeContent { get; set; }
 
-        /// <summary>
-        /// CreateTime
-        /// </summary>
-        [Required]
-        public DateTime CreateTime { get; set; }
-
-        /// <summary>
-        /// CreateUserId
-        /// </summary>
-        [Required]
-        public Guid CreateUserId { get; set; }
-
-        /// <summary>
-        /// UpdateTime
-        /// </summary>
-        [Required]
-        public DateTime UpdateTime { get; set; }
-
-        /// <summary>
-        /// UpdateUserId
-        /// </summary>
-        [Required]
-        public Guid UpdateUserId { get; set; }
-
        
 
         public SystemNotice_NoticeTypeEnum NoticeTypeEnum { get; set; }

IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserRead.cs

@@ -13,28 +13,13 @@ namespace IRaCIS.Core.Domain.Models
     ///SystemNoticeUserRead
     ///</summary>
     [Table("SystemNoticeUserRead")]
-    public class SystemNoticeUserRead : Entity, IAuditAdd
+    public class SystemNoticeUserRead : BaseAuditAddEntity
     {
 
 
 
-        /// <summary>
-        /// SystemNoticeId
-        /// </summary>
-        [Required]
         public Guid SystemNoticeId { get; set; }
 
-        /// <summary>
-        /// CreateTime
-        /// </summary>
-        [Required]
-        public DateTime CreateTime { get; set; }
-
-        /// <summary>
-        /// CreateUserId
-        /// </summary>
-        [Required]
-        public Guid CreateUserId { get; set; }
  
     }
 

IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserType.cs

@@ -13,33 +13,14 @@ namespace IRaCIS.Core.Domain.Models
 	 ///SystemNoticeUserType
 	 ///</summary>
 	 [Table("SystemNoticeUserType")]	
-	 public class SystemNoticeUserType : Entity, IAuditAdd
+	 public class SystemNoticeUserType : BaseAuditAddEntity
 	 {
 	 
 
 
-		/// <summary>
-        /// SystemNoticeId
-        /// </summary>
-		[Required]
 		public Guid SystemNoticeId { get; set; }
 	
-		/// <summary>
-        /// CreateTime
-        /// </summary>
-		[Required]
-		public DateTime CreateTime { get; set; }
 	
-		/// <summary>
-        /// CreateUserId
-        /// </summary>
-		[Required]
-		public Guid CreateUserId { get; set; }
-	
-		/// <summary>
-        /// UserTypeId
-        /// </summary>
-		[Required]
 		public Guid UserTypeId { get; set; }
 
 		[JsonIgnore]

IRaCIS.Core.Domain/Management/Role.cs

@@ -5,7 +5,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 namespace IRaCIS.Core.Domain.Models
 {
     [Table("Role")]
-    public partial class Role : Entity, IAuditUpdate, IAuditAdd
+    public partial class Role : BaseFullAuditEntity
     {
 
         public string RoleName { get; set; } = string.Empty;
@@ -15,9 +15,5 @@ namespace IRaCIS.Core.Domain.Models
         public int Status { get; set; }
         public int PrivilegeLevel { get; set; } //权限级别
 
-        public DateTime CreateTime { get; set; } = DateTime.Now;
-        public Guid CreateUserId { get; set; } = Guid.Empty;
-        public DateTime UpdateTime { get; set; } = DateTime.Now;
-        public Guid UpdateUserId { get; set; } = Guid.Empty;
     }
 }

IRaCIS.Core.Domain/Management/User.cs

@@ -8,7 +8,7 @@ using IRaCIS.Core.Domain.Share;
 namespace IRaCIS.Core.Domain.Models
 {
     [Table("User")]
-    public partial class User : Entity, IAuditAdd, IAuditUpdate
+    public partial class User : BaseFullAuditEntity
     {
         [ForeignKey("UserTypeId")]
         public UserType UserTypeRole { get; set; }
@@ -69,10 +69,6 @@ namespace IRaCIS.Core.Domain.Models
 
         public string PositionName { get; set; } = String.Empty;
 
-        public Guid CreateUserId { get; set; }
-        public DateTime CreateTime { get; set; }
-        public Guid UpdateUserId { get; set; }
-        public DateTime UpdateTime { get; set; }
 
         public bool IsFirstAdd { get; set; } = true;
 

IRaCIS.Core.Domain/Management/UserFeedBack.cs

@@ -14,7 +14,7 @@ namespace IRaCIS.Core.Domain.Models
     ///UserFeedBack
     ///</summary>
     [Table("UserFeedBack")]
-    public class UserFeedBack : Entity, IAuditUpdate, IAuditAdd
+    public class UserFeedBack : BaseFullAuditEntity
     {
         [JsonIgnore]
         public Trial Trial { get; set; }
@@ -44,17 +44,8 @@ namespace IRaCIS.Core.Domain.Models
         public string QuestionDescription { get; set; }
 
 
-        public Guid CreateUserId { get; set; }
       
 
-        public DateTime CreateTime { get; set; }
-
-
-        public Guid UpdateUserId { get; set; }
-
-
-        public DateTime UpdateTime { get; set; }
-
 
         public int State { get; set; }
 
@@ -66,18 +57,12 @@ namespace IRaCIS.Core.Domain.Models
 
         public string ScreenshotListStr { get; set; }
 
-        //
+        
         [NotMapped]
         public List<string> ScreenshotList => JsonConvert.DeserializeObject<List<string>>(ScreenshotListStr);
 
 
 
-        //public class ScreenshotInfo
-        //{
-        //    public string Path { get; set; }
-
-        //    public string Name { get; set; }
-        //}
 
     }
  }

IRaCIS.Core.Domain/Management/UserLog.cs

@@ -13,21 +13,11 @@ namespace IRaCIS.Core.Domain.Models
     ///UserLog
     ///</summary>
     [Table("UserLog")]
-    public class UserLog : Entity, IAuditAdd
+    public class UserLog : BaseAuditAddEntity
     {
-
-
-
-
         public string IP { get; set; } = string.Empty;
 
 
-        public DateTime CreateTime { get; set; }
-
-
-        public Guid CreateUserId { get; set; }
-
-
         public string LoginFaildName { get; set; }=string.Empty;
 
 

IRaCIS.Core.Domain/Management/UserPassWordLog.cs

@@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models
 	 ///UserPassWordLog
 	 ///</summary>
 	 [Table("UserPassWordLog")]	
-	 public class UserPassWordLog : Entity, IAuditAdd
+	 public class UserPassWordLog : BaseAuditAddEntity
 	 {
 	 
 	
@@ -27,15 +27,7 @@ namespace IRaCIS.Core.Domain.Models
         /// </summary>
 		public string PassWord { get; set; }
 	
-		/// <summary>
-        /// 创建日期
-        /// </summary>
-		public DateTime CreateTime { get; set; }
 
-		/// <summary>
-        /// 创建人
-        /// </summary>
-		public Guid CreateUserId { get; set; }
 	 
 	 }
 

IRaCIS.Core.Domain/Management/UserType.cs

@@ -6,8 +6,6 @@ namespace IRaCIS.Core.Domain.Models
 {
     public class UserType:Entity
     {
-        //public Guid RoleId { get; set; }
-        //public List<TrialUser> TrialUserList { get; set; }
 
 
 
@@ -39,10 +37,5 @@ namespace IRaCIS.Core.Domain.Models
         [JsonIgnore]
         public List<User> UserList { get; set; }
 
-
-
-
-        //public bool IsInternal { get; set; }
-        //public UserTypeGroup Type { get; set; }
     }
 }

IRaCIS.Core.Domain/QC/CheckChallengeDialog.cs

@@ -7,7 +7,7 @@ using System.Text;
 namespace IRaCIS.Core.Domain.Models
 {
   
-    public class CheckChallengeDialog : Entity, IAuditAdd
+    public class CheckChallengeDialog : BaseAuditAddEntity
     {
         public string TalkContent { get; set; } = string.Empty;
         [JsonIgnore]
@@ -16,8 +16,6 @@ namespace IRaCIS.Core.Domain.Models
 
         public User CreateUser { get; set; }
 
-        public DateTime CreateTime { get; set; } = DateTime.Now;
-        public Guid CreateUserId { get; set; } = Guid.Empty;
 
         public UserTypeEnum UserTypeEnum { get; set; }
 

IRaCIS.Core.Domain/QC/ConsistencyCheckFile.cs

@@ -8,7 +8,7 @@ namespace IRaCIS.Core.Domain.Models
 	 /// 一致性核查文件
 	 ///</summary>
 	 [Table("InspectionFile")]	
-	 public class InspectionFile : Entity, IAuditAdd
+	 public class InspectionFile : BaseAuditAddEntity
 	 {
 		/// <summary>
 		/// 文件名称
@@ -23,16 +23,6 @@ namespace IRaCIS.Core.Domain.Models
 		public string RelativePath { get; set; }
 
 
-		/// <summary>
-		/// 创建人
-		/// </summary>
-		public Guid CreateUserId { get; set; }
-
-
-		/// <summary>
-		/// 创建时间
-		/// </summary>
-		public DateTime CreateTime { get; set; }
 	
 		/// <summary>
 		/// 项目ID

IRaCIS.Core.Domain/QC/NoneDicom/NoneDicomStudy.cs

@@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models
 	 ///NoneDicomStudy
 	 ///</summary>
 	 [Table("NoneDicomStudy")]	
-	 public class NoneDicomStudy : Entity, IAuditUpdate, IAuditAdd
+	 public class NoneDicomStudy : BaseFullAuditEntity
 	 {
         [JsonIgnore]
 		public List<NoneDicomStudyFile> NoneDicomFileList { get; set; }
@@ -55,19 +55,7 @@ namespace IRaCIS.Core.Domain.Models
 		public DateTime ImageDate { get; set; }
 	
 
-		[Required]
-		public DateTime UpdateTime { get; set; }
 	
-		[Required]
-		public Guid UpdateUserId { get; set; }
-
-
-		[Required]
-		public DateTime CreateTime { get; set; }
-
-
-		[Required]
-		public Guid CreateUserId { get; set; }
 
 		[ForeignKey("CreateUserId")]
 		public User CreateUser { get; set; }

IRaCIS.Core.Domain/QC/NoneDicom/NoneDicomStudyFile.cs

@@ -12,30 +12,20 @@ namespace IRaCIS.Core.Domain.Models
     ///NoneDicomStudyFile
     ///</summary>
     [Table("NoneDicomStudyFile")]
-    public class NoneDicomStudyFile : Entity, IAuditAdd
+    public class NoneDicomStudyFile : BaseAuditAddEntity
     {
         [ForeignKey("NoneDicomStudyId")]
         [JsonIgnore]
         public NoneDicomStudy NoneDicomStudy { get; set; }
 
-        [Required]
         public Guid NoneDicomStudyId { get; set; }
 
-        [Required]
+
         public string Path { get; set; }
 
 
-        [Required]
         public string FileName { get; set; }
 
-
-        [Required]
-        public DateTime CreateTime { get; set; }
-
-
-        [Required]
-        public Guid CreateUserId { get; set; }
-
         public string FileType { get; set; }
 
     }

IRaCIS.Core.Domain/QC/QCChallenge.cs

@@ -5,7 +5,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace IRaCIS.Core.Domain.Models
 {
-    public class QCChallenge : Entity, IAuditAdd
+    public class QCChallenge : BaseAuditAddEntity
     {
         [JsonIgnore]
         [ForeignKey("CreateUserId")]
@@ -24,9 +24,6 @@ namespace IRaCIS.Core.Domain.Models
         public QCChanllengeReuploadEnum ReuploadEnum { get; set; }
 
 
-        public DateTime CreateTime { get; set; } = DateTime.Now;
-        public Guid CreateUserId { get; set; } = Guid.Empty;
-
         public DateTime? ReUploadedTime { get; set; }
 
         public string ReUploader { get; set; } = string.Empty;
@@ -82,20 +79,6 @@ namespace IRaCIS.Core.Domain.Models
 
 
 
-        //public Guid QATrialTemplateId { get; set; }
-        //public QATrialTemplate TrialTemplate { get; set; }
-
-        //public virtual ICollection<QARecordTrialTemplateItem> QaTrialTemplateItemList { get; set; }
-
-        //public virtual ICollection<QARecordTemplateItemDetail> QARecordTemplateItemDetailList { get; set; }
-
-        //public QAQuestion()
-        //{
-        //    //存放医生关联  Title、等各种多选项
-        //    QaTrialTemplateItemList = new HashSet<QARecordTrialTemplateItem>();
-
-        //    QARecordTemplateItemDetailList= new HashSet<QARecordTemplateItemDetail>();
-        //}
 
 
 

IRaCIS.Core.Domain/QC/QCChallengeDialog.cs

@@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace IRaCIS.Core.Domain.Models
 {
-    public class QCChallengeDialog : Entity, IAuditAdd
+    public class QCChallengeDialog : BaseAuditAddEntity
     {
         [JsonIgnore]
         public QCChallenge QCChallenge { get; set; }
@@ -18,9 +18,6 @@ namespace IRaCIS.Core.Domain.Models
         [ForeignKey("CreateUserId")]
         public User CreateUser { get; set; } 
 
-        public DateTime CreateTime { get; set; } = DateTime.Now;
-        public Guid CreateUserId { get; set; } = Guid.Empty;
-
         public UserTypeEnum UserTypeEnum { get; set; }
     }
 }

IRaCIS.Core.Domain/QC/QCQuestion.cs

@@ -12,7 +12,7 @@ namespace IRaCIS.Core.Domain.Models
 	 ///QCQuestionConfigure
 	 ///</summary>
 	 [Table("QCQuestion")]	
-	 public class QCQuestion : Entity, IAuditUpdate, IAuditAdd
+	 public class QCQuestion : BaseFullAuditEntity
 	 {	
 		/// <summary>
         /// QuestionName
@@ -63,29 +63,7 @@ namespace IRaCIS.Core.Domain.Models
 		[Required]
 		public int ShowOrder { 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; }
 	 
 	 }
 

IRaCIS.Core.Domain/QC/TrialQCQuestion.cs

@@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models
 	 ///TrialQCQuestionConfigure
 	 ///</summary>
 	 [Table("TrialQCQuestion")]	
-	 public class TrialQCQuestion : Entity, IAuditUpdate, IAuditAdd
+	 public class TrialQCQuestion : BaseFullAuditEntity
 	{
 		[JsonIgnore]
 		public Trial Trial { get; set; }
@@ -77,29 +77,6 @@ namespace IRaCIS.Core.Domain.Models
 		[Required]
 		public int ShowOrder { 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>
 		/// 是否确认

IRaCIS.Core.Domain/QC/TrialQCQuestionAnswer.cs

@@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models
 	 ///TrialQCQuestionRecord
 	 ///</summary>
 	 [Table("TrialQCQuestionAnswer")]	
-	 public class TrialQCQuestionAnswer : Entity, IAuditUpdate, IAuditAdd
+	 public class TrialQCQuestionAnswer : BaseFullAuditEntity
 	 {
 	 
 		
@@ -29,38 +29,8 @@ namespace IRaCIS.Core.Domain.Models
 		[Required]
 		public string Answer { get; set; }
 	
-		/// <summary>
-        /// ChildAnswer
-        /// </summary>
-		//[Required]
-		//public string ChildAnswer { 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; }	
-
 		public TrialQCProcess QCProcessEnum { get; set; }
 
 		// 1代表第一个人QC数据  2 代表第二个人QC数据

IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectAdditionalEvaluationResult.cs

@@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models
 	 ///SubjectAdditionalEvaluationResult
 	 ///</summary>
 	 [Table("SubjectAdditionalEvaluationResult")]	
-	 public class SubjectAdditionalEvaluationResult : Entity, IAuditUpdate, IAuditAdd
+	 public class SubjectAdditionalEvaluationResult : BaseFullAuditEntity
 	 {
 
 
@@ -33,16 +33,6 @@ namespace IRaCIS.Core.Domain.Models
 		public Guid TrialReadingCriterionId { get; set; }
 	
 
-		public DateTime CreateTime { get; set; }
-	
-
-		public Guid CreateUserId { get; set; }
-	
-
-		public Guid UpdateUserId { get; set; }
-	
-
-		public DateTime UpdateTime { get; set; }
 		
 
 		public Guid? VisitTaskId { get; set; }

IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluation.cs

@@ -15,7 +15,7 @@ namespace IRaCIS.Core.Domain.Models
 	 ///SubjectCriteriaEvaluation
 	 ///</summary>
 	 [Table("SubjectCriteriaEvaluation")]	
-	 public class SubjectCriteriaEvaluation : Entity, IAuditUpdate, IAuditAdd
+	 public class SubjectCriteriaEvaluation : BaseFullAuditEntity
 	 {
 		[JsonIgnore]
 		public Subject subject { get; set; }
@@ -45,42 +45,6 @@ namespace IRaCIS.Core.Domain.Models
 		[Required]
 		public bool IsJoinEvaluation { get; set; }
 	
-		/// <summary>
-        /// CreateTime
-        /// </summary>
-		[Required]
-		public DateTime CreateTime { get; set; }
-	
-		/// <summary>
-        /// CreateUserId
-        /// </summary>
-		[Required]
-		public Guid CreateUserId { get; set; }
-	
-		/// <summary>
-        /// UpdateUserId
-        /// </summary>
-		[Required]
-		public Guid UpdateUserId { get; set; }
-	
-		/// <summary>
-        /// UpdateTime
-        /// </summary>
-		[Required]
-		public DateTime UpdateTime { get; set; }
-
-
-	
-
-
-
-
-
-        ///// <summary>
-        //      /// 是否影像筛选
-        //      /// </summary>
-        //[Required]
-        //public bool IsImageFiltering { get; set; }
 
     }
 

IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitFilter.cs

@@ -15,7 +15,7 @@ namespace IRaCIS.Core.Domain.Models
     ///SubjectCriteriaEvaluationVisitFilter
     ///</summary>
     [Table("SubjectCriteriaEvaluationVisitFilter")]
-    public class SubjectCriteriaEvaluationVisitFilter : Entity, IAuditUpdate, IAuditAdd
+    public class SubjectCriteriaEvaluationVisitFilter : BaseFullAuditEntity
     {
 
         //[JsonIgnore]
@@ -37,16 +37,6 @@ namespace IRaCIS.Core.Domain.Models
 
         public Guid TrialReadingCriterionId { get; set; }
 
-        public DateTime CreateTime { get; set; }
-
-
-        public Guid CreateUserId { get; set; }
-
-
-        public Guid UpdateUserId { get; set; }
-
-
-        public DateTime UpdateTime { get; set; }
 
 
         public Guid SubjectVisitId { get; set; }

IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitStudyFilter.cs

@@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models
     ///SubjectCriteriaEvaluationVisitStudyFilter
     ///</summary>
     [Table("SubjectCriteriaEvaluationVisitStudyFilter")]
-    public class SubjectCriteriaEvaluationVisitStudyFilter : Entity, IAuditUpdate, IAuditAdd
+    public class SubjectCriteriaEvaluationVisitStudyFilter : BaseFullAuditEntity
     {
         [JsonIgnore]
         [ForeignKey("TrialReadingCriterionId")]
@@ -46,18 +46,6 @@ namespace IRaCIS.Core.Domain.Models
         public bool IsReading { get; set; }
 
 
-        public DateTime CreateTime { get; set; }
-
-
-        public Guid CreateUserId { get; set; }
-
-
-        public Guid UpdateUserId { get; set; }
-
-
-        public DateTime UpdateTime { get; set; }
-
-
 
     }
 

IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataSystemSet.cs

@@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models
 	/// 临床资料系统配置
 	///</summary>
 	[Table("ClinicalDataSystemSet")]
-	public class ClinicalDataSystemSet : Entity, IAuditAdd
+	public class ClinicalDataSystemSet : BaseAuditAddEntity
 	{
 
 		/// <summary>
@@ -47,15 +47,7 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public ClinicalUploadType ClinicalUploadType { get; set; }
 
-		/// <summary>
-		/// 创建时间
-		/// </summary>
-		public DateTime CreateTime { get; set; }
 
-		/// <summary>
-		/// 创建人
-		/// </summary>
-		public Guid CreateUserId { get; set; }
 
 		/// <summary>
 		/// 是否启用

IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataTrialSet.cs

@@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models
     /// 临床资料项目配置
     ///</summary>
     [Table("ClinicalDataTrialSet")]
-    public class ClinicalDataTrialSet : Entity, IAuditAdd
+    public class ClinicalDataTrialSet : BaseAuditAddEntity
     {
 
         /// <summary>
@@ -54,16 +54,6 @@ namespace IRaCIS.Core.Domain.Models
 		[ForeignKey("SystemClinicalDataSetId")]
 		public ClinicalDataSystemSet? ClinicalDataSystemSet { get; set; }
 
-		/// <summary>
-		/// 创建时间
-		/// </summary>
-		public DateTime CreateTime { get; set; }
-
-        /// <summary>
-        /// 创建人
-        /// </summary>
-        public Guid CreateUserId { get; set; }
-
         /// <summary>
         /// 是否确认
         /// </summary>

IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalData.cs

@@ -12,7 +12,7 @@ namespace IRaCIS.Core.Domain.Models
 	/// 项目的临床数据
 	///</summary>
 	[Table("ReadingClinicalData")]
-	public class ReadingClinicalData : Entity, IAuditAdd
+	public class ReadingClinicalData : BaseAuditAddEntity
 	{
 		/// <summary>
 		/// 项目ID
@@ -41,10 +41,6 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>xiu
 		public bool IsVisit { get; set; }
 
-		/// <summary>
-		/// 创建时间
-		/// </summary>
-		public DateTime CreateTime { get; set; }
 
 		/// <summary>
 		/// 是否签名
@@ -61,10 +57,6 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public bool? IsComplete { get; set; }
 
-		/// <summary>
-		/// 创建人
-		/// </summary>
-		public Guid CreateUserId { get; set; }
 
 		public int FileCount { get; set; }
 

IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalDataPDF.cs

@@ -11,7 +11,7 @@ namespace IRaCIS.Core.Domain.Models
 	/// 项目的临床数据
 	///</summary>
 	[Table("ReadingClinicalDataPDF")]
-	public class ReadingClinicalDataPDF : Entity, IAuditAdd
+	public class ReadingClinicalDataPDF : BaseAuditAddEntity
 	{
 		[JsonIgnore]
 		[ForeignKey("ReadingClinicalDataId")]
@@ -34,16 +34,6 @@ namespace IRaCIS.Core.Domain.Models
 		public string FileName { get; set; }
 
 
-		/// <summary>
-		/// 创建时间
-		/// </summary>
-		public DateTime CreateTime { get; set; }
-
-		/// <summary>
-		/// 创建人
-		/// </summary>
-		public Guid CreateUserId { get; set; }
-
 		/// <summary>
 		/// 大小
 		/// </summary>

IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalData.cs

@@ -12,7 +12,7 @@ namespace IRaCIS.Core.Domain.Models
 	/// 一致性分析临床数据
 	///</summary>
 	[Table("ReadingConsistentClinicalData")]
-	public class ReadingConsistentClinicalData : Entity, IAuditAdd
+	public class ReadingConsistentClinicalData : BaseAuditAddEntity
 	{
 		/// <summary>
 		/// 项目ID
@@ -41,10 +41,6 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>xiu
 		public bool IsVisit { get; set; }
 
-		/// <summary>
-		/// 创建时间
-		/// </summary>
-		public DateTime CreateTime { get; set; }
 
 		/// <summary>
 		/// 是否签名
@@ -61,10 +57,6 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public bool? IsComplete { get; set; } = true;
 
-		/// <summary>
-		/// 创建人
-		/// </summary>
-		public Guid CreateUserId { get; set; }
 
 		public int FileCount { get; set; }
 

IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalDataPDF.cs

@@ -11,7 +11,7 @@ namespace IRaCIS.Core.Domain.Models
     /// 一致性分析临床数据
     ///</summary>
     [Table("ReadingConsistentClinicalDataPDF")]
-	public class ReadingConsistentClinicalDataPDF : Entity, IAuditAdd
+	public class ReadingConsistentClinicalDataPDF : BaseAuditAddEntity
 	{
 		[JsonIgnore]
 		[ForeignKey("ReadingConsistentClinicalDataId")]
@@ -34,16 +34,6 @@ namespace IRaCIS.Core.Domain.Models
 		public string FileName { get; set; }
 
 
-		/// <summary>
-		/// 创建时间
-		/// </summary>
-		public DateTime CreateTime { get; set; }
-
-		/// <summary>
-		/// 创建人
-		/// </summary>
-		public Guid CreateUserId { get; set; }
-
         /// <summary>
         /// 大小
         /// </summary>

IRaCIS.Core.Domain/Reading/ClinicalData/TrialClinicalDataSetCriterion.cs

@@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models
 	 ///TrialClinicalDataSetCriterion
 	 ///</summary>
 	 [Table("TrialClinicalDataSetCriterion")]	
-	 public class TrialClinicalDataSetCriterion : Entity, IAuditUpdate, IAuditAdd
+	 public class TrialClinicalDataSetCriterion : BaseFullAuditEntity
 	 {
 
 		/// <summary>
@@ -28,30 +28,6 @@ namespace IRaCIS.Core.Domain.Models
 		[Required]
 		public Guid TrialReadingCriterionId { 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; }
-
 
         [ForeignKey("TrialClinicalDataSetId")]
 		public ClinicalDataTrialSet TrialClinicalDataSet { get; set; }

IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalQuestion.cs

@@ -16,7 +16,7 @@ namespace IRaCIS.Core.Domain.Models
     ///系统临床数据问题
     ///</summary>
     [Table("SystemClinicalQuestion")]
-    public class SystemClinicalQuestion : Entity, IAuditAdd
+    public class SystemClinicalQuestion : BaseAuditAddEntity
     {
         /// <summary>
         /// 项目临床数据Id
@@ -93,15 +93,7 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public Guid? RelevanceId { get; set; }
 
-		/// <summary>
-		/// 创建时间
-		/// </summary>
-		public DateTime CreateTime { get; set; }
 
-        /// <summary>
-        /// 创建人
-        /// </summary>
-        public Guid CreateUserId { get; set; }
 
         /// <summary>
         /// 父问题Id

IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalTableQuestion.cs

@@ -16,7 +16,7 @@ namespace IRaCIS.Core.Domain.Models
 	 /// 系统临床表格问题
 	 ///</summary>
 	 [Table("SystemClinicalTableQuestion")]	
-	 public class SystemClinicalTableQuestion : Entity, IAuditAdd
+	 public class SystemClinicalTableQuestion : BaseAuditAddEntity
 	 {
 		/// <summary>
         /// 系统临床数据Id
@@ -73,15 +73,6 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public IsRequired IsRequired { get; set; }
 
-		/// <summary>
-		/// 创建时间
-		/// </summary>
-		public DateTime CreateTime { get; set; }
-	
-		/// <summary>
-        /// 创建人
-        /// </summary>
-		public Guid CreateUserId { get; set; }
 
 		/// <summary>
         /// 外层问题Id

IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalQuestion.cs

@@ -16,7 +16,7 @@ namespace IRaCIS.Core.Domain.Models
     ///项目临床数据问题
     ///</summary>
     [Table("TrialClinicalQuestion")]
-    public class TrialClinicalQuestion : Entity, IAuditAdd
+    public class TrialClinicalQuestion : BaseAuditAddEntity
     {
         /// <summary>
         /// 项目临床数据Id
@@ -98,15 +98,7 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public Guid? SystemClinicalQuestionId { get; set; }
 
-        /// <summary>
-        /// 创建时间
-        /// </summary>
-        public DateTime CreateTime { get; set; }
 
-        /// <summary>
-        /// 创建人
-        /// </summary>
-        public Guid CreateUserId { get; set; }
 
         /// <summary>
         /// 父问题Id

IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalTableQuestion.cs

@@ -16,7 +16,7 @@ namespace IRaCIS.Core.Domain.Models
 	 /// 项目临床表格问题
 	 ///</summary>
 	 [Table("TrialClinicalTableQuestion")]	
-	 public class TrialClinicalTableQuestion : Entity, IAuditAdd
+	 public class TrialClinicalTableQuestion : BaseAuditAddEntity
 	 {
 		/// <summary>
         /// 项目临床数据Id
@@ -73,16 +73,6 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public IsRequired IsRequired { get; set; }
 
-		/// <summary>
-		/// 创建时间
-		/// </summary>
-		public DateTime CreateTime { get; set; }
-	
-		/// <summary>
-        /// 创建人
-        /// </summary>
-		public Guid CreateUserId { get; set; }
-	
 		/// <summary>
         /// 外层问题Id
         /// </summary>

IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalAnswerRowInfo.cs

@@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models
 	 ///ClinicalAnswerRowInfo
 	 ///</summary>
 	 [Table("ClinicalAnswerRowInfo")]	
-	 public class ClinicalAnswerRowInfo : Entity, IAuditAdd
+	 public class ClinicalAnswerRowInfo : BaseAuditAddEntity
 	 {
 	
 		/// <summary>
@@ -26,15 +26,6 @@ namespace IRaCIS.Core.Domain.Models
         /// </summary>
 		public Guid ClinicalFormId { get; set; }
 	
-		/// <summary>
-        /// 创建日期
-        /// </summary>
-		public DateTime CreateTime { get; set; }
-	
-		/// <summary>
-        /// 创建时间
-        /// </summary>
-		public Guid CreateUserId { get; set; }
 	
 		/// <summary>
         /// 问题Id

IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalForm.cs

@@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models
 	 ///ClinicalForm
 	 ///</summary>
 	 [Table("ClinicalForm")]	
-	 public class ClinicalForm : Entity, IAuditAdd
+	 public class ClinicalForm : BaseAuditAddEntity
 	 {
 	
 		/// <summary>
@@ -34,15 +34,6 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
         public string PicturePath { get; set; } = string.Empty;
 
-        /// <summary>
-        /// 创建日期
-        /// </summary>
-        public DateTime CreateTime { get; set; }
-	
-		/// <summary>
-        /// 创建人
-        /// </summary>
-		public Guid CreateUserId { get; set; }
 
 		/// <summary>
         /// ClinicalDataTrialSetId

IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalQuestionAnswer.cs

@@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models
 	 ///ClinicalQuestionAnswer
 	 ///</summary>
 	 [Table("ClinicalQuestionAnswer")]	
-	 public class ClinicalQuestionAnswer : Entity, IAuditAdd
+	 public class ClinicalQuestionAnswer : BaseAuditAddEntity
 	 {
 		/// <summary>
         /// 受试者Id
@@ -25,15 +25,7 @@ namespace IRaCIS.Core.Domain.Models
         /// </summary>
 		public Guid ClinicalFormId { get; set; }
 	
-		/// <summary>
-        /// 创建日期
-        /// </summary>
-		public DateTime CreateTime { get; set; }
 
-		/// <summary>
-        /// 创建用户
-        /// </summary>
-		public Guid CreateUserId { get; set; }
 	
 		/// <summary>
         /// 问题Id

IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalTableAnswer.cs

@@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models
 	 ///ClinicalTableAnswer
 	 ///</summary>
 	 [Table("ClinicalTableAnswer")]	
-	 public class ClinicalTableAnswer : Entity, IAuditAdd
+	 public class ClinicalTableAnswer : BaseAuditAddEntity
 	 {
 	
 		/// <summary>
@@ -26,15 +26,6 @@ namespace IRaCIS.Core.Domain.Models
         /// </summary>
 		public Guid ClinicalFormId { get; set; }
 	
-		/// <summary>
-        /// 创建日期
-        /// </summary>
-		public DateTime CreateTime { get; set; }
-	
-		/// <summary>
-        /// 创建时间
-        /// </summary>
-		public Guid CreateUserId { get; set; }
 	
 		/// <summary>
         /// 问题Id

IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ReadModuleCriterionFrom.cs

@@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models
 	 ///ReadModuleCriterionFrom
 	 ///</summary>
 	 [Table("ReadModuleCriterionFrom")]	
-	 public class ReadModuleCriterionFrom : Entity, IAuditAdd
+	 public class ReadModuleCriterionFrom : BaseAuditAddEntity
 	 {
 
         /// <summary>
@@ -37,15 +37,6 @@ namespace IRaCIS.Core.Domain.Models
         /// </summary>
 		public Guid ClinicalFormId { get; set; }
 	
-		/// <summary>
-        /// 创建人
-        /// </summary>
-		public Guid CreateUserId { get; set; }
-	
-		/// <summary>
-        /// 创建时间
-        /// </summary>
-		public DateTime CreateTime { get; set; }
 
 		[JsonIgnore]
 		[ForeignKey("ClinicalFormId")]