diff --git a/IRaCIS.Core.Domain/Image/DicomStudy.cs b/IRaCIS.Core.Domain/Image/DicomStudy.cs index ee9228614..06e648cac 100644 --- a/IRaCIS.Core.Domain/Image/DicomStudy.cs +++ b/IRaCIS.Core.Domain/Image/DicomStudy.cs @@ -43,6 +43,11 @@ public class DicomStudy : BaseFullDeleteAuditEntity, IEntitySeqId public int Code { get; set; } + /// + /// 检查名称 + /// + public string StudyName { get; set; } = string.Empty; + public string Description { get; set; } = null!; public int InstanceCount { get; set; } diff --git a/IRaCIS.Core.Domain/Image/NoneDicomStudy.cs b/IRaCIS.Core.Domain/Image/NoneDicomStudy.cs index 50858555a..b74d8c492 100644 --- a/IRaCIS.Core.Domain/Image/NoneDicomStudy.cs +++ b/IRaCIS.Core.Domain/Image/NoneDicomStudy.cs @@ -19,6 +19,11 @@ public class NoneDicomStudy : BaseFullDeleteAuditEntity #endregion public string StudyCode { get; set; } = string.Empty; + /// + /// 检查名称 + /// + public string StudyName { get; set; } = string.Empty; + public int FileCount { get; set; } public int Code { get; set; } diff --git a/IRaCIS.Core.Domain/Trial/Trial.cs b/IRaCIS.Core.Domain/Trial/Trial.cs index f32bcb561..1312b3857 100644 --- a/IRaCIS.Core.Domain/Trial/Trial.cs +++ b/IRaCIS.Core.Domain/Trial/Trial.cs @@ -240,6 +240,25 @@ public partial class Trial : BaseFullDeleteAuditEntity public string VitrualSiteCode { get; set; } = string.Empty; + #region 检查相关新加字段 + + /// + /// 是否显示检查名称 + /// + public bool IsShowStudyName { get; set; } = false; + + /// + /// 检查名称列表 + /// + public List StudyNameList { get; set; } = new List(); + + /// + /// 图像格式 + /// + [StringLength(2000)] + public List ImageFormatList { get; set; } = new List(); + #endregion + #region 邮件配置 [Comment("发件箱账号")] public string EmailFromEmail { get; set; } = string.Empty; @@ -290,6 +309,24 @@ public enum CollectImagesType NoneDicom = 2 } +/// +/// 检查名称 +/// + +[ComplexType] +public class StudyName +{ + /// + /// 是否选中 + /// + public bool IsChoose { get; set; } + + /// + /// 名称 + /// + public string Name { get; set; } +} + [ComplexType] public class TrialObjectNameConfig { diff --git a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs index 427a7e5cf..a19e4723c 100644 --- a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs +++ b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs @@ -84,6 +84,11 @@ public class IRaCISDBContext : DbContext { ownedNavigationBuilder.ToJson(); }); + + entity.OwnsMany(x => x.StudyNameList, ownedNavigationBuilder => + { + ownedNavigationBuilder.ToJson(); + }); }); #region pgsql codefirst 配置 暂时屏蔽