diff --git a/IRaCIS.Core.Domain/Allocation/SubjectTaskCategory.cs b/IRaCIS.Core.Domain/Allocation/SubjectTaskCategory.cs index 2f16fd831..045510e9a 100644 --- a/IRaCIS.Core.Domain/Allocation/SubjectTaskCategory.cs +++ b/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 } diff --git a/IRaCIS.Core.Domain/Allocation/SubjectUser.cs b/IRaCIS.Core.Domain/Allocation/SubjectUser.cs index 1364fbe2f..5a901de12 100644 --- a/IRaCIS.Core.Domain/Allocation/SubjectUser.cs +++ b/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 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; } + + + } } diff --git a/IRaCIS.Core.Domain/Allocation/TaskAllocationRule.cs b/IRaCIS.Core.Domain/Allocation/TaskAllocationRule.cs index 7a95717f2..ee8f0ca69 100644 --- a/IRaCIS.Core.Domain/Allocation/TaskAllocationRule.cs +++ b/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 } diff --git a/IRaCIS.Core.Domain/Allocation/TaskConsistentRule.cs b/IRaCIS.Core.Domain/Allocation/TaskConsistentRule.cs index 9a3e4aff5..5906e71fc 100644 --- a/IRaCIS.Core.Domain/Allocation/TaskConsistentRule.cs +++ b/IRaCIS.Core.Domain/Allocation/TaskConsistentRule.cs @@ -16,8 +16,17 @@ namespace IRaCIS.Core.Domain.Models [Table("TaskConsistentRule")] 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 } } diff --git a/IRaCIS.Core.Domain/Allocation/TaskInfluence.cs b/IRaCIS.Core.Domain/Allocation/TaskInfluence.cs index cf234fd10..67c388316 100644 --- a/IRaCIS.Core.Domain/Allocation/TaskInfluence.cs +++ b/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 } diff --git a/IRaCIS.Core.Domain/Allocation/TaskMedicalReviewRule.cs b/IRaCIS.Core.Domain/Allocation/TaskMedicalReviewRule.cs index 4ac3e0e21..160684ab6 100644 --- a/IRaCIS.Core.Domain/Allocation/TaskMedicalReviewRule.cs +++ b/IRaCIS.Core.Domain/Allocation/TaskMedicalReviewRule.cs @@ -17,8 +17,12 @@ namespace IRaCIS.Core.Domain.Models [Table("TaskMedicalReviewRule")] 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 } diff --git a/IRaCIS.Core.Domain/Common/Dictionary.cs b/IRaCIS.Core.Domain/Common/Dictionary.cs index b0596c510..0608dffe4 100644 --- a/IRaCIS.Core.Domain/Common/Dictionary.cs +++ b/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 DoctorDicRelationList { get; set; } = new List(); + + [JsonIgnore] + [ForeignKey("ConfigTypeId")] + public Dictionary ConfigDictionary { get; set; } + + [JsonIgnore] + [ForeignKey("ParentId")] + public Dictionary Parent { get; set; } + [JsonIgnore] + public List ChildList { get; set; } = new List(); + + #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 ChildList { get; set; } = new List(); - diff --git a/IRaCIS.Core.Domain/Common/EmailNoticeConfig.cs b/IRaCIS.Core.Domain/Common/EmailNoticeConfig.cs index 613bc008e..55d17c476 100644 --- a/IRaCIS.Core.Domain/Common/EmailNoticeConfig.cs +++ b/IRaCIS.Core.Domain/Common/EmailNoticeConfig.cs @@ -16,13 +16,16 @@ namespace IRaCIS.Core.Domain.Models ///EmailNoticeConfig /// [Table("EmailNoticeConfig")] - public class EmailNoticeConfig : Entity, IAuditUpdate, IAuditAdd, ISoftDelete + public class EmailNoticeConfig : BaseFullAuditDeleteEntity { + #region 导航属性 [JsonIgnore] public List TrialEmailNoticeConfigList { get; set; } [JsonIgnore] public List EmailNoticeUserTypeList { get; set; } = new List(); + #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; } /// @@ -77,34 +77,13 @@ namespace IRaCIS.Core.Domain.Models public bool IsDistinguishCriteria { get; set; } - /// /// 是否需要回执 - /// - [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; } + } diff --git a/IRaCIS.Core.Domain/Common/ExploreRecommend.cs b/IRaCIS.Core.Domain/Common/ExploreRecommend.cs index b58cd06b5..c9401e9e7 100644 --- a/IRaCIS.Core.Domain/Common/ExploreRecommend.cs +++ b/IRaCIS.Core.Domain/Common/ExploreRecommend.cs @@ -13,43 +13,24 @@ namespace IRaCIS.Core.Domain.Models ///ExploreRecommend /// [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; } - } } diff --git a/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs b/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs index ec584d892..9ab746cba 100644 --- a/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs +++ b/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs @@ -15,9 +15,11 @@ namespace IRaCIS.Core.Domain.Models ///FrontAuditConfig /// [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; } + /// /// 是否有签名 diff --git a/IRaCIS.Core.Domain/Common/Internationalization.cs b/IRaCIS.Core.Domain/Common/Internationalization.cs index 1f6b63cc7..d029dfdcb 100644 --- a/IRaCIS.Core.Domain/Common/Internationalization.cs +++ b/IRaCIS.Core.Domain/Common/Internationalization.cs @@ -13,21 +13,14 @@ namespace IRaCIS.Core.Domain.Models ///Internationalization /// [Table("Internationalization")] - public class Internationalization : Entity, IAuditUpdate, IAuditAdd - { - public int ShowOrder { get; set; } - + public class Internationalization : BaseFullAuditEntity + { + #region 导航属性 + [JsonIgnore] + public PublishLog PublishLog { get; set; } - public Guid CreateUserId { get; set; } - - - public DateTime CreateTime { get; set; } - - - public DateTime UpdateTime { get; set; } - - - public Guid UpdateUserId { get; set; } + #endregion + public int ShowOrder { get; set; } /// /// 0 1 2 预翻译 已确认 废除 @@ -52,8 +45,6 @@ namespace IRaCIS.Core.Domain.Models //关联版本历史记录表Id public Guid? PublishLogId { get; set; } - [JsonIgnore] - public PublishLog PublishLog { get; set; } diff --git a/IRaCIS.Core.Domain/Common/PublishLog.cs b/IRaCIS.Core.Domain/Common/PublishLog.cs index a93c7f9a5..8d7bf63e0 100644 --- a/IRaCIS.Core.Domain/Common/PublishLog.cs +++ b/IRaCIS.Core.Domain/Common/PublishLog.cs @@ -13,42 +13,21 @@ namespace IRaCIS.Core.Domain.Models ///PublishLog /// [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; } - } } diff --git a/IRaCIS.Core.Domain/Common/SystemBasicData.cs b/IRaCIS.Core.Domain/Common/SystemBasicData.cs index 6694f3b78..e663a5f5c 100644 --- a/IRaCIS.Core.Domain/Common/SystemBasicData.cs +++ b/IRaCIS.Core.Domain/Common/SystemBasicData.cs @@ -14,60 +14,35 @@ namespace IRaCIS.Core.Domain.Models ///SystemBasicData /// [Table("SystemBasicData")] - public class SystemBasicData : Entity, IAuditUpdate, IAuditAdd + public class SystemBasicData : BaseFullAuditEntity { - - [Required] - public string Name { get; set; }=string.Empty; - - [Required] + #region 导航属性 + [JsonIgnore] + [ForeignKey("ParentId")] + public SystemBasicData Parent { get; set; } + + #endregion + + + 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 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; } - - - - } diff --git a/IRaCIS.Core.Domain/Common/VerificationCode.cs b/IRaCIS.Core.Domain/Common/VerificationCode.cs index ad1daf877..40d21b59d 100644 --- a/IRaCIS.Core.Domain/Common/VerificationCode.cs +++ b/IRaCIS.Core.Domain/Common/VerificationCode.cs @@ -5,10 +5,9 @@ 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; } } } \ No newline at end of file diff --git a/IRaCIS.Core.Domain/Dcotor/Attachment.cs b/IRaCIS.Core.Domain/Dcotor/Attachment.cs index 825402850..bbc7d6d1b 100644 --- a/IRaCIS.Core.Domain/Dcotor/Attachment.cs +++ b/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; diff --git a/IRaCIS.Core.Domain/Dcotor/Doctor.cs b/IRaCIS.Core.Domain/Dcotor/Doctor.cs index 09b034b9e..bfa112dfa 100644 --- a/IRaCIS.Core.Domain/Dcotor/Doctor.cs +++ b/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 DoctorDicRelationList { get; set; }=new List(); + public List DoctorDicRelationList { get; set; } = new List(); [JsonIgnore] public List TrialExperienceCriteriaList { get; set; } - //// UserDoctor һҽ ɱû - //[JsonIgnore] - //public List UserList { get; set; } - [JsonIgnore] public List 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 AttachmentList { get; set; } + [JsonIgnore] + public List 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 AttachmentList { get; set; } - [JsonIgnore] - public List CriterionFileList { get; set; } - - [JsonIgnore] - public User User { get; set; } - - - //[JsonIgnore] - //public List VisitTaskList { get; set; } public bool IsVirtual { get; set; } diff --git a/IRaCIS.Core.Domain/Dcotor/DoctorCriterionFile.cs b/IRaCIS.Core.Domain/Dcotor/DoctorCriterionFile.cs index 84baafcf4..2394e4cbd 100644 --- a/IRaCIS.Core.Domain/Dcotor/DoctorCriterionFile.cs +++ b/IRaCIS.Core.Domain/Dcotor/DoctorCriterionFile.cs @@ -13,13 +13,17 @@ namespace IRaCIS.Core.Domain.Models ///DoctorCriterionFile /// [Table("DoctorCriterionFile")] - public class DoctorCriterionFile : Entity, IAuditAdd + public class DoctorCriterionFile :BaseAuditAddEntity { - - /// + #region 导航属性 + [JsonIgnore] + [ForeignKey("DoctorId")] + public Doctor Doctor { get; set; } + #endregion + /// /// 文件名称 /// - public string FileName { get; set; } + public string FileName { get; set; } /// /// 文件路径 @@ -46,24 +50,14 @@ namespace IRaCIS.Core.Domain.Models /// public CriterionFileType FileType { get; set; } - /// - /// CreateUserId - /// - public Guid CreateUserId { get; set; } - - /// - /// CreateTime - /// - public DateTime CreateTime { get; set; } + /// /// 是否启用 /// public bool IsEnable { get; set; } = true; - [JsonIgnore] - [ForeignKey("DoctorId")] - public Doctor Doctor { get; set; } + public string CriterionName { get; set; } public Guid? TrialReadingCriterionId { get; set; } diff --git a/IRaCIS.Core.Domain/Dcotor/DoctorDictionary.cs b/IRaCIS.Core.Domain/Dcotor/DoctorDictionary.cs index 24394b994..0eed81e88 100644 --- a/IRaCIS.Core.Domain/Dcotor/DoctorDictionary.cs +++ b/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; diff --git a/IRaCIS.Core.Domain/Dcotor/DoctorWorkload.cs b/IRaCIS.Core.Domain/Dcotor/DoctorWorkload.cs index 46186c58b..fce8c78d6 100644 --- a/IRaCIS.Core.Domain/Dcotor/DoctorWorkload.cs +++ b/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; } } } diff --git a/IRaCIS.Core.Domain/Dcotor/Education.cs b/IRaCIS.Core.Domain/Dcotor/Education.cs index 498478f40..813af7de7 100644 --- a/IRaCIS.Core.Domain/Dcotor/Education.cs +++ b/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; } } } diff --git a/IRaCIS.Core.Domain/Dcotor/EnrollReadingCriterion.cs b/IRaCIS.Core.Domain/Dcotor/EnrollReadingCriterion.cs index af572a356..a19f01686 100644 --- a/IRaCIS.Core.Domain/Dcotor/EnrollReadingCriterion.cs +++ b/IRaCIS.Core.Domain/Dcotor/EnrollReadingCriterion.cs @@ -13,42 +13,23 @@ namespace IRaCIS.Core.Domain.Models ///EnrollReadingCriterion /// [Table("EnrollReadingCriterion")] - public class EnrollReadingCriterion : Entity, IAuditAdd + public class EnrollReadingCriterion :BaseAuditAddEntity { + #region 导航属性 [JsonIgnore] [ForeignKey("EnrollId")] public Enroll Enroll { get; set; } + #endregion - /// - /// EnrollId - /// - [Required] - public Guid EnrollId { get; set; } + + public Guid EnrollId { get; set; } - /// - /// TrialReadingCriterionId - /// - [Required] public Guid TrialReadingCriterionId { get; set; } - /// - /// IsJoinAnalysis - /// - [Required] public bool IsJoinAnalysis { get; set; } - /// - /// CreateTime - /// - [Required] - public DateTime CreateTime { get; set; } - - /// - /// CreateUserId - /// - [Required] - public Guid CreateUserId { get; set; } + } diff --git a/IRaCIS.Core.Domain/Dcotor/Postgraduate.cs b/IRaCIS.Core.Domain/Dcotor/Postgraduate.cs index 7486316b4..21ec745e7 100644 --- a/IRaCIS.Core.Domain/Dcotor/Postgraduate.cs +++ b/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; diff --git a/IRaCIS.Core.Domain/Dcotor/ResearchPublication.cs b/IRaCIS.Core.Domain/Dcotor/ResearchPublication.cs index f86f505b2..ebbf027c9 100644 --- a/IRaCIS.Core.Domain/Dcotor/ResearchPublication.cs +++ b/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; diff --git a/IRaCIS.Core.Domain/Dcotor/TrialExperience.cs b/IRaCIS.Core.Domain/Dcotor/TrialExperience.cs index c3ecb3979..b9c88d696 100644 --- a/IRaCIS.Core.Domain/Dcotor/TrialExperience.cs +++ b/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 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; } diff --git a/IRaCIS.Core.Domain/Dcotor/TrialExperienceCriteria.cs b/IRaCIS.Core.Domain/Dcotor/TrialExperienceCriteria.cs index 7328aa357..42fb7b460 100644 --- a/IRaCIS.Core.Domain/Dcotor/TrialExperienceCriteria.cs +++ b/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; } + diff --git a/IRaCIS.Core.Domain/Dcotor/UserDoctor.cs b/IRaCIS.Core.Domain/Dcotor/UserDoctor.cs index 219ceaa3d..10924024f 100644 --- a/IRaCIS.Core.Domain/Dcotor/UserDoctor.cs +++ b/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; } } } diff --git a/IRaCIS.Core.Domain/Dcotor/Vacation.cs b/IRaCIS.Core.Domain/Dcotor/Vacation.cs index ae5670c36..366b1f9ea 100644 --- a/IRaCIS.Core.Domain/Dcotor/Vacation.cs +++ b/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; } + } } diff --git a/IRaCIS.Core.Domain/Document/SystemDocConfirmedUser.cs b/IRaCIS.Core.Domain/Document/SystemDocConfirmedUser.cs index ec048ce6a..80272ffa0 100644 --- a/IRaCIS.Core.Domain/Document/SystemDocConfirmedUser.cs +++ b/IRaCIS.Core.Domain/Document/SystemDocConfirmedUser.cs @@ -12,9 +12,12 @@ namespace IRaCIS.Core.Domain.Models ///SystemDocConfirmedUser /// [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; } /// /// 是否废除 diff --git a/IRaCIS.Core.Domain/Document/SystemDocNeedConfirmedUserType.cs b/IRaCIS.Core.Domain/Document/SystemDocNeedConfirmedUserType.cs index cc7186dfd..3b73c0d50 100644 --- a/IRaCIS.Core.Domain/Document/SystemDocNeedConfirmedUserType.cs +++ b/IRaCIS.Core.Domain/Document/SystemDocNeedConfirmedUserType.cs @@ -14,22 +14,18 @@ namespace IRaCIS.Core.Domain.Models [Table("SystemDocNeedConfirmedUserType")] public class SystemDocNeedConfirmedUserType : Entity { - [JsonIgnore] - [ForeignKey("NeedConfirmUserTypeId")] - public UserType UserTypeRole { get; set; } + #region 导航属性 + [JsonIgnore] + [ForeignKey("NeedConfirmUserTypeId")] + public UserType UserTypeRole { get; set; } + + [JsonIgnore] + public SystemDocument SystemDocument { get; set; } + #endregion + - [JsonIgnore] - public SystemDocument SystemDocument { get; set; } - /// - /// SystemDocumentId - /// - [Required] public Guid SystemDocumentId { get; set; } - /// - /// NeedConfirmUserTypeId - /// - [Required] public Guid NeedConfirmUserTypeId { get; set; } } diff --git a/IRaCIS.Core.Domain/Document/SystemDocument.cs b/IRaCIS.Core.Domain/Document/SystemDocument.cs index 696d11860..4365f6706 100644 --- a/IRaCIS.Core.Domain/Document/SystemDocument.cs +++ b/IRaCIS.Core.Domain/Document/SystemDocument.cs @@ -13,71 +13,31 @@ namespace IRaCIS.Core.Domain.Models ///SystemDocument /// [Table("SystemDocument")] - public class SystemDocument : Entity, IAuditUpdate, IAuditAdd,ISoftDelete + public class SystemDocument : BaseFullAuditDeleteEntity { + #region 导航属性 [JsonIgnore] - public List SystemDocConfirmedUserList { get; set; } - [JsonIgnore] - public List NeedConfirmedUserTypeList { get; set; } - - - - [JsonIgnore] - [ForeignKey("FileTypeId")] + public List SystemDocConfirmedUserList { get; set; } + [JsonIgnore] + public List NeedConfirmedUserTypeList { get; set; } + [JsonIgnore] + [ForeignKey("FileTypeId")] public Dictionary FileType { get; set; } - + #endregion public Guid FileTypeId { get; set; } - /// - /// Name - /// - [Required] + public string Name { get; set; } = string.Empty; - - - public int SignViewMinimumMinutes { get; set; } - /// - /// Path - /// - [Required] + public string Path { get; set; } = string.Empty; - /// - /// CreateTime - /// - [Required] - public DateTime CreateTime { get; set; } - - /// - /// CreateUserId - /// - [Required] - public Guid CreateUserId { get; set; } - - /// - /// UpdateTime - /// - [Required] - public DateTime UpdateTime { get; set; } - - /// - /// UpdateUserId - /// - [Required] - public Guid UpdateUserId { get; set; } - public DateTime? DeletedTime { get; set; } - - public bool IsDeleted { get; set; } - - public Guid? DeleteUserId { get; set; } - } } diff --git a/IRaCIS.Core.Domain/Document/TrialDocConfirmedUser.cs b/IRaCIS.Core.Domain/Document/TrialDocConfirmedUser.cs index adfc388a6..7e10ac0c3 100644 --- a/IRaCIS.Core.Domain/Document/TrialDocConfirmedUser.cs +++ b/IRaCIS.Core.Domain/Document/TrialDocConfirmedUser.cs @@ -12,35 +12,27 @@ namespace IRaCIS.Core.Domain.Models ///TrialDocUserTypeConfirmUser /// [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] - public TrialDocument TrialDocument { get; set; } + [JsonIgnore] + [ForeignKey("ConfirmUserId")] + public User User { get; set; } + [JsonIgnore] + public TrialDocument TrialDocument { get; set; } + #endregion - /// - /// TrialDocumentId - /// - [Required] - public Guid TrialDocumentId { get; set; } - /// - /// ConfirmTime - /// + + public Guid TrialDocumentId { get; set; } + + public DateTime? ConfirmTime { get; set; } - /// - /// ConfirmUserId - /// - [Required] - public Guid ConfirmUserId { get; set; } - [JsonIgnore] - [ForeignKey("ConfirmUserId")] - public User User { get; set; } + public Guid ConfirmUserId { 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; } /// /// 是否废除 diff --git a/IRaCIS.Core.Domain/Document/TrialDocNeedConfirmedUserType.cs b/IRaCIS.Core.Domain/Document/TrialDocNeedConfirmedUserType.cs index fbc61e75e..33942b727 100644 --- a/IRaCIS.Core.Domain/Document/TrialDocNeedConfirmedUserType.cs +++ b/IRaCIS.Core.Domain/Document/TrialDocNeedConfirmedUserType.cs @@ -15,28 +15,21 @@ namespace IRaCIS.Core.Domain.Models [Table("TrialDocNeedConfirmedUserType")] public class TrialDocNeedConfirmedUserType : Entity { - [JsonIgnore] - [ForeignKey("NeedConfirmUserTypeId")] - public UserType UserTypeRole { get; set; } + #region 导航属性 + [JsonIgnore] + [ForeignKey("NeedConfirmUserTypeId")] + public UserType UserTypeRole { get; set; } - [JsonIgnore] - public TrialDocument TrialDocument { get; set; } + [JsonIgnore] + public TrialDocument TrialDocument { get; set; } + #endregion - - /// - /// TrialDocumentId - /// - [Required] - public Guid TrialDocumentId { get; set; } + public Guid TrialDocumentId { get; set; } - - [Required] public Guid NeedConfirmUserTypeId { get; set; } - //[ForeignKey("NeedConfirmUserTypeId")] - //public UserTypeRole UserTypeRole { get; set; } } diff --git a/IRaCIS.Core.Domain/Document/TrialDocument.cs b/IRaCIS.Core.Domain/Document/TrialDocument.cs index b25c5f3a8..80b748894 100644 --- a/IRaCIS.Core.Domain/Document/TrialDocument.cs +++ b/IRaCIS.Core.Domain/Document/TrialDocument.cs @@ -13,83 +13,36 @@ namespace IRaCIS.Core.Domain.Models ///TrialDocument /// [Table("TrialDocument")] - public class TrialDocument : Entity, IAuditUpdate, IAuditAdd + public class TrialDocument : BaseFullAuditDeleteEntity { + #region 导航属性 + [JsonIgnore] + public List TrialDocConfirmedUserList { get; set; } + [JsonIgnore] + public List NeedConfirmedUserTypeList { get; set; } + [JsonIgnore] + public Trial Trial { get; set; } - //需要确认的项目用户 通过TrialId 关联 用中间表过滤 - - [JsonIgnore] - public List TrialDocConfirmedUserList { get; set; } - [JsonIgnore] - public List NeedConfirmedUserTypeList { get; set; } - [JsonIgnore] - public Trial Trial { get; set; } - - [JsonIgnore] - [ForeignKey("FileTypeId")] - public Dictionary FileType { get; set; } + [JsonIgnore] + [ForeignKey("FileTypeId")] + public Dictionary FileType { get; set; } + #endregion + //需要确认的项目用户 通过TrialId 关联 用中间表过滤 - public Guid FileTypeId { get; set; } + public Guid FileTypeId { get; set; } - - - /// - /// Name - /// - [Required] public string Name { get; set; } = string.Empty; - /// - /// Path - /// - [Required] public string Path { get; set; } = string.Empty; - /// - /// TrialId - /// - [Required] public Guid TrialId { get; set; } - /// - /// Description - /// - [Required] public string Description { get; set; } = string.Empty; - - public int SignViewMinimumMinutes { get; set; } - /// - /// CreateTime - /// - [Required] - public DateTime CreateTime { get; set; } - - /// - /// CreateUserId - /// - [Required] - public Guid CreateUserId { get; set; } - - /// - /// UpdateTime - /// - [Required] - public DateTime UpdateTime { get; set; } - - /// - /// UpdateUserId - /// - [Required] - public Guid UpdateUserId { get; set; } - - public DateTime? DeletedTime { get; set; } - - - public bool IsDeleted { get; set; } + } diff --git a/IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs b/IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs index 2a221071d..919d0e8b9 100644 --- a/IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs +++ b/IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs @@ -16,13 +16,29 @@ namespace IRaCIS.Core.Domain.Models ///TrialEmailNoticeConfig /// [Table("TrialEmailNoticeConfig")] - public class TrialEmailNoticeConfig : Entity, IAuditUpdate, IAuditAdd, ISoftDelete + public class TrialEmailNoticeConfig : BaseFullAuditDeleteEntity { + #region 导航属性 [JsonIgnore] public Trial Trial { get; set; } - [Required] + + [JsonIgnore] + public List TrialEmailNoticeUserList { get; set; } = new List(); + [JsonIgnore] + public List TrialEmailBlackUserList { get; set; } = new List(); + + + [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 TrialEmailNoticeUserList { get; set; } = new List(); - - public List TrialEmailBlackUserList { get; set; } = new List(); /// 业务模块 /// @@ -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; } - } diff --git a/IRaCIS.Core.Domain/Financial/ExchangeRate.cs b/IRaCIS.Core.Domain/Financial/ExchangeRate.cs index c77e3ce95..41fe845b6 100644 --- a/IRaCIS.Core.Domain/Financial/ExchangeRate.cs +++ b/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; } + } } diff --git a/IRaCIS.Core.Domain/Financial/Payment.cs b/IRaCIS.Core.Domain/Financial/Payment.cs index 800ce71bd..16af455c1 100644 --- a/IRaCIS.Core.Domain/Financial/Payment.cs +++ b/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; } } } diff --git a/IRaCIS.Core.Domain/Financial/PaymentAdjustment.cs b/IRaCIS.Core.Domain/Financial/PaymentAdjustment.cs index 44d475543..732db0aa6 100644 --- a/IRaCIS.Core.Domain/Financial/PaymentAdjustment.cs +++ b/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; } } diff --git a/IRaCIS.Core.Domain/Financial/PaymentDetail.cs b/IRaCIS.Core.Domain/Financial/PaymentDetail.cs index feb8e5047..81c217ba4 100644 --- a/IRaCIS.Core.Domain/Financial/PaymentDetail.cs +++ b/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; } } } diff --git a/IRaCIS.Core.Domain/Financial/RankPrice.cs b/IRaCIS.Core.Domain/Financial/RankPrice.cs index 01daf2b7e..7fce8616e 100644 --- a/IRaCIS.Core.Domain/Financial/RankPrice.cs +++ b/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; } } diff --git a/IRaCIS.Core.Domain/Financial/ReviewerPayInformation.cs b/IRaCIS.Core.Domain/Financial/ReviewerPayInformation.cs index ebf486ab3..6b5d05c46 100644 --- a/IRaCIS.Core.Domain/Financial/ReviewerPayInformation.cs +++ b/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; } } diff --git a/IRaCIS.Core.Domain/Financial/TrialPaymentPrice.cs b/IRaCIS.Core.Domain/Financial/TrialPaymentPrice.cs index f883a570e..f902edd11 100644 --- a/IRaCIS.Core.Domain/Financial/TrialPaymentPrice.cs +++ b/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; - - /// /// Ƿ ΪĿ /// 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; } + } } diff --git a/IRaCIS.Core.Domain/Financial/TrialRevenuesPrice.cs b/IRaCIS.Core.Domain/Financial/TrialRevenuesPrice.cs index 10557226f..d5a15531d 100644 --- a/IRaCIS.Core.Domain/Financial/TrialRevenuesPrice.cs +++ b/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; } } } diff --git a/IRaCIS.Core.Domain/Financial/VolumeReward.cs b/IRaCIS.Core.Domain/Financial/VolumeReward.cs index 937d56edc..847148b91 100644 --- a/IRaCIS.Core.Domain/Financial/VolumeReward.cs +++ b/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; } + } } diff --git a/IRaCIS.Core.Domain/Image/DicomInstance.cs b/IRaCIS.Core.Domain/Image/DicomInstance.cs index 66a34bb9c..2f6614008 100644 --- a/IRaCIS.Core.Domain/Image/DicomInstance.cs +++ b/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; } diff --git a/IRaCIS.Core.Domain/Image/DicomSeries.cs b/IRaCIS.Core.Domain/Image/DicomSeries.cs index 48bc00912..bb74f7d64 100644 --- a/IRaCIS.Core.Domain/Image/DicomSeries.cs +++ b/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; diff --git a/IRaCIS.Core.Domain/Image/DicomStudy.cs b/IRaCIS.Core.Domain/Image/DicomStudy.cs index 2fa295e25..d1dc9f4d1 100644 --- a/IRaCIS.Core.Domain/Image/DicomStudy.cs +++ b/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 TrialSiteUserList { get; set; } = new List(); @@ -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 ReadingConsistentClinicalDataList { get; set; } - //软删除 - public bool IsDeleted { get; set; } - - public DateTime? DeletedTime { get; set; } - - public Guid? DeleteUserId { get; set; } - public bool IsFromPACS { get; set; } diff --git a/IRaCIS.Core.Domain/Image/DicomStudyMonitor.cs b/IRaCIS.Core.Domain/Image/DicomStudyMonitor.cs index dedcc3b01..7d3171773 100644 --- a/IRaCIS.Core.Domain/Image/DicomStudyMonitor.cs +++ b/IRaCIS.Core.Domain/Image/DicomStudyMonitor.cs @@ -12,7 +12,7 @@ namespace IRaCIS.Core.Domain.Models ///DicomStudyMonitor /// [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; } diff --git a/IRaCIS.Core.Domain/Image/SCPImageUpload.cs b/IRaCIS.Core.Domain/Image/SCPImageUpload.cs index 10e6b4ef0..2d365d765 100644 --- a/IRaCIS.Core.Domain/Image/SCPImageUpload.cs +++ b/IRaCIS.Core.Domain/Image/SCPImageUpload.cs @@ -14,19 +14,10 @@ namespace IRaCIS.Core.Domain.Models ///SCPImageUpload /// [Table("SCPImageUpload")] - public class SCPImageUpload : Entity, IAuditAdd - { + public class SCPImageUpload : BaseAuditAddEntity + { - - [Required] - public DateTime CreateTime { get; set; } - - - [Required] - public Guid CreateUserId { get; set; } - - [Required] public string CallingAE { get; set; }=string.Empty; diff --git a/IRaCIS.Core.Domain/Image/SCPInstance.cs b/IRaCIS.Core.Domain/Image/SCPInstance.cs index f0eb643f6..0203c57a4 100644 --- a/IRaCIS.Core.Domain/Image/SCPInstance.cs +++ b/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; } diff --git a/IRaCIS.Core.Domain/Image/SCPPatient.cs b/IRaCIS.Core.Domain/Image/SCPPatient.cs index 0c75de6d4..48cbeeb80 100644 --- a/IRaCIS.Core.Domain/Image/SCPPatient.cs +++ b/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 SCPStudyList { get; set; } @@ -15,12 +15,6 @@ namespace IRaCIS.Core.Domain.Models public string PatientAge { get; set; } = string.Empty; 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; } diff --git a/IRaCIS.Core.Domain/Image/SCPSeries.cs b/IRaCIS.Core.Domain/Image/SCPSeries.cs index 5c2213c20..fb51ec62f 100644 --- a/IRaCIS.Core.Domain/Image/SCPSeries.cs +++ b/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; diff --git a/IRaCIS.Core.Domain/Image/SCPStudy.cs b/IRaCIS.Core.Domain/Image/SCPStudy.cs index 2fff33c5f..c3940592e 100644 --- a/IRaCIS.Core.Domain/Image/SCPStudy.cs +++ b/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; diff --git a/IRaCIS.Core.Domain/Image/SystemAnonymization.cs b/IRaCIS.Core.Domain/Image/SystemAnonymization.cs index c57917abc..5320b77fb 100644 --- a/IRaCIS.Core.Domain/Image/SystemAnonymization.cs +++ b/IRaCIS.Core.Domain/Image/SystemAnonymization.cs @@ -12,69 +12,23 @@ namespace IRaCIS.Core.Domain.Models ///SystemAnonymization /// [Table("SystemAnonymization")] - public class SystemAnonymization : Entity, IAuditUpdate, IAuditAdd + public class SystemAnonymization : BaseFullAuditEntity { - - - /// - /// Group - /// - [Required] public string Group { get; set; } = String.Empty; - /// - /// Element - /// - [Required] public string Element { get; set; } = String.Empty; - /// - /// TagDescription - /// - [Required] + public string TagDescription { get; set; } = String.Empty; - /// - /// TagDescriptionCN - /// - [Required] + public string TagDescriptionCN { get; set; } - /// - /// CreateUserId - /// - [Required] - public Guid CreateUserId { get; set; } - - /// - /// UpdateTime - /// - [Required] - public DateTime UpdateTime { get; set; } - - /// - /// UpdateUserId - /// - [Required] - public Guid UpdateUserId { get; set; } - - /// - /// ReplaceValue - /// - [Required] + public string ReplaceValue { get; set; } = String.Empty; - /// - /// CreateTime - /// - [Required] - public DateTime CreateTime { get; set; } - /// - /// ValueRepresentation - /// - [Required] public string ValueRepresentation { get; set; } = String.Empty; diff --git a/IRaCIS.Core.Domain/Image/TaskInstance.cs b/IRaCIS.Core.Domain/Image/TaskInstance.cs index 8e27f2f73..1f3243f81 100644 --- a/IRaCIS.Core.Domain/Image/TaskInstance.cs +++ b/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,11 +46,7 @@ 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; } diff --git a/IRaCIS.Core.Domain/Image/TaskSeries.cs b/IRaCIS.Core.Domain/Image/TaskSeries.cs index 950082f5b..b3b24dd06 100644 --- a/IRaCIS.Core.Domain/Image/TaskSeries.cs +++ b/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; diff --git a/IRaCIS.Core.Domain/Image/TaskStudy.cs b/IRaCIS.Core.Domain/Image/TaskStudy.cs index c3871e58c..86c6db504 100644 --- a/IRaCIS.Core.Domain/Image/TaskStudy.cs +++ b/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; } } diff --git a/IRaCIS.Core.Domain/Image/TrialDicomAE.cs b/IRaCIS.Core.Domain/Image/TrialDicomAE.cs index 3a1f963ab..8334c8ee3 100644 --- a/IRaCIS.Core.Domain/Image/TrialDicomAE.cs +++ b/IRaCIS.Core.Domain/Image/TrialDicomAE.cs @@ -13,21 +13,11 @@ namespace IRaCIS.Core.Domain.Models ///DicomAE /// [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; diff --git a/IRaCIS.Core.Domain/Institution/CRO.cs b/IRaCIS.Core.Domain/Institution/CRO.cs index 28037771b..98a9b49b5 100644 --- a/IRaCIS.Core.Domain/Institution/CRO.cs +++ b/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; } } diff --git a/IRaCIS.Core.Domain/Institution/Hospital.cs b/IRaCIS.Core.Domain/Institution/Hospital.cs index 683dc8d5a..680980264 100644 --- a/IRaCIS.Core.Domain/Institution/Hospital.cs +++ b/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; - /// /// 中心Id /// diff --git a/IRaCIS.Core.Domain/Institution/Site.cs b/IRaCIS.Core.Domain/Institution/Site.cs index e30b310a1..1b0fcbb2f 100644 --- a/IRaCIS.Core.Domain/Institution/Site.cs +++ b/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; // diff --git a/IRaCIS.Core.Domain/Institution/Sponsor.cs b/IRaCIS.Core.Domain/Institution/Sponsor.cs index 571f89ba6..66389dd89 100644 --- a/IRaCIS.Core.Domain/Institution/Sponsor.cs +++ b/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; } } diff --git a/IRaCIS.Core.Domain/Management/Menu.cs b/IRaCIS.Core.Domain/Management/Menu.cs index 2703fe1ae..2a42407fe 100644 --- a/IRaCIS.Core.Domain/Management/Menu.cs +++ b/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 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; } } diff --git a/IRaCIS.Core.Domain/Management/Notice/SystemNotice.cs b/IRaCIS.Core.Domain/Management/Notice/SystemNotice.cs index ec6117c42..cab3dca80 100644 --- a/IRaCIS.Core.Domain/Management/Notice/SystemNotice.cs +++ b/IRaCIS.Core.Domain/Management/Notice/SystemNotice.cs @@ -16,7 +16,7 @@ namespace IRaCIS.Core.Domain.Models ///SystemNotice /// [Table("SystemNotice")] - public class SystemNotice : Entity, IAuditUpdate, IAuditAdd + public class SystemNotice : BaseFullAuditEntity { [JsonIgnore] public List NoticeUserTypeList { get; set; }=new List(); @@ -27,37 +27,9 @@ namespace IRaCIS.Core.Domain.Models public User CreateUser { get; set; } - /// - /// NoticeContent - /// - [Required] public string NoticeContent { get; set; } - /// - /// CreateTime - /// - [Required] - public DateTime CreateTime { get; set; } - - /// - /// CreateUserId - /// - [Required] - public Guid CreateUserId { get; set; } - - /// - /// UpdateTime - /// - [Required] - public DateTime UpdateTime { get; set; } - - /// - /// UpdateUserId - /// - [Required] - public Guid UpdateUserId { get; set; } - - + public SystemNotice_NoticeTypeEnum NoticeTypeEnum { get; set; } diff --git a/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserRead.cs b/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserRead.cs index 59d3d5a38..a09d4f282 100644 --- a/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserRead.cs +++ b/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserRead.cs @@ -13,29 +13,14 @@ namespace IRaCIS.Core.Domain.Models ///SystemNoticeUserRead /// [Table("SystemNoticeUserRead")] - public class SystemNoticeUserRead : Entity, IAuditAdd + public class SystemNoticeUserRead : BaseAuditAddEntity { - /// - /// SystemNoticeId - /// - [Required] public Guid SystemNoticeId { get; set; } - /// - /// CreateTime - /// - [Required] - public DateTime CreateTime { get; set; } - - /// - /// CreateUserId - /// - [Required] - public Guid CreateUserId { get; set; } - + } } diff --git a/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserType.cs b/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserType.cs index 6c5ff0f70..e2b4e0992 100644 --- a/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserType.cs +++ b/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserType.cs @@ -13,33 +13,14 @@ namespace IRaCIS.Core.Domain.Models ///SystemNoticeUserType /// [Table("SystemNoticeUserType")] - public class SystemNoticeUserType : Entity, IAuditAdd + public class SystemNoticeUserType : BaseAuditAddEntity { - - /// - /// SystemNoticeId - /// - [Required] + public Guid SystemNoticeId { get; set; } - /// - /// CreateTime - /// - [Required] - public DateTime CreateTime { get; set; } - /// - /// CreateUserId - /// - [Required] - public Guid CreateUserId { get; set; } - - /// - /// UserTypeId - /// - [Required] public Guid UserTypeId { get; set; } [JsonIgnore] diff --git a/IRaCIS.Core.Domain/Management/Role.cs b/IRaCIS.Core.Domain/Management/Role.cs index 20d75daa4..151a996ab 100644 --- a/IRaCIS.Core.Domain/Management/Role.cs +++ b/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; } } diff --git a/IRaCIS.Core.Domain/Management/User.cs b/IRaCIS.Core.Domain/Management/User.cs index 099b0a9f9..14954c9b2 100644 --- a/IRaCIS.Core.Domain/Management/User.cs +++ b/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; diff --git a/IRaCIS.Core.Domain/Management/UserFeedBack.cs b/IRaCIS.Core.Domain/Management/UserFeedBack.cs index a9674c176..dcf74c8d4 100644 --- a/IRaCIS.Core.Domain/Management/UserFeedBack.cs +++ b/IRaCIS.Core.Domain/Management/UserFeedBack.cs @@ -14,7 +14,7 @@ namespace IRaCIS.Core.Domain.Models ///UserFeedBack /// [Table("UserFeedBack")] - public class UserFeedBack : Entity, IAuditUpdate, IAuditAdd + public class UserFeedBack : BaseFullAuditEntity { [JsonIgnore] public Trial Trial { get; set; } @@ -44,16 +44,7 @@ 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 ScreenshotList => JsonConvert.DeserializeObject>(ScreenshotListStr); - //public class ScreenshotInfo - //{ - // public string Path { get; set; } - - // public string Name { get; set; } - //} } } diff --git a/IRaCIS.Core.Domain/Management/UserLog.cs b/IRaCIS.Core.Domain/Management/UserLog.cs index 9ed33bfb2..d27867fa1 100644 --- a/IRaCIS.Core.Domain/Management/UserLog.cs +++ b/IRaCIS.Core.Domain/Management/UserLog.cs @@ -13,21 +13,11 @@ namespace IRaCIS.Core.Domain.Models ///UserLog /// [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; diff --git a/IRaCIS.Core.Domain/Management/UserPassWordLog.cs b/IRaCIS.Core.Domain/Management/UserPassWordLog.cs index 63ceb7d7b..8b3c4fd31 100644 --- a/IRaCIS.Core.Domain/Management/UserPassWordLog.cs +++ b/IRaCIS.Core.Domain/Management/UserPassWordLog.cs @@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models ///UserPassWordLog /// [Table("UserPassWordLog")] - public class UserPassWordLog : Entity, IAuditAdd + public class UserPassWordLog : BaseAuditAddEntity { @@ -27,15 +27,7 @@ namespace IRaCIS.Core.Domain.Models /// public string PassWord { get; set; } - /// - /// 创建日期 - /// - public DateTime CreateTime { get; set; } - - /// - /// 创建人 - /// - public Guid CreateUserId { get; set; } + } diff --git a/IRaCIS.Core.Domain/Management/UserType.cs b/IRaCIS.Core.Domain/Management/UserType.cs index 87fd86cfa..3a61dff11 100644 --- a/IRaCIS.Core.Domain/Management/UserType.cs +++ b/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 TrialUserList { get; set; } @@ -39,10 +37,5 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] public List UserList { get; set; } - - - - //public bool IsInternal { get; set; } - //public UserTypeGroup Type { get; set; } } } \ No newline at end of file diff --git a/IRaCIS.Core.Domain/QC/CheckChallengeDialog.cs b/IRaCIS.Core.Domain/QC/CheckChallengeDialog.cs index 865b43c2f..4e6de99ee 100644 --- a/IRaCIS.Core.Domain/QC/CheckChallengeDialog.cs +++ b/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; } diff --git a/IRaCIS.Core.Domain/QC/ConsistencyCheckFile.cs b/IRaCIS.Core.Domain/QC/ConsistencyCheckFile.cs index efd54ed66..ea3c51e01 100644 --- a/IRaCIS.Core.Domain/QC/ConsistencyCheckFile.cs +++ b/IRaCIS.Core.Domain/QC/ConsistencyCheckFile.cs @@ -8,7 +8,7 @@ namespace IRaCIS.Core.Domain.Models /// 一致性核查文件 /// [Table("InspectionFile")] - public class InspectionFile : Entity, IAuditAdd + public class InspectionFile : BaseAuditAddEntity { /// /// 文件名称 @@ -23,17 +23,7 @@ namespace IRaCIS.Core.Domain.Models public string RelativePath { get; set; } - /// - /// 创建人 - /// - public Guid CreateUserId { get; set; } - - - /// - /// 创建时间 - /// - public DateTime CreateTime { get; set; } - + /// /// 项目ID /// diff --git a/IRaCIS.Core.Domain/QC/NoneDicom/NoneDicomStudy.cs b/IRaCIS.Core.Domain/QC/NoneDicom/NoneDicomStudy.cs index 2c8a2de46..1bf4876c8 100644 --- a/IRaCIS.Core.Domain/QC/NoneDicom/NoneDicomStudy.cs +++ b/IRaCIS.Core.Domain/QC/NoneDicom/NoneDicomStudy.cs @@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models ///NoneDicomStudy /// [Table("NoneDicomStudy")] - public class NoneDicomStudy : Entity, IAuditUpdate, IAuditAdd + public class NoneDicomStudy : BaseFullAuditEntity { [JsonIgnore] public List 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; } diff --git a/IRaCIS.Core.Domain/QC/NoneDicom/NoneDicomStudyFile.cs b/IRaCIS.Core.Domain/QC/NoneDicom/NoneDicomStudyFile.cs index 3ccc47775..372f1e50f 100644 --- a/IRaCIS.Core.Domain/QC/NoneDicom/NoneDicomStudyFile.cs +++ b/IRaCIS.Core.Domain/QC/NoneDicom/NoneDicomStudyFile.cs @@ -12,30 +12,20 @@ namespace IRaCIS.Core.Domain.Models ///NoneDicomStudyFile /// [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; } } diff --git a/IRaCIS.Core.Domain/QC/QCChallenge.cs b/IRaCIS.Core.Domain/QC/QCChallenge.cs index 225efe9f4..d17e2f202 100644 --- a/IRaCIS.Core.Domain/QC/QCChallenge.cs +++ b/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 QaTrialTemplateItemList { get; set; } - - //public virtual ICollection QARecordTemplateItemDetailList { get; set; } - - //public QAQuestion() - //{ - // //存放医生关联 Title、等各种多选项 - // QaTrialTemplateItemList = new HashSet(); - - // QARecordTemplateItemDetailList= new HashSet(); - //} diff --git a/IRaCIS.Core.Domain/QC/QCChallengeDialog.cs b/IRaCIS.Core.Domain/QC/QCChallengeDialog.cs index f0402c334..bf363afb4 100644 --- a/IRaCIS.Core.Domain/QC/QCChallengeDialog.cs +++ b/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; } } } \ No newline at end of file diff --git a/IRaCIS.Core.Domain/QC/QCQuestion.cs b/IRaCIS.Core.Domain/QC/QCQuestion.cs index cfda8fefc..8e7d6a5f7 100644 --- a/IRaCIS.Core.Domain/QC/QCQuestion.cs +++ b/IRaCIS.Core.Domain/QC/QCQuestion.cs @@ -12,7 +12,7 @@ namespace IRaCIS.Core.Domain.Models ///QCQuestionConfigure /// [Table("QCQuestion")] - public class QCQuestion : Entity, IAuditUpdate, IAuditAdd + public class QCQuestion : BaseFullAuditEntity { /// /// QuestionName @@ -63,29 +63,7 @@ namespace IRaCIS.Core.Domain.Models [Required] public int ShowOrder { get; set; } - /// - /// CreateUserId - /// - [Required] - public Guid CreateUserId { get; set; } - /// - /// CreateTime - /// - [Required] - public DateTime CreateTime { get; set; } - - /// - /// UpdateTime - /// - [Required] - public DateTime UpdateTime { get; set; } - - /// - /// UpdateUserId - /// - [Required] - public Guid UpdateUserId { get; set; } } diff --git a/IRaCIS.Core.Domain/QC/TrialQCQuestion.cs b/IRaCIS.Core.Domain/QC/TrialQCQuestion.cs index 4c1791ec0..3437800da 100644 --- a/IRaCIS.Core.Domain/QC/TrialQCQuestion.cs +++ b/IRaCIS.Core.Domain/QC/TrialQCQuestion.cs @@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models ///TrialQCQuestionConfigure /// [Table("TrialQCQuestion")] - public class TrialQCQuestion : Entity, IAuditUpdate, IAuditAdd + public class TrialQCQuestion : BaseFullAuditEntity { [JsonIgnore] public Trial Trial { get; set; } @@ -77,30 +77,7 @@ namespace IRaCIS.Core.Domain.Models [Required] public int ShowOrder { get; set; } - /// - /// CreateUserId - /// - [Required] - public Guid CreateUserId { get; set; } - - /// - /// CreateTime - /// - [Required] - public DateTime CreateTime { get; set; } - - /// - /// UpdateTime - /// - [Required] - public DateTime UpdateTime { get; set; } - - /// - /// UpdateUserId - /// - [Required] - public Guid UpdateUserId { get; set; } - + /// /// 是否确认 /// diff --git a/IRaCIS.Core.Domain/QC/TrialQCQuestionAnswer.cs b/IRaCIS.Core.Domain/QC/TrialQCQuestionAnswer.cs index 6dc4f6ea5..35ab4c4a1 100644 --- a/IRaCIS.Core.Domain/QC/TrialQCQuestionAnswer.cs +++ b/IRaCIS.Core.Domain/QC/TrialQCQuestionAnswer.cs @@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models ///TrialQCQuestionRecord /// [Table("TrialQCQuestionAnswer")] - public class TrialQCQuestionAnswer : Entity, IAuditUpdate, IAuditAdd + public class TrialQCQuestionAnswer : BaseFullAuditEntity { @@ -29,37 +29,7 @@ namespace IRaCIS.Core.Domain.Models [Required] public string Answer { get; set; } - /// - /// ChildAnswer - /// - //[Required] - //public string ChildAnswer { get; set; } - - - - /// - /// CreateUserId - /// - [Required] - public Guid CreateUserId { get; set; } - - /// - /// CreateTime - /// - [Required] - public DateTime CreateTime { get; set; } - - /// - /// UpdateTime - /// - [Required] - public DateTime UpdateTime { get; set; } - - /// - /// UpdateUserId - /// - [Required] - public Guid UpdateUserId { get; set; } + public TrialQCProcess QCProcessEnum { get; set; } diff --git a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectAdditionalEvaluationResult.cs b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectAdditionalEvaluationResult.cs index bb5b63628..f12dbfd64 100644 --- a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectAdditionalEvaluationResult.cs +++ b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectAdditionalEvaluationResult.cs @@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models ///SubjectAdditionalEvaluationResult /// [Table("SubjectAdditionalEvaluationResult")] - public class SubjectAdditionalEvaluationResult : Entity, IAuditUpdate, IAuditAdd + public class SubjectAdditionalEvaluationResult : BaseFullAuditEntity { @@ -33,17 +33,7 @@ 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; } diff --git a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluation.cs b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluation.cs index e7432ddcb..dc7cd2ecd 100644 --- a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluation.cs +++ b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluation.cs @@ -15,7 +15,7 @@ namespace IRaCIS.Core.Domain.Models ///SubjectCriteriaEvaluation /// [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; } - /// - /// CreateTime - /// - [Required] - public DateTime CreateTime { get; set; } - - /// - /// CreateUserId - /// - [Required] - public Guid CreateUserId { get; set; } - - /// - /// UpdateUserId - /// - [Required] - public Guid UpdateUserId { get; set; } - - /// - /// UpdateTime - /// - [Required] - public DateTime UpdateTime { get; set; } - - - - - - - - - ///// - // /// 是否影像筛选 - // /// - //[Required] - //public bool IsImageFiltering { get; set; } } diff --git a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitFilter.cs b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitFilter.cs index 91f03106c..a00ed163e 100644 --- a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitFilter.cs +++ b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitFilter.cs @@ -15,7 +15,7 @@ namespace IRaCIS.Core.Domain.Models ///SubjectCriteriaEvaluationVisitFilter /// [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; } diff --git a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitStudyFilter.cs b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitStudyFilter.cs index 68dd7aefa..bfb11784e 100644 --- a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitStudyFilter.cs +++ b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitStudyFilter.cs @@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models ///SubjectCriteriaEvaluationVisitStudyFilter /// [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; } - - } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataSystemSet.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataSystemSet.cs index 12bf5729d..148bdaef7 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataSystemSet.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataSystemSet.cs @@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models /// 临床资料系统配置 /// [Table("ClinicalDataSystemSet")] - public class ClinicalDataSystemSet : Entity, IAuditAdd + public class ClinicalDataSystemSet : BaseAuditAddEntity { /// @@ -47,15 +47,7 @@ namespace IRaCIS.Core.Domain.Models /// public ClinicalUploadType ClinicalUploadType { get; set; } - /// - /// 创建时间 - /// - public DateTime CreateTime { get; set; } - /// - /// 创建人 - /// - public Guid CreateUserId { get; set; } /// /// 是否启用 diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataTrialSet.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataTrialSet.cs index c46e93b7d..1f7081e7b 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataTrialSet.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataTrialSet.cs @@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models /// 临床资料项目配置 /// [Table("ClinicalDataTrialSet")] - public class ClinicalDataTrialSet : Entity, IAuditAdd + public class ClinicalDataTrialSet : BaseAuditAddEntity { /// @@ -54,16 +54,6 @@ namespace IRaCIS.Core.Domain.Models [ForeignKey("SystemClinicalDataSetId")] public ClinicalDataSystemSet? ClinicalDataSystemSet { get; set; } - /// - /// 创建时间 - /// - public DateTime CreateTime { get; set; } - - /// - /// 创建人 - /// - public Guid CreateUserId { get; set; } - /// /// 是否确认 /// diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalData.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalData.cs index 423d169e8..e40c42a92 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalData.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalData.cs @@ -12,7 +12,7 @@ namespace IRaCIS.Core.Domain.Models /// 项目的临床数据 /// [Table("ReadingClinicalData")] - public class ReadingClinicalData : Entity, IAuditAdd + public class ReadingClinicalData : BaseAuditAddEntity { /// /// 项目ID @@ -41,10 +41,6 @@ namespace IRaCIS.Core.Domain.Models /// xiu public bool IsVisit { get; set; } - /// - /// 创建时间 - /// - public DateTime CreateTime { get; set; } /// /// 是否签名 @@ -61,10 +57,6 @@ namespace IRaCIS.Core.Domain.Models /// public bool? IsComplete { get; set; } - /// - /// 创建人 - /// - public Guid CreateUserId { get; set; } public int FileCount { get; set; } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalDataPDF.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalDataPDF.cs index b8213b6d9..89b73fa92 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalDataPDF.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalDataPDF.cs @@ -11,7 +11,7 @@ namespace IRaCIS.Core.Domain.Models /// 项目的临床数据 /// [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; } - /// - /// 创建时间 - /// - public DateTime CreateTime { get; set; } - - /// - /// 创建人 - /// - public Guid CreateUserId { get; set; } - /// /// 大小 /// diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalData.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalData.cs index 4de50e36a..5a1a6f000 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalData.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalData.cs @@ -12,7 +12,7 @@ namespace IRaCIS.Core.Domain.Models /// 一致性分析临床数据 /// [Table("ReadingConsistentClinicalData")] - public class ReadingConsistentClinicalData : Entity, IAuditAdd + public class ReadingConsistentClinicalData : BaseAuditAddEntity { /// /// 项目ID @@ -41,10 +41,6 @@ namespace IRaCIS.Core.Domain.Models /// xiu public bool IsVisit { get; set; } - /// - /// 创建时间 - /// - public DateTime CreateTime { get; set; } /// /// 是否签名 @@ -61,10 +57,6 @@ namespace IRaCIS.Core.Domain.Models /// public bool? IsComplete { get; set; } = true; - /// - /// 创建人 - /// - public Guid CreateUserId { get; set; } public int FileCount { get; set; } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalDataPDF.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalDataPDF.cs index ab442df64..9eb8c89d9 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalDataPDF.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalDataPDF.cs @@ -11,7 +11,7 @@ namespace IRaCIS.Core.Domain.Models /// 一致性分析临床数据 /// [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; } - /// - /// 创建时间 - /// - public DateTime CreateTime { get; set; } - - /// - /// 创建人 - /// - public Guid CreateUserId { get; set; } - /// /// 大小 /// diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData/TrialClinicalDataSetCriterion.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/TrialClinicalDataSetCriterion.cs index 0ee1571a9..c141ee7c3 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalData/TrialClinicalDataSetCriterion.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalData/TrialClinicalDataSetCriterion.cs @@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models ///TrialClinicalDataSetCriterion /// [Table("TrialClinicalDataSetCriterion")] - public class TrialClinicalDataSetCriterion : Entity, IAuditUpdate, IAuditAdd + public class TrialClinicalDataSetCriterion : BaseFullAuditEntity { /// @@ -27,30 +27,6 @@ namespace IRaCIS.Core.Domain.Models /// [Required] public Guid TrialReadingCriterionId { get; set; } - - /// - /// CreateUserId - /// - [Required] - public Guid CreateUserId { get; set; } - - /// - /// CreateTime - /// - [Required] - public DateTime CreateTime { get; set; } - - /// - /// UpdateTime - /// - [Required] - public DateTime UpdateTime { get; set; } - - /// - /// UpdateUserId - /// - [Required] - public Guid UpdateUserId { get; set; } [ForeignKey("TrialClinicalDataSetId")] diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalQuestion.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalQuestion.cs index 6be623736..2cd4b9f4d 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalQuestion.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalQuestion.cs @@ -16,7 +16,7 @@ namespace IRaCIS.Core.Domain.Models ///系统临床数据问题 /// [Table("SystemClinicalQuestion")] - public class SystemClinicalQuestion : Entity, IAuditAdd + public class SystemClinicalQuestion : BaseAuditAddEntity { /// /// 项目临床数据Id @@ -93,15 +93,7 @@ namespace IRaCIS.Core.Domain.Models /// public Guid? RelevanceId { get; set; } - /// - /// 创建时间 - /// - public DateTime CreateTime { get; set; } - /// - /// 创建人 - /// - public Guid CreateUserId { get; set; } /// /// 父问题Id diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalTableQuestion.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalTableQuestion.cs index bb6248f00..97991cf4a 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalTableQuestion.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalTableQuestion.cs @@ -16,7 +16,7 @@ namespace IRaCIS.Core.Domain.Models /// 系统临床表格问题 /// [Table("SystemClinicalTableQuestion")] - public class SystemClinicalTableQuestion : Entity, IAuditAdd + public class SystemClinicalTableQuestion : BaseAuditAddEntity { /// /// 系统临床数据Id @@ -73,16 +73,7 @@ namespace IRaCIS.Core.Domain.Models /// public IsRequired IsRequired { get; set; } - /// - /// 创建时间 - /// - public DateTime CreateTime { get; set; } - - /// - /// 创建人 - /// - public Guid CreateUserId { get; set; } - + /// /// 外层问题Id /// diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalQuestion.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalQuestion.cs index e57916f05..67f6a6e82 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalQuestion.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalQuestion.cs @@ -16,7 +16,7 @@ namespace IRaCIS.Core.Domain.Models ///项目临床数据问题 /// [Table("TrialClinicalQuestion")] - public class TrialClinicalQuestion : Entity, IAuditAdd + public class TrialClinicalQuestion : BaseAuditAddEntity { /// /// 项目临床数据Id @@ -98,15 +98,7 @@ namespace IRaCIS.Core.Domain.Models /// public Guid? SystemClinicalQuestionId { get; set; } - /// - /// 创建时间 - /// - public DateTime CreateTime { get; set; } - /// - /// 创建人 - /// - public Guid CreateUserId { get; set; } /// /// 父问题Id diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalTableQuestion.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalTableQuestion.cs index 29cb863e9..1cc565235 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalTableQuestion.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalTableQuestion.cs @@ -16,7 +16,7 @@ namespace IRaCIS.Core.Domain.Models /// 项目临床表格问题 /// [Table("TrialClinicalTableQuestion")] - public class TrialClinicalTableQuestion : Entity, IAuditAdd + public class TrialClinicalTableQuestion : BaseAuditAddEntity { /// /// 项目临床数据Id @@ -73,16 +73,6 @@ namespace IRaCIS.Core.Domain.Models /// public IsRequired IsRequired { get; set; } - /// - /// 创建时间 - /// - public DateTime CreateTime { get; set; } - - /// - /// 创建人 - /// - public Guid CreateUserId { get; set; } - /// /// 外层问题Id /// diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalAnswerRowInfo.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalAnswerRowInfo.cs index 80fb5e194..f0c9fc506 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalAnswerRowInfo.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalAnswerRowInfo.cs @@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models ///ClinicalAnswerRowInfo /// [Table("ClinicalAnswerRowInfo")] - public class ClinicalAnswerRowInfo : Entity, IAuditAdd + public class ClinicalAnswerRowInfo : BaseAuditAddEntity { /// @@ -26,15 +26,6 @@ namespace IRaCIS.Core.Domain.Models /// public Guid ClinicalFormId { get; set; } - /// - /// 创建日期 - /// - public DateTime CreateTime { get; set; } - - /// - /// 创建时间 - /// - public Guid CreateUserId { get; set; } /// /// 问题Id diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalForm.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalForm.cs index 6ccb8f9cf..9242426bb 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalForm.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalForm.cs @@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models ///ClinicalForm /// [Table("ClinicalForm")] - public class ClinicalForm : Entity, IAuditAdd + public class ClinicalForm : BaseAuditAddEntity { /// @@ -34,16 +34,7 @@ namespace IRaCIS.Core.Domain.Models /// public string PicturePath { get; set; } = string.Empty; - /// - /// 创建日期 - /// - public DateTime CreateTime { get; set; } - - /// - /// 创建人 - /// - public Guid CreateUserId { get; set; } - + /// /// ClinicalDataTrialSetId /// diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalQuestionAnswer.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalQuestionAnswer.cs index 5509a155c..930dd7cbe 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalQuestionAnswer.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalQuestionAnswer.cs @@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models ///ClinicalQuestionAnswer /// [Table("ClinicalQuestionAnswer")] - public class ClinicalQuestionAnswer : Entity, IAuditAdd + public class ClinicalQuestionAnswer : BaseAuditAddEntity { /// /// 受试者Id @@ -25,15 +25,7 @@ namespace IRaCIS.Core.Domain.Models /// public Guid ClinicalFormId { get; set; } - /// - /// 创建日期 - /// - public DateTime CreateTime { get; set; } - - /// - /// 创建用户 - /// - public Guid CreateUserId { get; set; } + /// /// 问题Id diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalTableAnswer.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalTableAnswer.cs index 69cecd54d..53bfa3b57 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalTableAnswer.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalTableAnswer.cs @@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models ///ClinicalTableAnswer /// [Table("ClinicalTableAnswer")] - public class ClinicalTableAnswer : Entity, IAuditAdd + public class ClinicalTableAnswer : BaseAuditAddEntity { /// @@ -26,15 +26,6 @@ namespace IRaCIS.Core.Domain.Models /// public Guid ClinicalFormId { get; set; } - /// - /// 创建日期 - /// - public DateTime CreateTime { get; set; } - - /// - /// 创建时间 - /// - public Guid CreateUserId { get; set; } /// /// 问题Id diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ReadModuleCriterionFrom.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ReadModuleCriterionFrom.cs index f1b3105ec..fa4fc09cb 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ReadModuleCriterionFrom.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ReadModuleCriterionFrom.cs @@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models ///ReadModuleCriterionFrom /// [Table("ReadModuleCriterionFrom")] - public class ReadModuleCriterionFrom : Entity, IAuditAdd + public class ReadModuleCriterionFrom : BaseAuditAddEntity { /// @@ -37,15 +37,6 @@ namespace IRaCIS.Core.Domain.Models /// public Guid ClinicalFormId { get; set; } - /// - /// 创建人 - /// - public Guid CreateUserId { get; set; } - - /// - /// 创建时间 - /// - public DateTime CreateTime { get; set; } [JsonIgnore] [ForeignKey("ClinicalFormId")] diff --git a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicalReviewDialog.cs b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicalReviewDialog.cs index e00db79c7..c85aa24e7 100644 --- a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicalReviewDialog.cs +++ b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicalReviewDialog.cs @@ -16,7 +16,7 @@ namespace IRaCIS.Core.Domain.Models ///阅片医学审核对话 /// [Table("ReadingMedicalReviewDialog")] - public class ReadingMedicalReviewDialog : Entity, IAuditAdd + public class ReadingMedicalReviewDialog : BaseAuditAddEntity { /// /// 医学审核Id @@ -48,15 +48,6 @@ namespace IRaCIS.Core.Domain.Models /// public int UserTypeEnumInt { get; set; } - /// - /// 创建人 - /// - public Guid CreateUserId { get; set; } - - /// - /// 创建时间 - /// - public DateTime CreateTime { get; set; } /// /// 阅片人是否认同 diff --git a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineQuestionAnswer.cs b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineQuestionAnswer.cs index 4214d5ad9..1b9d7d84f 100644 --- a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineQuestionAnswer.cs +++ b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineQuestionAnswer.cs @@ -9,7 +9,7 @@ namespace IRaCIS.Core.Domain.Models /// 阅片医学问题答案 /// [Table("ReadingMedicineQuestionAnswer")] - public class ReadingMedicineQuestionAnswer : Entity, IAuditUpdate, IAuditAdd + public class ReadingMedicineQuestionAnswer : BaseFullAuditEntity { @@ -36,29 +36,7 @@ namespace IRaCIS.Core.Domain.Models public string Answer { get; set; } - /// - /// 创建人 - /// - public Guid CreateUserId { get; set; } - - /// - /// 创建时间 - /// - - public DateTime CreateTime { get; set; } - - /// - /// 修改时间 - /// - - public DateTime UpdateTime { get; set; } - - /// - /// 修改人 - /// - - public Guid UpdateUserId { get; set; } [JsonIgnore] [ForeignKey("TaskMedicalReviewId")] diff --git a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineSystemQuestion.cs b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineSystemQuestion.cs index e3daa8584..339bd236a 100644 --- a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineSystemQuestion.cs +++ b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineSystemQuestion.cs @@ -16,7 +16,7 @@ namespace IRaCIS.Core.Domain.Models /// 阅片医学审核系统问题 /// [Table("ReadingMedicineSystemQuestion")] - public class ReadingMedicineSystemQuestion : Entity, IAuditUpdate, IAuditAdd + public class ReadingMedicineSystemQuestion : BaseFullAuditEntity { /// @@ -44,11 +44,7 @@ namespace IRaCIS.Core.Domain.Models /// public bool IsRequired { get; set; } - /// - /// 创建时间 - /// - public DateTime CreateTime { get; set; } - + /// /// 排序 /// @@ -59,25 +55,13 @@ namespace IRaCIS.Core.Domain.Models /// public Guid? ParentId { get; set; } - /// - /// 更新时间 - /// - public DateTime UpdateTime { get; set; } /// /// 类型值 /// public string TypeValue { get; set; } - /// - /// 修改人 - /// - public Guid UpdateUserId { get; set; } - - /// - /// 创建人 - /// - public Guid CreateUserId { get; set; } + /// /// 是否启用 diff --git a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineTrialQuestion.cs b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineTrialQuestion.cs index e5f90f69c..cb5f30528 100644 --- a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineTrialQuestion.cs +++ b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineTrialQuestion.cs @@ -13,13 +13,10 @@ namespace IRaCIS.Core.Domain.Models ///阅片医学审核项目问题 /// [Table("ReadingMedicineTrialQuestion")] - public class ReadingMedicineTrialQuestion : Entity, IAuditUpdate, IAuditAdd + public class ReadingMedicineTrialQuestion : BaseFullAuditEntity { - /// - /// 创建时间 - /// - public DateTime CreateTime { get; set; } + /// /// 类型 @@ -41,31 +38,19 @@ namespace IRaCIS.Core.Domain.Models /// public LanguageType LanguageType { get; set; } = LanguageType.Chinese; - /// - /// 修改人 - /// - public Guid UpdateUserId { get; set; } + /// /// 类型值 /// public string TypeValue { get; set; } - /// - /// 创建人 - /// - public Guid CreateUserId { get; set; } - + /// /// 项目ID /// public Guid TrialId { get; set; } - - /// - /// 修改时间 - /// - public DateTime UpdateTime { get; set; } - + /// /// 是否启用 /// diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/CriterionNidusSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/CriterionNidusSystem.cs index c51e1e522..62d46f833 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/CriterionNidusSystem.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/CriterionNidusSystem.cs @@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models /// 标准病灶中间表 /// [Table("CriterionNidusSystem")] - public class CriterionNidusSystem : Entity, IAuditAdd + public class CriterionNidusSystem : BaseAuditAddEntity { /// @@ -33,16 +33,6 @@ namespace IRaCIS.Core.Domain.Models /// public LesionType LesionType { get; set; } - /// - /// CreateTime - /// - public DateTime CreateTime { get; set; } - - /// - /// CreateUserId - /// - public Guid CreateUserId { get; set; } - /// /// 是否是系统标准 /// diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/CriterionNidusTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/CriterionNidusTrial.cs index 7ead42443..ae6a1a3d5 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/CriterionNidusTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/CriterionNidusTrial.cs @@ -13,26 +13,13 @@ namespace IRaCIS.Core.Domain.Models ///CriterionNidusTrial /// [Table("CriterionNidusTrial")] - public class CriterionNidusTrial : Entity, IAuditAdd + public class CriterionNidusTrial : BaseAuditAddEntity { - /// - /// CriterionId - /// - [Required] + public Guid CriterionId { get; set; } - /// - /// CreateTime - /// - [Required] - public DateTime CreateTime { get; set; } - - /// - /// CreateUserId - /// - [Required] - public Guid CreateUserId { get; set; } + /// diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganInfo.cs index 9f5a469b3..65fbc6c49 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganInfo.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganInfo.cs @@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models ///OrganInfo /// [Table("OrganInfo")] - public class OrganInfo : Entity, IAuditAdd + public class OrganInfo : BaseAuditAddEntity { @@ -79,10 +79,6 @@ namespace IRaCIS.Core.Domain.Models /// public Guid SystemCriterionId { get; set; } - /// - /// 创建时间 - /// - public DateTime CreateTime { get; set; } /// /// 是否可编辑位置 @@ -94,10 +90,6 @@ namespace IRaCIS.Core.Domain.Models /// public int ShowOrder { get; set; } = 0; - /// - /// 创建人 - /// - public Guid CreateUserId { get; set; } } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganTrialInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganTrialInfo.cs index c30c673b5..36a991b2c 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganTrialInfo.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganTrialInfo.cs @@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models ///OrganTrialInfo /// [Table("OrganTrialInfo")] - public class OrganTrialInfo : Entity, IAuditAdd + public class OrganTrialInfo : BaseAuditAddEntity { /// @@ -28,15 +28,6 @@ namespace IRaCIS.Core.Domain.Models public bool IsEnable { get; set; } - /// - /// CreateTime - /// - public DateTime CreateTime { get; set; } - - /// - /// CreateUserId - /// - public Guid CreateUserId { get; set; } ///// diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingCriterionPage.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingCriterionPage.cs index 5e9590376..6c78c524e 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingCriterionPage.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingCriterionPage.cs @@ -15,7 +15,7 @@ namespace IRaCIS.Core.Domain.Models ///阅片标准分页 /// [Table("ReadingCriterionPage")] - public class ReadingCriterionPage : Entity, IAuditAdd + public class ReadingCriterionPage : BaseAuditAddEntity { /// /// 项目ID @@ -32,15 +32,7 @@ namespace IRaCIS.Core.Domain.Models /// public bool IsEnable { get; set; } - /// - /// 创建时间 - /// - public DateTime CreateTime { get; set; } - - /// - /// 创建用户ID - /// - public Guid CreateUserId { get; set; } + /// diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionSystem.cs index c7873d4c8..e3f56cf6f 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionSystem.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionSystem.cs @@ -12,7 +12,7 @@ namespace IRaCIS.Core.Domain.Models /// 系统阅片标准 /// [Table("ReadingQuestionCriterionSystem")] - public class ReadingQuestionCriterionSystem : Entity, IAuditAdd + public class ReadingQuestionCriterionSystem : BaseAuditAddEntity { /// /// 标准 @@ -34,10 +34,6 @@ namespace IRaCIS.Core.Domain.Models /// public bool IsCompleteConfig { get; set; } - /// - /// 创建时间 - /// - public DateTime CreateTime { get; set; } /// /// 确认时间 @@ -49,10 +45,7 @@ namespace IRaCIS.Core.Domain.Models /// public string Description { get; set; } - /// - /// 创建人 - /// - public Guid CreateUserId { get; set; } + /// /// 标准类型 diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs index 29ac0be3b..6996cac9c 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs @@ -12,7 +12,7 @@ namespace IRaCIS.Core.Domain.Models /// 项目阅片标准 /// [Table("ReadingQuestionCriterionTrial")] - public class ReadingQuestionCriterionTrial : Entity, IAuditAdd + public class ReadingQuestionCriterionTrial : BaseAuditAddEntity { /// /// 系统标准ID @@ -44,15 +44,7 @@ namespace IRaCIS.Core.Domain.Models /// public bool IsCompleteConfig { get; set; } - /// - /// 创建时间 - /// - public DateTime CreateTime { get; set; } - /// - /// 创建人 - /// - public Guid CreateUserId { get; set; } /// diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/SystemCriterionDictionaryCode.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/SystemCriterionDictionaryCode.cs index 89f0f97f0..9a3d887d9 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/SystemCriterionDictionaryCode.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/SystemCriterionDictionaryCode.cs @@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models ///SystemCriterionDictionaryCode /// [Table("SystemCriterionDictionaryCode")] - public class SystemCriterionDictionaryCode : Entity, IAuditAdd + public class SystemCriterionDictionaryCode : BaseAuditAddEntity { /// /// SystemCriterionId @@ -27,17 +27,7 @@ namespace IRaCIS.Core.Domain.Models [Required] public string Code { get; set; } - /// - /// CreateTime - /// - [Required] - public DateTime CreateTime { get; set; } - - /// - /// CreateUserId - /// - [Required] - public Guid CreateUserId { get; set; } + } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionAdditionalAssessmentType.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionAdditionalAssessmentType.cs index 19f324f4a..734e87cd3 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionAdditionalAssessmentType.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionAdditionalAssessmentType.cs @@ -15,7 +15,7 @@ namespace IRaCIS.Core.Domain.Models ///TrialCriterionAdditionalAssessmentType /// [Table("TrialCriterionAdditionalAssessmentType")] - public class TrialCriterionAdditionalAssessmentType : Entity, IAuditUpdate, IAuditAdd + public class TrialCriterionAdditionalAssessmentType : BaseFullAuditEntity { public ReadingQuestionCriterionTrial TrialReadingCriterion{get;set;} @@ -29,16 +29,6 @@ namespace IRaCIS.Core.Domain.Models public bool? IsSelected { get; set; } - public DateTime CreateTime { get; set; } - - - public Guid CreateUserId { get; set; } - - - public DateTime UpdateTime { get; set; } - - - public Guid UpdateUserId { get; set; } } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionDictionaryCode.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionDictionaryCode.cs index cd9a2cd8d..68b4ce336 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionDictionaryCode.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionDictionaryCode.cs @@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models ///TrialCriterionDictionaryCode /// [Table("TrialCriterionDictionaryCode")] - public class TrialCriterionDictionaryCode : Entity, IAuditAdd + public class TrialCriterionDictionaryCode : BaseAuditAddEntity { [ForeignKey("TrialCriterionId")] [JsonIgnore] @@ -31,17 +31,7 @@ namespace IRaCIS.Core.Domain.Models [Required] public string Code { get; set; } - /// - /// CreateTime - /// - [Required] - public DateTime CreateTime { get; set; } - - /// - /// CreateUserId - /// - [Required] - public Guid CreateUserId { get; set; } + } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs index bc02ee3b4..d481f0421 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs @@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models /// 系统阅片问题 /// [Table("ReadingQuestionSystem")] - public class ReadingQuestionSystem : Entity, IAuditAdd + public class ReadingQuestionSystem : BaseAuditAddEntity { /// /// 系统标准Id @@ -60,10 +60,6 @@ namespace IRaCIS.Core.Domain.Models /// public bool IsEnable { get; set; } - /// - /// 创建时间 - /// - public DateTime CreateTime { get; set; } /// /// 是否是裁判问题 @@ -131,10 +127,6 @@ namespace IRaCIS.Core.Domain.Models public string DictionaryCode { get; set; } = string.Empty; - /// - /// 创建人 - /// - public Guid CreateUserId { get; set; } /// /// 问题类型 diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs index 7bf00b885..25b574f90 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs @@ -14,7 +14,7 @@ namespace IRaCIS.Core.Domain.Models /// 项目阅片问题 /// [Table("ReadingQuestionTrial")] - public class ReadingQuestionTrial : Entity, IAuditAdd + public class ReadingQuestionTrial : BaseAuditAddEntity { public bool IsAdditional { get; set; } @@ -104,10 +104,7 @@ namespace IRaCIS.Core.Domain.Models /// public string GroupName { get; set; } = string.Empty; - /// - /// 创建时间 - /// - public DateTime CreateTime { get; set; } + /// /// 系统问题ID @@ -144,10 +141,7 @@ namespace IRaCIS.Core.Domain.Models /// public JudgeDifferenceType JudgeDifferenceType { get; set; } - /// - /// 创建人 - /// - public Guid CreateUserId { get; set; } + /// /// 标准分页Id diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingSystemCriterionDictionary.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingSystemCriterionDictionary.cs index a046c7b2c..4b52c7894 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingSystemCriterionDictionary.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingSystemCriterionDictionary.cs @@ -11,47 +11,25 @@ namespace IRaCIS.Core.Domain.Models ///ReadingCriterionDictionary /// [Table("ReadingSystemCriterionDictionary")] - public class ReadingSystemCriterionDictionary : Entity, IAuditAdd + public class ReadingSystemCriterionDictionary : BaseAuditAddEntity { - /// - /// CriterionId - /// + public Guid CriterionId { get; set; } - /// - /// DictionaryId - /// + public Guid DictionaryId { get; set; } - /// - /// CreateTime - /// - public DateTime CreateTime { get; set; } - /// - /// IsSystemCriterion - /// + + public bool IsSystemCriterion { get; set; } = false; - /// - /// ParentCode - /// public string ParentCode { get; set; } = string.Empty; - /// - /// CreateUserId - /// - public Guid CreateUserId { get; set; } - - /// - /// IsBaseLineUse - /// public bool IsBaseLineUse { get; set; } = false; - /// - /// IsBaseUse - /// + public bool IsFollowVisitUse { get; set; } = false; /// diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs index 936eff75f..8504ab606 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs @@ -16,7 +16,7 @@ namespace IRaCIS.Core.Domain.Models ///系统表格问题 /// [Table("ReadingTableQuestionSystem")] - public class ReadingTableQuestionSystem : Entity, IAuditAdd + public class ReadingTableQuestionSystem : BaseAuditAddEntity { /// @@ -64,15 +64,6 @@ namespace IRaCIS.Core.Domain.Models /// public bool IsEnable { get; set; } - /// - /// 创建时间 - /// - public DateTime CreateTime { get; set; } - - /// - /// 创建用户 - /// - public Guid CreateUserId { get; set; } /// /// 备注 diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs index fdb03ecf7..fe2b9404b 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs @@ -16,7 +16,7 @@ namespace IRaCIS.Core.Domain.Models /// 项目阅片问题 /// [Table("ReadingTableQuestionTrial")] - public class ReadingTableQuestionTrial : Entity, IAuditAdd + public class ReadingTableQuestionTrial : BaseAuditAddEntity { /// /// TrialId @@ -68,16 +68,7 @@ namespace IRaCIS.Core.Domain.Models /// public bool IsEnable { get; set; } - /// - /// CreateTime - /// - public DateTime CreateTime { get; set; } - - /// - /// CreateUserId - /// - public Guid CreateUserId { get; set; } - + /// /// Remark /// diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTrialCriterionDictionary.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTrialCriterionDictionary.cs index 7039f4836..2eeeeb5e9 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTrialCriterionDictionary.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTrialCriterionDictionary.cs @@ -13,55 +13,22 @@ namespace IRaCIS.Core.Domain.Models ///ReadingTrialCriterionDictionary /// [Table("ReadingTrialCriterionDictionary")] - public class ReadingTrialCriterionDictionary : Entity, IAuditAdd + public class ReadingTrialCriterionDictionary : BaseAuditAddEntity { - /// - /// CriterionId - /// - [Required] + public Guid CriterionId { get; set; } - - /// - /// DictionaryId - /// - [Required] + public Guid DictionaryId { get; set; } - /// - /// CreateTime - /// - [Required] - public DateTime CreateTime { get; set; } - - /// - /// CreateUserId - /// - [Required] - public Guid CreateUserId { get; set; } - /// - /// ParentCode - /// - [Required] + public string ParentCode { get; set; } = string.Empty; - - /// - /// IsBaseLineUse - /// - [Required] + public bool IsBaseLineUse { get; set; } - - /// - /// IsFollowVisitUse - /// - [Required] + public bool IsFollowVisitUse { get; set; } - - /// - /// CrterionDictionaryGroup - /// - [Required] + public CrterionDictionaryGroup CrterionDictionaryGroup { get; set; } [JsonIgnore] diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingCustomTag.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingCustomTag.cs index 88f59ce88..5aff9b283 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingCustomTag.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingCustomTag.cs @@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models ///ReadingCustomTag /// [Table("ReadingCustomTag")] - public class ReadingCustomTag : Entity, IAuditAdd + public class ReadingCustomTag : BaseAuditAddEntity { /// /// 任务Id @@ -40,15 +40,6 @@ namespace IRaCIS.Core.Domain.Models /// public string MeasureData { get; set; } - /// - /// CreateTime - /// - public DateTime CreateTime { get; set; } - - /// - /// CreateUserId - /// - public Guid CreateUserId { get; set; } public int? NumberOfFrames { get; set; } diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingGlobalTaskInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingGlobalTaskInfo.cs index b6b89f0f6..db512b224 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingGlobalTaskInfo.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingGlobalTaskInfo.cs @@ -9,7 +9,7 @@ namespace IRaCIS.Core.Domain.Models /// 阅片全局任务信息 /// [Table("ReadingGlobalTaskInfo")] - public class ReadingGlobalTaskInfo : Entity, IAuditAdd + public class ReadingGlobalTaskInfo : BaseAuditAddEntity { /// @@ -48,16 +48,7 @@ namespace IRaCIS.Core.Domain.Models public string Answer { get; set; } - /// - /// CreateTime - /// - public DateTime CreateTime { get; set; } - - /// - /// CreateUserId - /// - public Guid CreateUserId { get; set; } - + /// /// TrialId /// diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingJudgeInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingJudgeInfo.cs index 668ffabd6..98704f936 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingJudgeInfo.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingJudgeInfo.cs @@ -10,7 +10,7 @@ namespace IRaCIS.Core.Domain.Models ///阅片裁判信息 /// [Table("ReadingJudgeInfo")] - public class ReadingJudgeInfo : Entity, IAuditAdd + public class ReadingJudgeInfo : BaseAuditAddEntity { /// /// 第一个任务ID @@ -30,17 +30,7 @@ namespace IRaCIS.Core.Domain.Models [Required] public Guid JudgeTaskId { get; set; } - /// - /// 创建时间 - /// - [Required] - public DateTime CreateTime { get; set; } - - /// - /// 创建人 - /// - [Required] - public Guid CreateUserId { get; set; } + /// /// 项目ID diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingOncologyTaskInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingOncologyTaskInfo.cs index 1bd73fab7..ad7bbe582 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingOncologyTaskInfo.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingOncologyTaskInfo.cs @@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models /// 阅片肿瘤学 针对访视任务 添加了一个结果 /// [Table("ReadingOncologyTaskInfo")] - public class ReadingOncologyTaskInfo : Entity, IAuditAdd + public class ReadingOncologyTaskInfo : BaseAuditAddEntity { /// @@ -35,16 +35,7 @@ namespace IRaCIS.Core.Domain.Models /// 原因 /// public string EvaluationReason { get; set; } - - /// - /// 创建时间 - /// - public DateTime CreateTime { get; set; } - - /// - /// 创建人 - /// - public Guid CreateUserId { get; set; } + /// /// 项目Id diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs index 23d3120c4..2794831cd 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs @@ -16,7 +16,7 @@ namespace IRaCIS.Core.Domain.Models /// 表格问题答案行数据 /// [Table("ReadingTableAnswerRowInfo")] - public class ReadingTableAnswerRowInfo : Entity, IAuditAdd, IAuditUpdate, ISoftDelete + public class ReadingTableAnswerRowInfo : BaseFullAuditDeleteEntity { [JsonIgnore] [ForeignKey("InstanceId")] @@ -95,11 +95,7 @@ namespace IRaCIS.Core.Domain.Models /// MeasureData /// public string MeasureData { get; set; } = string.Empty; - - /// - /// CreateTime - /// - public DateTime CreateTime { get; set; } + /// /// 是否是当前任务添加 @@ -150,17 +146,10 @@ namespace IRaCIS.Core.Domain.Models public SplitOrMergeType? SplitOrMergeType { get; set; } - /// - /// CreateUserId - /// - public Guid CreateUserId { get; set; } public int? NumberOfFrames { get; set; } - public Guid UpdateUserId { get; set; } - //string UpdateUserName { get; set; } - public DateTime UpdateTime { get; set; } /// /// 器官Id @@ -190,11 +179,7 @@ namespace IRaCIS.Core.Domain.Models /// public string ReportMark { get; set; } = string.Empty; - public bool IsDeleted { get; set; } - - public DateTime? DeletedTime { get; set; } - - public Guid? DeleteUserId { get; set; } + public string? OtherMeasureData { get; set; } = string.Empty; diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableQuestionAnswer.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableQuestionAnswer.cs index 243942fe3..ad1f01c59 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableQuestionAnswer.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableQuestionAnswer.cs @@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models ///ReadingTableQuestionAnswer /// [Table("ReadingTableQuestionAnswer")] - public class ReadingTableQuestionAnswer : Entity, IAuditAdd, IAuditUpdate, ISoftDelete + public class ReadingTableQuestionAnswer : BaseFullAuditDeleteEntity { /// /// 问题Id @@ -46,16 +46,7 @@ namespace IRaCIS.Core.Domain.Models /// public string Answer { get; set; } - /// - /// 创建时间 - /// - public DateTime CreateTime { get; set; } - - /// - /// 创建人 - /// - public Guid CreateUserId { get; set; } - + /// /// RowId @@ -63,15 +54,7 @@ namespace IRaCIS.Core.Domain.Models public Guid RowId { get; set; } - public Guid UpdateUserId { get; set; } - public DateTime UpdateTime { get; set; } - - public bool IsDeleted { get; set; } - - public DateTime? DeletedTime { get; set; } - - public Guid? DeleteUserId { get; set; } - + [JsonIgnore] [ForeignKey("RowId")] diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionAnswer.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionAnswer.cs index ccc45dda0..6016257f1 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionAnswer.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionAnswer.cs @@ -12,7 +12,7 @@ namespace IRaCIS.Core.Domain.Models /// 阅片任务答案 /// [Table("ReadingTaskQuestionAnswer")] - public class ReadingTaskQuestionAnswer : Entity, IAuditAdd + public class ReadingTaskQuestionAnswer : BaseAuditAddEntity { /// /// 项目问题Id @@ -44,10 +44,6 @@ namespace IRaCIS.Core.Domain.Models /// public string Answer { get; set; } - /// - /// 创建时间 - /// - public DateTime CreateTime { get; set; } /// /// 全局阅片修改的答案 @@ -60,10 +56,7 @@ namespace IRaCIS.Core.Domain.Models /// public bool IsGlobalChange { get; set; } = false; - /// - /// 创建人 - /// - public Guid CreateUserId { get; set; } + [JsonIgnore] [ForeignKey("VisitTaskId")] diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionMark.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionMark.cs index 17ced3c74..d63500edf 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionMark.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionMark.cs @@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models /// /// [Table("ReadingTaskQuestionMark")] - public class ReadingTaskQuestionMark : Entity, IAuditAdd + public class ReadingTaskQuestionMark : BaseAuditAddEntity { @@ -67,15 +67,6 @@ namespace IRaCIS.Core.Domain.Models [Required] public string MeasureData { get; set; } = string.Empty; - /// - /// CreateTime - /// - public DateTime CreateTime { get; set; } - - /// - /// CreateUserId - /// - public Guid CreateUserId { get; set; } public Guid? FirstAddTaskId { get; set; } diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskRelation.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskRelation.cs index 3915730ce..62ff67329 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskRelation.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskRelation.cs @@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models ///任务关系表 /// [Table("ReadingTaskRelation")] - public class ReadingTaskRelation : Entity, IAuditAdd + public class ReadingTaskRelation : BaseAuditAddEntity { [ForeignKey("TaskId")] @@ -33,16 +33,7 @@ namespace IRaCIS.Core.Domain.Models /// 类型具体解释 看枚举 /// public RelevanceType RelevanceType { get; set; } - - /// - /// CreateTime - /// - public DateTime CreateTime { get; set; } - - /// - /// CreateUserId - /// - public Guid CreateUserId { get; set; } + diff --git a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadModule.cs b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadModule.cs index 01f8c8d24..31f52688a 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadModule.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadModule.cs @@ -12,7 +12,7 @@ namespace IRaCIS.Core.Domain.Models ///读片模块 /// [Table("ReadModule")] - public class ReadModule : Entity, IAuditAdd, IAuditUpdate, ISoftDelete + public class ReadModule : BaseFullAuditDeleteEntity { [JsonIgnore] @@ -49,15 +49,7 @@ namespace IRaCIS.Core.Domain.Models /// public Guid SubjectVisitId { get; set; } - /// - /// 创建时间 - /// - public DateTime CreateTime { get; set; } - /// - /// 创建人 - /// - public Guid CreateUserId { get; set; } /// /// 阅片计划ID @@ -71,9 +63,7 @@ namespace IRaCIS.Core.Domain.Models /// public Guid TrialId { get; set; } - public Guid UpdateUserId { get; set; } - - public DateTime UpdateTime { get; set; } + public bool IsCRCConfirm { get; set; } = false; @@ -86,11 +76,7 @@ namespace IRaCIS.Core.Domain.Models /// CRC是否正在申请撤回 /// public bool IsCRCApplicationRevoke { get; set; } = false; - public bool IsDeleted { get; set; } - - public DateTime? DeletedTime { get; set; } - - public Guid? DeleteUserId { get; set; } + /// /// 临床数据是否完整 diff --git a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodPlan.cs b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodPlan.cs index b82efd577..23ef46e1b 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodPlan.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodPlan.cs @@ -11,7 +11,7 @@ namespace IRaCIS.Core.Domain.Models /// 阅片计划 /// [Table("ReadingPeriodPlan")] - public class ReadingPeriodPlan : Entity, IAuditAdd, IAuditUpdate, ISoftDelete + public class ReadingPeriodPlan : BaseFullAuditDeleteEntity { /// @@ -38,28 +38,7 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] public ReadingPeriodSet ReadingPeriodSet { get; set; } - /// - /// 创建时间 - /// - 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 DateTime? DeletedTime { get; set; } - - public Guid? DeleteUserId { get; set; } } diff --git a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSet.cs b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSet.cs index d191a6328..5f42cfb13 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSet.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSet.cs @@ -12,7 +12,7 @@ namespace IRaCIS.Core.Domain.Models ///阅片期设置 只会设计到所有人 或者某个Site 针对全局 /// [Table("ReadingPeriodSet")] - public class ReadingPeriodSet : Entity, IAuditAdd, IAuditUpdate, ISoftDelete + public class ReadingPeriodSet : BaseFullAuditDeleteEntity { /// @@ -64,16 +64,7 @@ namespace IRaCIS.Core.Domain.Models /// public DateTime? EffectOfTime { get; set; } - /// - /// 创建时间 - /// - public DateTime CreateTime { get; set; } - - /// - /// 创建人 - /// - public Guid CreateUserId { get; set; } - + /// /// 是否为全局阅片 /// @@ -84,18 +75,7 @@ namespace IRaCIS.Core.Domain.Models /// public ReadingSetType ReadingSetType { get; set; } - public Guid UpdateUserId { get; set; } - public DateTime UpdateTime { get; set; } - - - - - public bool IsDeleted { get; set; } - - public DateTime? DeletedTime { get; set; } - - public Guid? DeleteUserId { get; set; } [JsonIgnore] public List ReadingPeriodSites { get; set; } = new List(); diff --git a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSite.cs b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSite.cs index 4250fe278..ca90985f8 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSite.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSite.cs @@ -11,7 +11,7 @@ namespace IRaCIS.Core.Domain.Models /// 阅片期和中心关联 /// [Table("ReadingPeriodSite")] - public class ReadingPeriodSite : Entity, IAuditAdd + public class ReadingPeriodSite : BaseAuditAddEntity { /// @@ -26,15 +26,7 @@ namespace IRaCIS.Core.Domain.Models public Guid TrialId { get; set; } - /// - /// 创建时间 - /// - public DateTime CreateTime { get; set; } - - /// - /// 创建人 - /// - public Guid CreateUserId { get; set; } + diff --git a/IRaCIS.Core.Domain/Reading/ShortcutKey/DefaultShortcutKey.cs b/IRaCIS.Core.Domain/Reading/ShortcutKey/DefaultShortcutKey.cs index 02e2709da..f793aa37d 100644 --- a/IRaCIS.Core.Domain/Reading/ShortcutKey/DefaultShortcutKey.cs +++ b/IRaCIS.Core.Domain/Reading/ShortcutKey/DefaultShortcutKey.cs @@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models ///ShortcutKey /// [Table("ShortcutKey")] - public class ShortcutKey : Entity, IAuditAdd + public class ShortcutKey : BaseAuditAddEntity { /// /// 对应的键盘按键 @@ -30,15 +30,6 @@ namespace IRaCIS.Core.Domain.Models /// public int ImageToolType { get; set; } - /// - /// CreateTime - /// - public DateTime CreateTime { get; set; } - - /// - /// CreateUserId - /// - public Guid CreateUserId { get; set; } public Guid UserId { get; set; } diff --git a/IRaCIS.Core.Domain/Reading/ShortcutKey/UserWLTemplate.cs b/IRaCIS.Core.Domain/Reading/ShortcutKey/UserWLTemplate.cs index c89452ee2..1922f4004 100644 --- a/IRaCIS.Core.Domain/Reading/ShortcutKey/UserWLTemplate.cs +++ b/IRaCIS.Core.Domain/Reading/ShortcutKey/UserWLTemplate.cs @@ -13,46 +13,24 @@ namespace IRaCIS.Core.Domain.Models ///UserWLTemplate /// [Table("UserWLTemplate")] - public class UserWLTemplate : Entity, IAuditAdd + public class UserWLTemplate : BaseAuditAddEntity { - /// - /// TemplateName - /// - [Required] + public string TemplateName { get; set; } - /// - /// UserId - /// - [Required] + public Guid UserId { get; set; } - /// - /// CreateTime - /// - [Required] - public DateTime CreateTime { get; set; } + - /// - /// CreateUserId - /// - [Required] - public Guid CreateUserId { get; set; } - - /// - /// WW - /// + public int WW { get; set; } - /// - /// WL - /// + public int WL { get; set; } - /// - /// ShowOrder - /// + public int ShowOrder { get; set; } = 0; /// diff --git a/IRaCIS.Core.Domain/SiteSurvey/TrialSiteEquipmentSurvey.cs b/IRaCIS.Core.Domain/SiteSurvey/TrialSiteEquipmentSurvey.cs index 883febf4b..b2d4e9095 100644 --- a/IRaCIS.Core.Domain/SiteSurvey/TrialSiteEquipmentSurvey.cs +++ b/IRaCIS.Core.Domain/SiteSurvey/TrialSiteEquipmentSurvey.cs @@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models ///TrialSiteEquipmentSurvey /// [Table("TrialSiteEquipmentSurvey")] - public class TrialSiteEquipmentSurvey : Entity, IAuditUpdate, IAuditAdd + public class TrialSiteEquipmentSurvey : BaseFullAuditEntity { [JsonIgnore] [ForeignKey("TrialSiteSurveyId")] @@ -28,52 +28,16 @@ namespace IRaCIS.Core.Domain.Models public Guid EquipmentTypeId { get; set; } - /// - /// CreateTime - /// - [Required] - public DateTime CreateTime { get; set; } + - /// - /// CreateUserId - /// - [Required] - public Guid CreateUserId { get; set; } - /// - /// UpdateTime - /// - [Required] - public DateTime UpdateTime { get; set; } - - /// - /// UpdateUserId - /// - [Required] - public Guid UpdateUserId { get; set; } - - /// - /// Parameters - /// - [Required] public string Parameters { get; set; } = string.Empty; - /// - /// ManufacturerName - /// - [Required] public string ManufacturerName { get; set; } = string.Empty; - /// - /// ScannerType - /// - [Required] + public string ScannerType { get; set; } = string.Empty; - /// - /// Note - /// - [Required] public string Note { get; set; } = string.Empty; diff --git a/IRaCIS.Core.Domain/SiteSurvey/TrialSiteSurvey.cs b/IRaCIS.Core.Domain/SiteSurvey/TrialSiteSurvey.cs index 072ca6b0e..8b378578e 100644 --- a/IRaCIS.Core.Domain/SiteSurvey/TrialSiteSurvey.cs +++ b/IRaCIS.Core.Domain/SiteSurvey/TrialSiteSurvey.cs @@ -14,7 +14,7 @@ namespace IRaCIS.Core.Domain.Models ///TrialSiteSurvey /// [Table("TrialSiteSurvey")] - public class TrialSiteSurvey : Entity, IAuditUpdate, IAuditAdd,ISoftDelete + public class TrialSiteSurvey : BaseFullAuditDeleteEntity { @@ -37,12 +37,7 @@ namespace IRaCIS.Core.Domain.Models public Trial Trial { get; set; } - public DateTime? DeletedTime { get; set; } - - - public bool IsDeleted { get; set; } - - public Guid? DeleteUserId { get; set; } + /// /// TrialId @@ -51,29 +46,7 @@ namespace IRaCIS.Core.Domain.Models public Guid TrialId { get; set; } - /// - /// CreateTime - /// - [Required] - public DateTime CreateTime { get; set; } - - /// - /// CreateUserId - /// - [Required] - public Guid CreateUserId { get; set; } - - /// - /// UpdateTime - /// - [Required] - public DateTime UpdateTime { get; set; } - - /// - /// UpdateUserId - /// - [Required] - public Guid UpdateUserId { get; set; } + /// /// UserName diff --git a/IRaCIS.Core.Domain/SiteSurvey/TrialSiteUserSurvey.cs b/IRaCIS.Core.Domain/SiteSurvey/TrialSiteUserSurvey.cs index b82f4f698..26ca94a46 100644 --- a/IRaCIS.Core.Domain/SiteSurvey/TrialSiteUserSurvey.cs +++ b/IRaCIS.Core.Domain/SiteSurvey/TrialSiteUserSurvey.cs @@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models ///TrialSiteUserSurvey /// [Table("TrialSiteUserSurvey")] - public class TrialSiteUserSurvey : Entity, IAuditUpdate, IAuditAdd + public class TrialSiteUserSurvey : BaseFullAuditEntity { [JsonIgnore] [ForeignKey("TrialSiteSurveyId")] @@ -28,37 +28,10 @@ namespace IRaCIS.Core.Domain.Models public Guid? UserTypeId { get; set; } - //public Guid TrialRoleNameId { get; set; } - - //public Dictionary TrialRoleName { get; set; } - public int? TrialRoleCode { get; set; } - /// - /// CreateTime - /// - [Required] - public DateTime CreateTime { get; set; } - - /// - /// CreateUserId - /// - [Required] - public Guid CreateUserId { get; set; } - - /// - /// UpdateTime - /// - [Required] - public DateTime UpdateTime { get; set; } - - /// - /// UpdateUserId - /// - [Required] - public Guid UpdateUserId { get; set; } - + /// /// Phone diff --git a/IRaCIS.Core.Domain/Trial/DataInspection.cs b/IRaCIS.Core.Domain/Trial/DataInspection.cs index f34eeeb51..1cf752924 100644 --- a/IRaCIS.Core.Domain/Trial/DataInspection.cs +++ b/IRaCIS.Core.Domain/Trial/DataInspection.cs @@ -12,18 +12,10 @@ namespace IRaCIS.Core.Domain.Models ///DataInspection /// [Table("DataInspection")] - public class DataInspection : Entity, IAuditAdd + public class DataInspection : BaseAuditAddEntity { - /// - /// 创建时间 - /// - public DateTime CreateTime { get; set; } - /// - /// 创建用户ID - /// - public Guid CreateUserId { get; set; } diff --git a/IRaCIS.Core.Domain/Trial/Enroll.cs b/IRaCIS.Core.Domain/Trial/Enroll.cs index b2fc7526b..7d4764112 100644 --- a/IRaCIS.Core.Domain/Trial/Enroll.cs +++ b/IRaCIS.Core.Domain/Trial/Enroll.cs @@ -6,7 +6,7 @@ using System.ComponentModel.DataAnnotations.Schema; namespace IRaCIS.Core.Domain.Models { [Table("Enroll")] - public partial class Enroll : Entity,IAuditUpdate,IAuditAdd + public partial class Enroll : BaseFullAuditEntity { [JsonIgnore] @@ -15,7 +15,6 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] public virtual Doctor Doctor { get; set; } - //public TrialPaymentPrice TrialPaymentPrice { get; set; } public Guid DoctorId { get; set; } public Guid TrialId { get; set; } @@ -30,10 +29,7 @@ namespace IRaCIS.Core.Domain.Models public int ReviewerReadingType { get; set; } = 0; - public Guid UpdateUserId { get; set; } - public DateTime UpdateTime { get; set; } = DateTime.Now; - public Guid CreateUserId { get; set; } - public DateTime CreateTime { get; set; } + public int? Training { get; set; } diff --git a/IRaCIS.Core.Domain/Trial/EnrollDetail.cs b/IRaCIS.Core.Domain/Trial/EnrollDetail.cs index c4f46c29d..191f8148d 100644 --- a/IRaCIS.Core.Domain/Trial/EnrollDetail.cs +++ b/IRaCIS.Core.Domain/Trial/EnrollDetail.cs @@ -5,7 +5,7 @@ using System.ComponentModel.DataAnnotations.Schema; namespace IRaCIS.Core.Domain.Models { [Table("EnrollDetail")] - public partial class EnrollDetail : Entity, IAuditAdd + public partial class EnrollDetail : BaseAuditAddEntity { [JsonIgnore] public virtual TrialStatusDetail TrialDetail { get; set; } @@ -15,9 +15,7 @@ namespace IRaCIS.Core.Domain.Models public EnrollStatus EnrollStatus { get; set; } public Guid? EnrollId { get; set; } public string Memo { get; set; } = string.Empty; - public Guid CreateUserId { get; set; } public int OptUserType { get; set; } - public DateTime CreateTime { get; set; } public Guid TrialDetailId { get; set; } diff --git a/IRaCIS.Core.Domain/Trial/EnrollReadingCategory.cs b/IRaCIS.Core.Domain/Trial/EnrollReadingCategory.cs index 55dd9c016..0bd9d8148 100644 --- a/IRaCIS.Core.Domain/Trial/EnrollReadingCategory.cs +++ b/IRaCIS.Core.Domain/Trial/EnrollReadingCategory.cs @@ -13,31 +13,18 @@ namespace IRaCIS.Core.Domain.Models ///EnrollReadingCategory /// [Table("EnrollReadingCategory")] - public class EnrollReadingCategory : Entity, IAuditAdd + public class EnrollReadingCategory : BaseAuditAddEntity { - /// - /// EnrollId - /// public Guid EnrollId { get; set; } - /// - /// ReadingCategory - /// + public ReadingCategory ReadingCategory { get; set; } public Guid TrialReadingCriterionId { get; set; } - /// - /// CreateUserId - /// - public Guid CreateUserId { get; set; } - - /// - /// CreateTime - /// - public DateTime CreateTime { get; set; } + [JsonIgnore] [ForeignKey("EnrollId")] diff --git a/IRaCIS.Core.Domain/Trial/Trial.cs b/IRaCIS.Core.Domain/Trial/Trial.cs index f2dc183c9..b2ee8cff8 100644 --- a/IRaCIS.Core.Domain/Trial/Trial.cs +++ b/IRaCIS.Core.Domain/Trial/Trial.cs @@ -9,7 +9,7 @@ using Newtonsoft.Json; namespace IRaCIS.Core.Domain.Models { [Table("Trial")] - public partial class Trial : Entity, IAuditUpdate, IAuditAdd, ISoftDelete + public partial class Trial : BaseFullAuditDeleteEntity { public Trial() { @@ -145,13 +145,6 @@ namespace IRaCIS.Core.Domain.Models public string MessageFromClientName { get; set; } = string.Empty; public int Expedited { get; set; } - public DateTime CreateTime { get; set; } - - public Guid CreateUserId { get; set; } - - public DateTime UpdateTime { get; set; } - - public Guid UpdateUserId { get; set; } @@ -325,7 +318,6 @@ namespace IRaCIS.Core.Domain.Models public bool IsTrialStart { get; set; } = false; - public bool IsDeleted { get; set; } //QC 问题流程 @@ -350,9 +342,6 @@ namespace IRaCIS.Core.Domain.Models public bool IsQCQuestionConfirmed { get; set; } - public DateTime? DeletedTime { get; set; } - public Guid? DeleteUserId { get; set; } - /// /// 同步临床数据时间 /// diff --git a/IRaCIS.Core.Domain/Trial/TrialBodyPart.cs b/IRaCIS.Core.Domain/Trial/TrialBodyPart.cs index 7dc64d2ab..fc8f71aad 100644 --- a/IRaCIS.Core.Domain/Trial/TrialBodyPart.cs +++ b/IRaCIS.Core.Domain/Trial/TrialBodyPart.cs @@ -14,7 +14,7 @@ namespace IRaCIS.Core.Domain.Models ///TrialBodyPart /// [Table("TrialBodyPart")] - public class TrialBodyPart : Entity, IAuditAdd + public class TrialBodyPart : BaseAuditAddEntity { public string Code { get; set; } @@ -25,9 +25,6 @@ namespace IRaCIS.Core.Domain.Models public string NameCN { get; set; } - public DateTime CreateTime { get; set; } - - public Guid CreateUserId { get; set; } public Guid TrialId { get; set; } diff --git a/IRaCIS.Core.Domain/Trial/TrialSign.cs b/IRaCIS.Core.Domain/Trial/TrialSign.cs index e0156cd22..6b14d89f2 100644 --- a/IRaCIS.Core.Domain/Trial/TrialSign.cs +++ b/IRaCIS.Core.Domain/Trial/TrialSign.cs @@ -13,29 +13,12 @@ namespace IRaCIS.Core.Domain.Models ///TrialSign /// [Table("TrialSign")] - public class TrialSign : Entity, IAuditAdd + public class TrialSign : BaseAuditAddEntity { - /// - /// CreateTime - /// - [Required] - public DateTime CreateTime { get; set; } - - /// - /// CreateUserId - /// - [Required] - public Guid CreateUserId { get; set; } - - /// - /// TrialId - /// public Guid? TrialId { get; set; } - /// - /// SubjectVisitId - /// + public Guid? SubjectVisitId { get; set; } diff --git a/IRaCIS.Core.Domain/Trial/TrialStateChange.cs b/IRaCIS.Core.Domain/Trial/TrialStateChange.cs index a7a0cbba9..b65f5c9ef 100644 --- a/IRaCIS.Core.Domain/Trial/TrialStateChange.cs +++ b/IRaCIS.Core.Domain/Trial/TrialStateChange.cs @@ -11,7 +11,7 @@ namespace IRaCIS.Core.Domain.Models ///TrialStateChange /// [Table("TrialStateChange")] - public class TrialStateChange : Entity, IAuditAdd + public class TrialStateChange : BaseAuditAddEntity { [JsonIgnore] [ForeignKey("TrialId")] @@ -28,11 +28,6 @@ namespace IRaCIS.Core.Domain.Models public string Reason { get; set; }=String.Empty; - - public DateTime CreateTime { get; set; } - - - public Guid CreateUserId { get; set; } [JsonIgnore] [ForeignKey("CreateUserId")] diff --git a/IRaCIS.Core.Domain/Trial/TrialStatusDetail.cs b/IRaCIS.Core.Domain/Trial/TrialStatusDetail.cs index d90d797a4..389b497d8 100644 --- a/IRaCIS.Core.Domain/Trial/TrialStatusDetail.cs +++ b/IRaCIS.Core.Domain/Trial/TrialStatusDetail.cs @@ -6,7 +6,7 @@ using System.ComponentModel.DataAnnotations.Schema; namespace IRaCIS.Core.Domain.Models { [Table("TrialStatus")] - public partial class TrialStatusDetail : Entity, IAuditAdd + public partial class TrialStatusDetail : BaseAuditAddEntity { public virtual ICollection IntoGroupDetails { get; set; } public TrialStatusDetail() @@ -27,9 +27,6 @@ namespace IRaCIS.Core.Domain.Models public int OptUserType { get; set; } - public Guid CreateUserId { get; set; } - - public DateTime CreateTime { get; set; } } diff --git a/IRaCIS.Core.Domain/TrialSiteUser/TrialExternalUser.cs b/IRaCIS.Core.Domain/TrialSiteUser/TrialExternalUser.cs index 297b37279..0b4496652 100644 --- a/IRaCIS.Core.Domain/TrialSiteUser/TrialExternalUser.cs +++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialExternalUser.cs @@ -13,77 +13,31 @@ namespace IRaCIS.Core.Domain.Models ///TrialExternalUser /// [Table("TrialExternalUser")] - public class TrialExternalUser : Entity, IAuditUpdate, IAuditAdd + public class TrialExternalUser : BaseFullAuditEntity { [JsonIgnore] public Trial Trial { get; set; } - /// - /// TrialId - /// - [Required] + public Guid TrialId { get; set; } public Guid UserTypeId { get; set; } - /// - /// CreateTime - /// - [Required] - public DateTime CreateTime { get; set; } - /// - /// CreateUserId - /// - [Required] - public Guid CreateUserId { get; set; } - - /// - /// UpdateTime - /// - [Required] - public DateTime UpdateTime { get; set; } - - /// - /// UpdateUserId - /// - [Required] - public Guid UpdateUserId { get; set; } - - /// - /// Phone - /// - [Required] + public string Phone { get; set; } = String.Empty; /// - /// Email - /// - [Required] + public string Email { get; set; } - /// - /// FirstName - /// - [Required] + public string FirstName { get; set; } - - /// - /// LastName - /// - [Required] + public string LastName { get; set; } - - ///// - ///// 是否存在系统用户表中 - ///// - //[Required] - //public bool IsExist { get; set; } - - public string OrganizationName { get; set; }=String.Empty; diff --git a/IRaCIS.Core.Domain/TrialSiteUser/TrialSite.cs b/IRaCIS.Core.Domain/TrialSiteUser/TrialSite.cs index 8812dd62b..9bae0745a 100644 --- a/IRaCIS.Core.Domain/TrialSiteUser/TrialSite.cs +++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialSite.cs @@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations.Schema; namespace IRaCIS.Core.Domain.Models { - public class TrialSite : Entity, IAuditAdd, IAuditUpdate,ISoftDelete + public class TrialSite : BaseFullAuditDeleteEntity { public Guid TrialId { get; set; } @@ -16,18 +16,8 @@ namespace IRaCIS.Core.Domain.Models public string TrialSiteName { get; set; } = String.Empty; public string TrialSiteAliasName { 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 IsDeleted { get; set; } - public DateTime? DeletedTime { get; set; } public DateTime? EnabledTime { get; set; } - public Guid? DeleteUserId { get; set; } - [JsonIgnore] //导航属性 [ForeignKey("SiteId")] diff --git a/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteDicomAE.cs b/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteDicomAE.cs index 1ef1446f5..8047c237c 100644 --- a/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteDicomAE.cs +++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteDicomAE.cs @@ -13,31 +13,17 @@ namespace IRaCIS.Core.Domain.Models ///TrialSiteDicomAE /// [Table("TrialSiteDicomAE")] - public class TrialSiteDicomAE : Entity, IAuditUpdate, IAuditAdd + public class TrialSiteDicomAE : BaseFullAuditDeleteEntity { - public DateTime? DeletedTime { get; set; } public Guid TrialId { get; set; } - public Guid UpdateUserId { get; set; } - - - public Guid? DeleteUserId { get; set; } - - - public DateTime CreateTime { get; set; } - - - public Guid CreateUserId { get; set; } - - public bool IsDeleted { get; set; } - - public DateTime UpdateTime { get; set; } + public Guid TrialSiteId { get; set; } diff --git a/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteUser.cs b/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteUser.cs index 4bf398bbb..1f399902a 100644 --- a/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteUser.cs +++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteUser.cs @@ -14,7 +14,7 @@ namespace IRaCIS.Core.Domain.Models ///UserTrialSite /// [Table("TrialSiteUser")] - public class TrialSiteUser : Entity, IAuditUpdate, IAuditAdd,ISoftDelete + public class TrialSiteUser : BaseFullAuditDeleteEntity { @@ -26,25 +26,7 @@ namespace IRaCIS.Core.Domain.Models [Required] - public Guid TrialId { get; set; } - - - - public DateTime UpdateTime { get; set; } - - - public DateTime CreateTime { get; set; } - - public Guid CreateUserId { get; set; } - - public Guid UpdateUserId { get; set; } - - - public bool IsDeleted { get; set; } - - public DateTime? DeletedTime { get; set; } - - public Guid? DeleteUserId { get; set; } + public Guid TrialId { get; set; } [JsonIgnore] [ForeignKey("UserId")] diff --git a/IRaCIS.Core.Domain/TrialSiteUser/TrialUser.cs b/IRaCIS.Core.Domain/TrialSiteUser/TrialUser.cs index 5bd0f4904..84955b57e 100644 --- a/IRaCIS.Core.Domain/TrialSiteUser/TrialUser.cs +++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialUser.cs @@ -9,7 +9,7 @@ namespace IRaCIS.Core.Domain.Models /// 运维人员与项目关联关系表 - 实体 /// [Table("TrialUser")] - public partial class TrialUser : Entity, IAuditUpdate, IAuditAdd ,ISoftDelete + public partial class TrialUser : BaseFullAuditDeleteEntity { public Guid UserId { get; set; } public Guid TrialId { get; set; } @@ -24,17 +24,7 @@ namespace IRaCIS.Core.Domain.Models - public Guid UpdateUserId { get; set; } - public DateTime UpdateTime { get; set; } - public Guid CreateUserId { get; set; } - public DateTime CreateTime { get; set; } - - public bool IsDeleted { get; set; } - - public DateTime? DeletedTime { get; set; } - - public Guid? DeleteUserId { get; set; } - + public DateTime? RemoveTime { get; set; } diff --git a/IRaCIS.Core.Domain/TrialSiteUser/TrialUserPreparation .cs b/IRaCIS.Core.Domain/TrialSiteUser/TrialUserPreparation .cs index 71dab10ca..7b14dccdd 100644 --- a/IRaCIS.Core.Domain/TrialSiteUser/TrialUserPreparation .cs +++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialUserPreparation .cs @@ -13,46 +13,18 @@ namespace IRaCIS.Core.Domain.Models ///TrialUserPreparation /// [Table("TrialUserPreparation ")] - public class TrialUserPreparation : Entity, IAuditUpdate, IAuditAdd + public class TrialUserPreparation : BaseFullAuditEntity { - /// - /// UserId - /// - [Required] + public Guid UserId { get; set; } - /// - /// TrialId - /// - [Required] + public Guid TrialId { get; set; } - /// - /// UpdateTime - /// - [Required] - public DateTime UpdateTime { get; set; } - - /// - /// CreateTime - /// - [Required] - public DateTime CreateTime { get; set; } - - /// - /// CreateUserId - /// - [Required] - public Guid CreateUserId { get; set; } - - /// - /// UpdateUserId - /// - [Required] - public Guid UpdateUserId { get; set; } + public DateTime? ExpireTime { get; set; } diff --git a/IRaCIS.Core.Domain/Visit/Subject.cs b/IRaCIS.Core.Domain/Visit/Subject.cs index 81c9ceb26..d574782b1 100644 --- a/IRaCIS.Core.Domain/Visit/Subject.cs +++ b/IRaCIS.Core.Domain/Visit/Subject.cs @@ -10,7 +10,7 @@ namespace IRaCIS.Core.Domain.Models /// 受试者 /// [Table("Subject")] - public class Subject : Entity, IAuditAdd, IAuditUpdate, ISoftDelete + public class Subject : BaseFullAuditDeleteEntity { [JsonIgnore] public List TaskStudyList { get; set; } = new List(); @@ -95,11 +95,6 @@ namespace IRaCIS.Core.Domain.Models - public DateTime CreateTime { get; set; } - public Guid CreateUserId { get; set; } - public DateTime UpdateTime { get; set; } - public Guid UpdateUserId { get; set; } - public string ShortName { get; set; } = String.Empty; @@ -118,10 +113,7 @@ namespace IRaCIS.Core.Domain.Models public bool IsUrgent { get; set; } - public bool IsDeleted { get; set; } - public DateTime? DeletedTime { get; set; } - - public Guid? DeleteUserId { get; set; } + public bool IsReReadingOrBackInfluenceAnalysis { get; set; } [JsonIgnore] diff --git a/IRaCIS.Core.Domain/Visit/SubjectCanceDoctor.cs b/IRaCIS.Core.Domain/Visit/SubjectCanceDoctor.cs index 558fff30b..819204cdd 100644 --- a/IRaCIS.Core.Domain/Visit/SubjectCanceDoctor.cs +++ b/IRaCIS.Core.Domain/Visit/SubjectCanceDoctor.cs @@ -13,14 +13,11 @@ namespace IRaCIS.Core.Domain.Models ///SubjectCanceDoctor /// [Table("SubjectCanceDoctor")] - public class SubjectCanceDoctor : Entity, IAuditAdd + public class SubjectCanceDoctor : BaseAuditAddEntity { public Subject Subject { get; set; } - public Guid CreateUserId { get; set; } - public DateTime CreateTime { get; set; } - public Guid SubjectId { get; set; } diff --git a/IRaCIS.Core.Domain/Visit/SubjectVisit.cs b/IRaCIS.Core.Domain/Visit/SubjectVisit.cs index 0d7364316..e6cdc1f24 100644 --- a/IRaCIS.Core.Domain/Visit/SubjectVisit.cs +++ b/IRaCIS.Core.Domain/Visit/SubjectVisit.cs @@ -7,7 +7,7 @@ using IRaCIS.Core.Domain.Share; namespace IRaCIS.Core.Domain.Models { [Table("SubjectVisit")] - public class SubjectVisit : Entity, IAuditUpdate, IAuditAdd, ISoftDelete + public class SubjectVisit : BaseFullAuditDeleteEntity { @@ -62,11 +62,6 @@ namespace IRaCIS.Core.Domain.Models /// public DateTime? LatestScanDate { get; set; } - public Guid CreateUserId { get; set; } - public DateTime CreateTime { get; set; } - public Guid UpdateUserId { get; set; } - public DateTime UpdateTime { get; set; } - public Guid? Auditor { get; set; } @@ -193,10 +188,7 @@ namespace IRaCIS.Core.Domain.Models public string CloseTheReason { get; set; } - public bool IsDeleted { get; set; } - public DateTime? DeletedTime { get; set; } - - public Guid? DeleteUserId { get; set; } + public Guid? SubmitUserId { get; set; } diff --git a/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStat.cs b/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStat.cs index 286717b27..2a1666153 100644 --- a/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStat.cs +++ b/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStat.cs @@ -13,29 +13,16 @@ namespace IRaCIS.Core.Domain.Models ///VisitPlanInfluenceStudystat /// [Table("VisitPlanInfluenceStat")] - public class VisitPlanInfluenceStat : Entity, IAuditAdd + public class VisitPlanInfluenceStat : BaseAuditAddEntity { [JsonIgnore] public List InfluenceStudyList { get; set; }=new List(); public Guid TrialId { get; set; } - /// - /// CreateTime - /// - [Required] - public DateTime CreateTime { get; set; } + - /// - /// CreateUserId - /// - [Required] - public Guid CreateUserId { get; set; } - - /// - /// InfluenceCount - /// - [Required] + public int InconsistentCount { get; set; } [JsonIgnore] diff --git a/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStudy.cs b/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStudy.cs index 05e7bd0e2..a753df5d0 100644 --- a/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStudy.cs +++ b/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStudy.cs @@ -11,7 +11,7 @@ namespace IRaCIS.Core.Domain.Models ///VisitPlanInfluenceSubjectVisit /// [Table("VisitPlanInfluenceStudy")] - public class VisitPlanInfluenceStudy : Entity, IAuditAdd + public class VisitPlanInfluenceStudy : BaseAuditAddEntity { [JsonIgnore] public SubjectVisit SubjectVisit { get; set; } @@ -32,9 +32,7 @@ namespace IRaCIS.Core.Domain.Models public string HistoryWindow { get; set; } public string NowWindow { get; set; } - public DateTime CreateTime { get; set; } - public Guid CreateUserId { get; set; } [JsonIgnore] [ForeignKey("CreateUserId")] diff --git a/IRaCIS.Core.Domain/Visit/VisitStage.cs b/IRaCIS.Core.Domain/Visit/VisitStage.cs index 2504f9cd7..e646a3184 100644 --- a/IRaCIS.Core.Domain/Visit/VisitStage.cs +++ b/IRaCIS.Core.Domain/Visit/VisitStage.cs @@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations.Schema; namespace IRaCIS.Core.Domain.Models { [Table("VisitStage")] - public class VisitStage : Entity, IAuditUpdate, IAuditAdd,ISoftDelete + public class VisitStage : BaseFullAuditDeleteEntity { [JsonIgnore] public Trial Trial { get; set; } @@ -26,22 +26,12 @@ namespace IRaCIS.Core.Domain.Models public bool IsBaseLine { get; set; } = false; - public int VisitWindowLeft { get; set; } public int VisitWindowRight { get; set; } - - public Guid CreateUserId { get; set; } - public DateTime CreateTime { get; set; } - public Guid UpdateUserId { get; set; } - public DateTime UpdateTime { get; set; } - public bool IsHaveFirstConfirmed { get; set; } - public bool IsDeleted { get; set; } - public DateTime? DeletedTime { get; set; } - public Guid? DeleteUserId { get; set; } } }