diff --git a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs index 6191647a6..718d90871 100644 --- a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs +++ b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs @@ -36,4 +36,21 @@ namespace IRaCIS.Core.Domain.Share.Reading /// Oncology = 4, } + + + /// + /// 受试者范围 + /// + public enum SubjectScopeEnum + { + /// + /// 全部 + /// + All=0, + + /// + /// 根据Site + /// + Site=1, + } } diff --git a/IRaCIS.Core.Domain/Reading/ReadModule.cs b/IRaCIS.Core.Domain/Reading/ReadModule.cs index 706bdfcd7..1f6700146 100644 --- a/IRaCIS.Core.Domain/Reading/ReadModule.cs +++ b/IRaCIS.Core.Domain/Reading/ReadModule.cs @@ -9,7 +9,7 @@ using IRaCIS.Core.Domain.Share.Reading; namespace IRaCIS.Core.Domain.Models { /// - ///ReadModule + ///读片模块 /// [Table("ReadModule")] public class ReadModule : Entity, IAuditAdd diff --git a/IRaCIS.Core.Domain/Reading/ReadingPeriodSet.cs b/IRaCIS.Core.Domain/Reading/ReadingPeriodSet.cs new file mode 100644 index 000000000..49982dd5a --- /dev/null +++ b/IRaCIS.Core.Domain/Reading/ReadingPeriodSet.cs @@ -0,0 +1,67 @@ + + +using System; +using IRaCIS.Core.Domain.Share; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using IRaCIS.Core.Domain.Share.Reading; + +namespace IRaCIS.Core.Domain.Models +{ + /// + ///阅片期设置 + /// + [Table("ReadingPeriodSet")] + public class ReadingPeriodSet : Entity, IAuditAdd + { + + /// + /// 项目ID + /// + public Guid? TrialId { get; set; } + + /// + /// 阅片期名称 + /// + public string ReadingPeriodName { get; set; } + + /// + /// 受试者范围 + /// + public SubjectScopeEnum? SubjectScope { get; set; } + + /// + /// 范围ID + /// + public Guid? ScopeId { get; set; } + + /// + /// 截止日期 + /// + public DateTime ExpirationDate { get; set; } + + /// + /// 截止访视 + /// + public decimal ExpirationVisit { get; set; } + + /// + /// 状态 + /// + public int? Status { get; set; } + + /// + /// 创建时间 + /// + public DateTime CreateTime { get; set; } + + /// + /// 创建人 + /// + public Guid CreateUserId { get; set; } + + } + + + +} diff --git a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs index c2316a26a..6e8316eaa 100644 --- a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs +++ b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs @@ -168,6 +168,15 @@ namespace IRaCIS.Core.Infra.EFCore public virtual DbSet EnrollDetails { get; set; } + + + #endregion + + + #region Reading + public virtual DbSet ReadingPeriodSet { get; set; } + + public virtual DbSet ReadModule { get; set; } #endregion #region Subject and Visit and study