From 7d35328cba5c5e462d3838065f609502af2136c4 Mon Sep 17 00:00:00 2001 From: "DESKTOP-G961P6V\\Zhh" <839860190@qq.com> Date: Tue, 11 Jun 2024 00:41:37 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E5=90=88=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Shentun.Peis.Application.Contracts/Asbitems/AsbitemDto.cs | 2 +- .../Asbitems/BasicAsbitemDto.cs | 4 ++++ .../Asbitems/CreateAsbitemDto.cs | 2 +- .../Asbitems/UpdateAsbitemDto.cs | 2 +- src/Shentun.Peis.Application/Asbitems/AsbitemAppService.cs | 2 +- src/Shentun.Peis.Domain/Asbitems/Asbitem.cs | 4 ++-- src/Shentun.Peis.Domain/Asbitems/AsbitemManager.cs | 4 ++-- .../DbMapping/Asbitems/AsbitemDbMapping.cs | 2 +- 8 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/Shentun.Peis.Application.Contracts/Asbitems/AsbitemDto.cs b/src/Shentun.Peis.Application.Contracts/Asbitems/AsbitemDto.cs index 86a0454..79603b4 100644 --- a/src/Shentun.Peis.Application.Contracts/Asbitems/AsbitemDto.cs +++ b/src/Shentun.Peis.Application.Contracts/Asbitems/AsbitemDto.cs @@ -146,7 +146,7 @@ namespace Shentun.Peis.Asbitems /// /// 备孕期间禁止检查 /// - public char PregnantFlag { get; set; } + public char ForPregnantFlag { get; set; } ///// ///// 备孕期间禁止检查 ///// diff --git a/src/Shentun.Peis.Application.Contracts/Asbitems/BasicAsbitemDto.cs b/src/Shentun.Peis.Application.Contracts/Asbitems/BasicAsbitemDto.cs index 6678c8c..a484155 100644 --- a/src/Shentun.Peis.Application.Contracts/Asbitems/BasicAsbitemDto.cs +++ b/src/Shentun.Peis.Application.Contracts/Asbitems/BasicAsbitemDto.cs @@ -21,7 +21,11 @@ namespace Shentun.Peis.Asbitems /// 适用性别，M-男,F-女，A-全部 /// public char ForSexId { get; set; } + /// + /// 备孕期间禁止检查 + /// + public char ForPregnantFlag { get; set; } /// /// 婚姻状况 /// diff --git a/src/Shentun.Peis.Application.Contracts/Asbitems/CreateAsbitemDto.cs b/src/Shentun.Peis.Application.Contracts/Asbitems/CreateAsbitemDto.cs index e60f223..3b8eadf 100644 --- a/src/Shentun.Peis.Application.Contracts/Asbitems/CreateAsbitemDto.cs +++ b/src/Shentun.Peis.Application.Contracts/Asbitems/CreateAsbitemDto.cs @@ -141,7 +141,7 @@ namespace Shentun.Peis.Asbitems /// /// 备孕期间禁止检查 /// - public char PregnantFlag { get; set; } = 'A'; + public char ForPregnantFlag { get; set; } = 'A'; ///// ///// 备孕期间禁止检查 diff --git a/src/Shentun.Peis.Application.Contracts/Asbitems/UpdateAsbitemDto.cs b/src/Shentun.Peis.Application.Contracts/Asbitems/UpdateAsbitemDto.cs index 2705f02..c8fc1d3 100644 --- a/src/Shentun.Peis.Application.Contracts/Asbitems/UpdateAsbitemDto.cs +++ b/src/Shentun.Peis.Application.Contracts/Asbitems/UpdateAsbitemDto.cs @@ -138,7 +138,7 @@ namespace Shentun.Peis.Asbitems /// /// 备孕期间禁止检查 /// - public char PregnantFlag { get; set; } + public char ForPregnantFlag { get; set; } ///// ///// 备孕期间禁止检查 diff --git a/src/Shentun.Peis.Application/Asbitems/AsbitemAppService.cs b/src/Shentun.Peis.Application/Asbitems/AsbitemAppService.cs index 9b27362..9a70b97 100644 --- a/src/Shentun.Peis.Application/Asbitems/AsbitemAppService.cs +++ b/src/Shentun.Peis.Application/Asbitems/AsbitemAppService.cs @@ -144,7 +144,7 @@ namespace Shentun.Peis.Asbitems IsWebAppoint = s.a.IsWebAppoint, DiseaseScreeningTypeId = s.a.DiseaseScreeningTypeId, Warn = s.a.Warn, - PregnantFlag = s.a.PregnantFlag, + ForPregnantFlag = s.a.ForPregnantFlag, //IsDisablePregnancy = s.a.IsDisablePregnancy, //IsDisablePreparePregnancy = s.a.IsDisablePreparePregnancy, CreatorName = s.ab != null ? s.ab.Surname : "", diff --git a/src/Shentun.Peis.Domain/Asbitems/Asbitem.cs b/src/Shentun.Peis.Domain/Asbitems/Asbitem.cs index f5b8947..e9d6770 100644 --- a/src/Shentun.Peis.Domain/Asbitems/Asbitem.cs +++ b/src/Shentun.Peis.Domain/Asbitems/Asbitem.cs @@ -187,8 +187,8 @@ namespace Shentun.Peis.Models /// 备孕期间禁止检查 /// [MaxLength(1)] - [Column("pregnant_flag")] - public char PregnantFlag { get; set; } + [Column("for_pregnant_flag")] + public char ForPregnantFlag { get; set; } ///// ///// 备孕期间禁止检查 diff --git a/src/Shentun.Peis.Domain/Asbitems/AsbitemManager.cs b/src/Shentun.Peis.Domain/Asbitems/AsbitemManager.cs index b902799..9cdb721 100644 --- a/src/Shentun.Peis.Domain/Asbitems/AsbitemManager.cs +++ b/src/Shentun.Peis.Domain/Asbitems/AsbitemManager.cs @@ -108,7 +108,7 @@ namespace Shentun.Peis.Asbitems //IsDisablePregnancy = entity.IsDisablePregnancy, //IsDisablePreparePregnancy = entity.IsDisablePreparePregnancy, MaritalStatusId = entity.MaritalStatusId, - PregnantFlag = entity.PregnantFlag + ForPregnantFlag = entity.ForPregnantFlag }; } /// @@ -156,7 +156,7 @@ namespace Shentun.Peis.Asbitems //targetEntity.IsDisablePregnancy = sourceEntity.IsDisablePregnancy; //targetEntity.IsDisablePreparePregnancy = sourceEntity.IsDisablePreparePregnancy; targetEntity.MaritalStatusId = sourceEntity.MaritalStatusId; - targetEntity.PregnantFlag = sourceEntity.PregnantFlag; + targetEntity.ForPregnantFlag = sourceEntity.ForPregnantFlag; } diff --git a/src/Shentun.Peis.EntityFrameworkCore/DbMapping/Asbitems/AsbitemDbMapping.cs b/src/Shentun.Peis.EntityFrameworkCore/DbMapping/Asbitems/AsbitemDbMapping.cs index 5e63788..35e5f70 100644 --- a/src/Shentun.Peis.EntityFrameworkCore/DbMapping/Asbitems/AsbitemDbMapping.cs +++ b/src/Shentun.Peis.EntityFrameworkCore/DbMapping/Asbitems/AsbitemDbMapping.cs @@ -37,7 +37,7 @@ namespace Shentun.Peis.DbMapping entity.Property(t => t.IsActive).HasComment("是启用").IsRequired().HasDefaultValueSql("'Y'"); entity.Property(t => t.BarcodeMode).HasComment("条码模式").IsRequired().HasDefaultValueSql("'0'"); entity.Property(t => t.IsWebAppoint).HasComment("是否支持网上预约").IsRequired().HasDefaultValueSql("'Y'"); - entity.Property(t => t.PregnantFlag).HasComment("备怀孕期间禁止检查").IsRequired().HasDefaultValueSql("'A'"); + 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(e => e.Id)