From 3de894057f923853d64e79732046bac10eca9bd1 Mon Sep 17 00:00:00 2001
From: "DESKTOP-G961P6V\\Zhh" <839860190@qq.com>
Date: Tue, 11 Jun 2024 00:20:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E5=AD=95=E6=A0=87=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Asbitems/AsbitemDto.cs | 16 +++++++------
.../Asbitems/CreateAsbitemDto.cs | 15 ++++++++----
.../Asbitems/UpdateAsbitemDto.cs | 16 ++++++++-----
.../Asbitems/AsbitemAppService.cs | 5 ++--
src/Shentun.Peis.Domain/Asbitems/Asbitem.cs | 24 ++++++++++++-------
.../Asbitems/AsbitemManager.cs | 16 +++++++------
.../DbMapping/Asbitems/AsbitemDbMapping.cs | 5 ++--
7 files changed, 60 insertions(+), 37 deletions(-)
diff --git a/src/Shentun.Peis.Application.Contracts/Asbitems/AsbitemDto.cs b/src/Shentun.Peis.Application.Contracts/Asbitems/AsbitemDto.cs
index 9a84ae3..86a0454 100644
--- a/src/Shentun.Peis.Application.Contracts/Asbitems/AsbitemDto.cs
+++ b/src/Shentun.Peis.Application.Contracts/Asbitems/AsbitemDto.cs
@@ -143,17 +143,19 @@ namespace Shentun.Peis.Asbitems
/// 警告事项
///
public string Warn { get; set; }
-
-
///
/// 备孕期间禁止检查
///
- public char IsDisablePreparePregnancy { get; set; }
+ public char PregnantFlag { get; set; }
+ /////
+ ///// 备孕期间禁止检查
+ /////
+ //public char IsDisablePreparePregnancy { get; set; }
- ///
- /// 怀孕期间禁止检查
- ///
- public char IsDisablePregnancy { get; set; }
+ /////
+ ///// 怀孕期间禁止检查
+ /////
+ //public char IsDisablePregnancy { get; set; }
}
diff --git a/src/Shentun.Peis.Application.Contracts/Asbitems/CreateAsbitemDto.cs b/src/Shentun.Peis.Application.Contracts/Asbitems/CreateAsbitemDto.cs
index 4cbdbfb..e60f223 100644
--- a/src/Shentun.Peis.Application.Contracts/Asbitems/CreateAsbitemDto.cs
+++ b/src/Shentun.Peis.Application.Contracts/Asbitems/CreateAsbitemDto.cs
@@ -141,12 +141,17 @@ namespace Shentun.Peis.Asbitems
///
/// 备孕期间禁止检查
///
- public char IsDisablePreparePregnancy { get; set; } = 'N';
+ public char PregnantFlag { get; set; } = 'A';
- ///
- /// 怀孕期间禁止检查
- ///
- public char IsDisablePregnancy { get; set; } = 'N';
+ /////
+ ///// 备孕期间禁止检查
+ /////
+ //public char IsDisablePreparePregnancy { get; set; } = 'N';
+
+ /////
+ ///// 怀孕期间禁止检查
+ /////
+ //public char IsDisablePregnancy { get; set; } = 'N';
}
diff --git a/src/Shentun.Peis.Application.Contracts/Asbitems/UpdateAsbitemDto.cs b/src/Shentun.Peis.Application.Contracts/Asbitems/UpdateAsbitemDto.cs
index de21206..2705f02 100644
--- a/src/Shentun.Peis.Application.Contracts/Asbitems/UpdateAsbitemDto.cs
+++ b/src/Shentun.Peis.Application.Contracts/Asbitems/UpdateAsbitemDto.cs
@@ -135,16 +135,20 @@ namespace Shentun.Peis.Asbitems
///
public string Warn { get; set; }
-
///
/// 备孕期间禁止检查
///
- public char IsDisablePreparePregnancy { get; set; } = 'N';
+ public char PregnantFlag { get; set; }
- ///
- /// 怀孕期间禁止检查
- ///
- public char IsDisablePregnancy { get; set; } = 'N';
+ /////
+ ///// 备孕期间禁止检查
+ /////
+ //public char IsDisablePreparePregnancy { get; set; } = 'N';
+
+ /////
+ ///// 怀孕期间禁止检查
+ /////
+ //public char IsDisablePregnancy { get; set; } = 'N';
}
diff --git a/src/Shentun.Peis.Application/Asbitems/AsbitemAppService.cs b/src/Shentun.Peis.Application/Asbitems/AsbitemAppService.cs
index 16febae..9b27362 100644
--- a/src/Shentun.Peis.Application/Asbitems/AsbitemAppService.cs
+++ b/src/Shentun.Peis.Application/Asbitems/AsbitemAppService.cs
@@ -144,8 +144,9 @@ namespace Shentun.Peis.Asbitems
IsWebAppoint = s.a.IsWebAppoint,
DiseaseScreeningTypeId = s.a.DiseaseScreeningTypeId,
Warn = s.a.Warn,
- IsDisablePregnancy = s.a.IsDisablePregnancy,
- IsDisablePreparePregnancy = s.a.IsDisablePreparePregnancy,
+ PregnantFlag = s.a.PregnantFlag,
+ //IsDisablePregnancy = s.a.IsDisablePregnancy,
+ //IsDisablePreparePregnancy = s.a.IsDisablePreparePregnancy,
CreatorName = s.ab != null ? s.ab.Surname : "",
LastModifierName = s.ac != null ? s.ac.Surname : ""
}).OrderBy(o => o.DisplayOrder).ToList();
diff --git a/src/Shentun.Peis.Domain/Asbitems/Asbitem.cs b/src/Shentun.Peis.Domain/Asbitems/Asbitem.cs
index e1c4eb3..f5b8947 100644
--- a/src/Shentun.Peis.Domain/Asbitems/Asbitem.cs
+++ b/src/Shentun.Peis.Domain/Asbitems/Asbitem.cs
@@ -182,18 +182,26 @@ namespace Shentun.Peis.Models
[Column("warn")]
public string Warn { 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; }
+ [Column("pregnant_flag")]
+ public char PregnantFlag { 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; }
[Column("concurrency_stamp")]
public string ConcurrencyStamp { get; set; }
diff --git a/src/Shentun.Peis.Domain/Asbitems/AsbitemManager.cs b/src/Shentun.Peis.Domain/Asbitems/AsbitemManager.cs
index de2e838..b902799 100644
--- a/src/Shentun.Peis.Domain/Asbitems/AsbitemManager.cs
+++ b/src/Shentun.Peis.Domain/Asbitems/AsbitemManager.cs
@@ -105,9 +105,10 @@ namespace Shentun.Peis.Asbitems
IsWebAppoint = entity.IsWebAppoint,
Warn = entity.Warn,
DiseaseScreeningTypeId = entity.DiseaseScreeningTypeId,
- IsDisablePregnancy = entity.IsDisablePregnancy,
- IsDisablePreparePregnancy = entity.IsDisablePreparePregnancy,
- MaritalStatusId = entity.MaritalStatusId
+ //IsDisablePregnancy = entity.IsDisablePregnancy,
+ //IsDisablePreparePregnancy = entity.IsDisablePreparePregnancy,
+ MaritalStatusId = entity.MaritalStatusId,
+ PregnantFlag = entity.PregnantFlag
};
}
///
@@ -152,9 +153,10 @@ namespace Shentun.Peis.Asbitems
targetEntity.IsWebAppoint = sourceEntity.IsWebAppoint;
targetEntity.DiseaseScreeningTypeId = sourceEntity.DiseaseScreeningTypeId;
targetEntity.Warn = sourceEntity.Warn;
- targetEntity.IsDisablePregnancy = sourceEntity.IsDisablePregnancy;
- targetEntity.IsDisablePreparePregnancy = sourceEntity.IsDisablePreparePregnancy;
+ //targetEntity.IsDisablePregnancy = sourceEntity.IsDisablePregnancy;
+ //targetEntity.IsDisablePreparePregnancy = sourceEntity.IsDisablePreparePregnancy;
targetEntity.MaritalStatusId = sourceEntity.MaritalStatusId;
+ targetEntity.PregnantFlag = sourceEntity.PregnantFlag;
}
@@ -181,8 +183,8 @@ namespace Shentun.Peis.Asbitems
DataHelper.CheckCharIsYOrN(entity.IsCheck, "是否为检查项目");
DataHelper.CheckCharIsYOrN(entity.IsActive, "是否启用");
DataHelper.CheckCharIsYOrN(entity.IsWebAppoint, "是否支持网上预约");
- DataHelper.CheckCharIsYOrN(entity.IsDisablePregnancy, "是否怀孕期间禁止检查");
- DataHelper.CheckCharIsYOrN(entity.IsDisablePreparePregnancy, "是否备孕期间禁止检查");
+ //DataHelper.CheckCharIsYOrN(entity.IsDisablePregnancy, "是否怀孕期间禁止检查");
+ //DataHelper.CheckCharIsYOrN(entity.IsDisablePreparePregnancy, "是否备孕期间禁止检查");
if (entity.BarcodeMode != BarcodeModeFlag.UsingItemType
&& entity.BarcodeMode != BarcodeModeFlag.PrintPatientRegisterNumber
&& entity.BarcodeMode != BarcodeModeFlag.NoPrint)
diff --git a/src/Shentun.Peis.EntityFrameworkCore/DbMapping/Asbitems/AsbitemDbMapping.cs b/src/Shentun.Peis.EntityFrameworkCore/DbMapping/Asbitems/AsbitemDbMapping.cs
index 82b5558..e80b74f 100644
--- a/src/Shentun.Peis.EntityFrameworkCore/DbMapping/Asbitems/AsbitemDbMapping.cs
+++ b/src/Shentun.Peis.EntityFrameworkCore/DbMapping/Asbitems/AsbitemDbMapping.cs
@@ -37,8 +37,9 @@ 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.IsDisablePreparePregnancy).HasComment("备孕期间禁止检查").IsRequired().HasDefaultValueSql("'N'");
- entity.Property(t => t.IsDisablePregnancy).HasComment("怀孕期间禁止检查").IsRequired().HasDefaultValueSql("'N'");
+ entity.Property(t => t.PregnantFlag).HasComment("备怀孕期间禁止检查").IsRequired().HasDefaultValueSql("'N'");
+ //entity.Property(t => t.IsDisablePreparePregnancy).HasComment("备孕期间禁止检查").IsRequired().HasDefaultValueSql("'N'");
+ //entity.Property(t => t.IsDisablePregnancy).HasComment("怀孕期间禁止检查").IsRequired().HasDefaultValueSql("'N'");
entity.Property(e => e.Id)
.IsFixedLength()
.HasComment("编号").HasColumnName("id");