From e704ab4ba77bbc13e79d0713da50fd17934ee18f Mon Sep 17 00:00:00 2001 From: wxd <123@qq.com> Date: Fri, 26 Jul 2024 16:57:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=B1=E8=AD=A6=E5=80=BC=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Shentun.Peis.Domain/Asbitems/Asbitem.cs | 37 +++++++++++++------ .../CriticalFollowValueType.cs} | 15 ++++---- ...riticalValue.cs => CriticalFollowValue.cs} | 18 ++++++--- src/Shentun.Peis.Domain/Items/Item.cs | 37 +++++++++++++------ .../ReferenceRanges/ReferenceRange.cs | 11 +++++- .../RegisterChecks/RegisterCheck.cs | 6 +-- .../DbMapping/Asbitems/AsbitemDbMapping.cs | 6 ++- .../CriticalFollowValueTypeDbMapping.cs} | 4 +- .../CriticalValues/CriticalValueDbMapping.cs | 6 ++- .../DbMapping/Items/ItemDbMapping.cs | 5 +++ .../EntityFrameworkCore/PeisDbContext.cs | 6 +-- 11 files changed, 100 insertions(+), 51 deletions(-) rename src/Shentun.Peis.Domain/{CriticalValueTypes/CriticalValueType.cs => CriticalFollowValueTypes/CriticalFollowValueType.cs} (78%) rename src/Shentun.Peis.Domain/CriticalValues/{CriticalValue.cs => CriticalFollowValue.cs} (74%) rename src/Shentun.Peis.EntityFrameworkCore/DbMapping/{CriticalValueTypes/CriticalValueTypeDbMapping.cs => CriticalFollowValueTypes/CriticalFollowValueTypeDbMapping.cs} (83%) diff --git a/src/Shentun.Peis.Domain/Asbitems/Asbitem.cs b/src/Shentun.Peis.Domain/Asbitems/Asbitem.cs index be3181c..73fb16e 100644 --- a/src/Shentun.Peis.Domain/Asbitems/Asbitem.cs +++ b/src/Shentun.Peis.Domain/Asbitems/Asbitem.cs @@ -190,18 +190,31 @@ namespace Shentun.Peis.Models [Column("for_pregnant_flag")] public char ForPregnantFlag { get; set; } - ///// - ///// 备孕期间禁止检查 - ///// - //[MaxLength(1)] - //[Column("is_disable_prepare_pregnancy")] - //public char IsDisablePreparePregnancy { get; set; } - ///// - ///// 怀孕期间禁止检查 - ///// - //[MaxLength(1)] - //[Column("is_disable_pregnancy")] - //public char IsDisablePregnancy { get; set; } + /// + /// 是否启用危急值函数 Y N + /// + [Column("is_critical_value_function")] + public char IsCriticalValueFunction { get; set; } + + /// + /// 危急值函数 + /// + [Column("critical_value_function")] + public string CriticalValueFunction { get; set; } + + + /// + /// 是否启用随访函数 Y N + /// + [Column("is_follow_up_function")] + public char IsFollowUpFunction { get; set; } + + + /// + /// 随访函数 + /// + [Column("follow_up_function")] + public string FollowUpFunction { get; set; } [Column("concurrency_stamp")] public string ConcurrencyStamp { get; set; } diff --git a/src/Shentun.Peis.Domain/CriticalValueTypes/CriticalValueType.cs b/src/Shentun.Peis.Domain/CriticalFollowValueTypes/CriticalFollowValueType.cs similarity index 78% rename from src/Shentun.Peis.Domain/CriticalValueTypes/CriticalValueType.cs rename to src/Shentun.Peis.Domain/CriticalFollowValueTypes/CriticalFollowValueType.cs index b3cb9f7..cc78502 100644 --- a/src/Shentun.Peis.Domain/CriticalValueTypes/CriticalValueType.cs +++ b/src/Shentun.Peis.Domain/CriticalFollowValueTypes/CriticalFollowValueType.cs @@ -11,13 +11,14 @@ namespace Shentun.Peis.Models /// /// 危急值类别 /// - [Table("critical_value_type")] - [Index(nameof(DisplayName), Name = "ix_critical_value_type", IsUnique = true)] - public class CriticalValueType : AuditedEntity, IHasConcurrencyStamp + [Table("critical_follow_value_type")] + [Index(nameof(DisplayName), Name = "ix_critical_follow_value_type", IsUnique = true)] + public class CriticalFollowValueType : AuditedEntity, IHasConcurrencyStamp { - public CriticalValueType() + + public CriticalFollowValueType() { - CriticalValues = new HashSet(); + CriticalValues = new HashSet(); } /// @@ -57,8 +58,8 @@ namespace Shentun.Peis.Models //[StringLength(40)] //public string ConcurrencyStamp { get; set; } = null!; - [InverseProperty(nameof(CriticalValue.CriticalValueType))] - public virtual ICollection CriticalValues { get; set; } + [InverseProperty(nameof(CriticalFollowValue.CriticalValueType))] + public virtual ICollection CriticalValues { get; set; } //public override object[] GetKeys() //{ diff --git a/src/Shentun.Peis.Domain/CriticalValues/CriticalValue.cs b/src/Shentun.Peis.Domain/CriticalValues/CriticalFollowValue.cs similarity index 74% rename from src/Shentun.Peis.Domain/CriticalValues/CriticalValue.cs rename to src/Shentun.Peis.Domain/CriticalValues/CriticalFollowValue.cs index ea36d31..81a6d3c 100644 --- a/src/Shentun.Peis.Domain/CriticalValues/CriticalValue.cs +++ b/src/Shentun.Peis.Domain/CriticalValues/CriticalFollowValue.cs @@ -11,11 +11,11 @@ namespace Shentun.Peis.Models /// /// 危急值关键字设置 /// - [Table("critical_value")] - [Index(nameof(DisplayName), Name = "ix_critical_value", IsUnique = true)] - public class CriticalValue : AuditedEntity, IHasConcurrencyStamp + [Table("critical_follow_value")] + [Index(nameof(DisplayName), Name = "ix_critical_follow_value", IsUnique = true)] + public class CriticalFollowValue : AuditedEntity, IHasConcurrencyStamp { - + /// /// 名称 /// @@ -28,7 +28,13 @@ namespace Shentun.Peis.Models /// [Column("critical_value_type_id")] - public Guid CriticalValueTypeId { get; set; } + public Guid CriticalValueTypeId { get; set; } + + /// + /// 危急随访值标志 0-危急值，1-随访值 + /// + [Column("critical_follow_value_flag")] + public char CriticalFollowValueFlag { get; set; } [Column("display_order")] @@ -52,7 +58,7 @@ namespace Shentun.Peis.Models [ForeignKey(nameof(CriticalValueTypeId))] [InverseProperty("CriticalValues")] - public virtual CriticalValueType CriticalValueType { get; set; } = null!; + public virtual CriticalFollowValueType CriticalValueType { get; set; } = null!; //public override object[] GetKeys() //{ diff --git a/src/Shentun.Peis.Domain/Items/Item.cs b/src/Shentun.Peis.Domain/Items/Item.cs index 86c2ae8..8c24ace 100644 --- a/src/Shentun.Peis.Domain/Items/Item.cs +++ b/src/Shentun.Peis.Domain/Items/Item.cs @@ -161,17 +161,32 @@ namespace Shentun.Peis.Models public string ConcurrencyStamp { get; set; } - //[Column("last_modifier_id")] - //public Guid LastModifierId { get; set; } - //[Column("last_modification_time", TypeName = "timestamp without time zone")] - //public DateTime LastModificationTime { get; set; } - //[Column("creator_id")] - //public Guid CreatorId { get; set; } - //[Column("creation_time", TypeName = "timestamp without time zone")] - //public DateTime CreationTime { get; set; } - //[Column("concurrency_stamp")] - //[StringLength(40)] - //public string ConcurrencyStamp { get; set; } = null!; + + /// + /// 是否启用危急值函数 Y N + /// + [Column("is_critical_value_function")] + public char IsCriticalValueFunction { get; set; } + + /// + /// 危急值函数 + /// + [Column("critical_value_function")] + public string CriticalValueFunction { get; set; } + + + /// + /// 是否启用随访函数 Y N + /// + [Column("is_follow_up_function")] + public char IsFollowUpFunction { get; set; } + + + /// + /// 随访函数 + /// + [Column("follow_up_function")] + public string FollowUpFunction { get; set; } [ForeignKey(nameof(ItemTypeId))] [InverseProperty("Items")] diff --git a/src/Shentun.Peis.Domain/ReferenceRanges/ReferenceRange.cs b/src/Shentun.Peis.Domain/ReferenceRanges/ReferenceRange.cs index 9f39df8..05daf56 100644 --- a/src/Shentun.Peis.Domain/ReferenceRanges/ReferenceRange.cs +++ b/src/Shentun.Peis.Domain/ReferenceRanges/ReferenceRange.cs @@ -50,8 +50,17 @@ namespace Shentun.Peis.Models /// 危急值 /// [Column("critical_range_value")] - [StringLength(50)] + [StringLength(150)] public string? CriticalRangeValue { get; set; } + + + /// + /// 随访范围值 + /// + [Column("follow_up_range_value")] + [StringLength(150)] + public string? FollowUpRangeValue { get; set; } + /// /// 偏低诊断 /// diff --git a/src/Shentun.Peis.Domain/RegisterChecks/RegisterCheck.cs b/src/Shentun.Peis.Domain/RegisterChecks/RegisterCheck.cs index fe4257d..a6c868d 100644 --- a/src/Shentun.Peis.Domain/RegisterChecks/RegisterCheck.cs +++ b/src/Shentun.Peis.Domain/RegisterChecks/RegisterCheck.cs @@ -163,11 +163,7 @@ namespace Shentun.Peis.Models /// [Column("sign_in_time")] public DateTime? SignInTime { get; set; } - ///// - ///// 检查组合项目记录ID - ///// - //[Column("register_asbitem_id")] - //public Guid RegisterAsbitemId { get; set; } + /// /// lis审核医生 diff --git a/src/Shentun.Peis.EntityFrameworkCore/DbMapping/Asbitems/AsbitemDbMapping.cs b/src/Shentun.Peis.EntityFrameworkCore/DbMapping/Asbitems/AsbitemDbMapping.cs index 35e5f70..ea4306c 100644 --- a/src/Shentun.Peis.EntityFrameworkCore/DbMapping/Asbitems/AsbitemDbMapping.cs +++ b/src/Shentun.Peis.EntityFrameworkCore/DbMapping/Asbitems/AsbitemDbMapping.cs @@ -38,8 +38,10 @@ namespace Shentun.Peis.DbMapping entity.Property(t => t.BarcodeMode).HasComment("条码模式").IsRequired().HasDefaultValueSql("'0'"); entity.Property(t => t.IsWebAppoint).HasComment("是否支持网上预约").IsRequired().HasDefaultValueSql("'Y'"); entity.Property(t => t.ForPregnantFlag).HasComment("备怀孕期间禁止检查").IsRequired().HasDefaultValueSql("'A'"); - //entity.Property(t => t.IsDisablePreparePregnancy).HasComment("备孕期间禁止检查").IsRequired().HasDefaultValueSql("'N'"); - //entity.Property(t => t.IsDisablePregnancy).HasComment("怀孕期间禁止检查").IsRequired().HasDefaultValueSql("'N'"); + entity.Property(t => t.IsCriticalValueFunction).HasComment("是否启用危急值函数").IsRequired().HasDefaultValue("'N'"); + entity.Property(t => t.CriticalValueFunction).HasComment("危急值函数"); + entity.Property(t => t.IsFollowUpFunction).HasComment("是否启用随访函数").IsRequired().HasDefaultValue("'N'"); + entity.Property(t => t.FollowUpFunction).HasComment("随访函数"); entity.Property(e => e.Id) .IsFixedLength() .HasComment("编号").HasColumnName("id"); diff --git a/src/Shentun.Peis.EntityFrameworkCore/DbMapping/CriticalValueTypes/CriticalValueTypeDbMapping.cs b/src/Shentun.Peis.EntityFrameworkCore/DbMapping/CriticalFollowValueTypes/CriticalFollowValueTypeDbMapping.cs similarity index 83% rename from src/Shentun.Peis.EntityFrameworkCore/DbMapping/CriticalValueTypes/CriticalValueTypeDbMapping.cs rename to src/Shentun.Peis.EntityFrameworkCore/DbMapping/CriticalFollowValueTypes/CriticalFollowValueTypeDbMapping.cs index 305fdcb..2513e1b 100644 --- a/src/Shentun.Peis.EntityFrameworkCore/DbMapping/CriticalValueTypes/CriticalValueTypeDbMapping.cs +++ b/src/Shentun.Peis.EntityFrameworkCore/DbMapping/CriticalFollowValueTypes/CriticalFollowValueTypeDbMapping.cs @@ -10,9 +10,9 @@ using System.Threading.Tasks; namespace Shentun.Peis.DbMapping { - internal class CriticalValueTypeDbMapping : IEntityTypeConfiguration + internal class CriticalFollowValueTypeDbMapping : IEntityTypeConfiguration { - public void Configure(EntityTypeBuilder entity) + public void Configure(EntityTypeBuilder entity) { entity.HasComment("危急值类别"); entity.Property(t => t.DisplayName).HasComment("名称").IsRequired(); diff --git a/src/Shentun.Peis.EntityFrameworkCore/DbMapping/CriticalValues/CriticalValueDbMapping.cs b/src/Shentun.Peis.EntityFrameworkCore/DbMapping/CriticalValues/CriticalValueDbMapping.cs index ba66807..a28fc3e 100644 --- a/src/Shentun.Peis.EntityFrameworkCore/DbMapping/CriticalValues/CriticalValueDbMapping.cs +++ b/src/Shentun.Peis.EntityFrameworkCore/DbMapping/CriticalValues/CriticalValueDbMapping.cs @@ -10,14 +10,16 @@ using System.Threading.Tasks; namespace Shentun.Peis.DbMapping { - internal class CriticalValueDbMapping : IEntityTypeConfiguration + internal class CriticalValueDbMapping : IEntityTypeConfiguration { - public void Configure(EntityTypeBuilder entity) + public void Configure(EntityTypeBuilder entity) { entity.HasComment("危急值关键字设置"); entity.Property(t => t.DisplayName).HasComment("名称").IsRequired(); entity.Property(t => t.CriticalValueTypeId).HasComment("危急值类别编号").IsRequired().IsFixedLength(); + entity.Property(t => t.CriticalFollowValueFlag).HasComment("危急随访值标志").IsRequired(); + entity.Property(e => e.Id).IsFixedLength().IsRequired(); //entity.Property(e => e.CreationTime).HasDefaultValueSql("(date(timezone('UTC-8'::text, now())) - 1)"); diff --git a/src/Shentun.Peis.EntityFrameworkCore/DbMapping/Items/ItemDbMapping.cs b/src/Shentun.Peis.EntityFrameworkCore/DbMapping/Items/ItemDbMapping.cs index ca2c0d9..d4a1288 100644 --- a/src/Shentun.Peis.EntityFrameworkCore/DbMapping/Items/ItemDbMapping.cs +++ b/src/Shentun.Peis.EntityFrameworkCore/DbMapping/Items/ItemDbMapping.cs @@ -37,6 +37,11 @@ namespace Shentun.Peis.DbMapping entity.Property(t => t.IsActive).HasComment("启用").IsRequired().HasDefaultValueSql("'Y'"); entity.Property(t => t.LineModeFlag).HasComment("项目结果行模式").HasDefaultValue('2').IsRequired(); + entity.Property(t => t.IsCriticalValueFunction).HasComment("是否启用危急值函数").IsRequired().HasDefaultValue("'N'"); + entity.Property(t => t.CriticalValueFunction).HasComment("危急值函数"); + entity.Property(t => t.IsFollowUpFunction).HasComment("是否启用随访函数").IsRequired().HasDefaultValue("'N'"); + entity.Property(t => t.FollowUpFunction).HasComment("随访函数"); + entity.Property(e => e.Id).IsFixedLength(); //entity.Property(e => e.CreationTime).HasDefaultValueSql("(date(timezone('UTC-8'::text, now())) - 1)"); diff --git a/src/Shentun.Peis.EntityFrameworkCore/EntityFrameworkCore/PeisDbContext.cs b/src/Shentun.Peis.EntityFrameworkCore/EntityFrameworkCore/PeisDbContext.cs index bcff05b..347742a 100644 --- a/src/Shentun.Peis.EntityFrameworkCore/EntityFrameworkCore/PeisDbContext.cs +++ b/src/Shentun.Peis.EntityFrameworkCore/EntityFrameworkCore/PeisDbContext.cs @@ -166,8 +166,8 @@ public class PeisDbContext : public DbSet CommonCharTypes { get; set; } = null!; public DbSet ContactMethods { get; set; } = null!; public DbSet ContactPeople { get; set; } = null!; - public DbSet CriticalValues { get; set; } = null!; - public DbSet CriticalValueTypes { get; set; } = null!; + public DbSet CriticalValues { get; set; } = null!; + public DbSet CriticalValueTypes { get; set; } = null!; public DbSet CustomerOrgs { get; set; } = null!; public DbSet CustomerOrgCharges { get; set; } = null!; public DbSet CustomerOrgChargeBacks { get; set; } = null!; @@ -439,7 +439,7 @@ public class PeisDbContext : .ApplyConfiguration(new ContactMethodDbMapping()) .ApplyConfiguration(new ContactPersonDbMapping()) .ApplyConfiguration(new CriticalValueDbMapping()) - .ApplyConfiguration(new CriticalValueTypeDbMapping()) + .ApplyConfiguration(new CriticalFollowValueTypeDbMapping()) .ApplyConfiguration(new CustomerOrgDbMapping()) .ApplyConfiguration(new CustomerOrgChargeDbMapping()) .ApplyConfiguration(new CustomerOrgChargeBackDbMapping())