备孕标志

src/Shentun.Peis.Application.Contracts/Asbitems/AsbitemDto.cs

@@ -143,17 +143,19 @@ namespace Shentun.Peis.Asbitems
         /// 警告事项
         /// </summary>
         public string Warn { get; set; }
-
-
         /// <summary>
         /// 备孕期间禁止检查
         /// </summary>
-        public char IsDisablePreparePregnancy { get; set; }
+        public char PregnantFlag { get; set; }
+        ///// <summary>
+        ///// 备孕期间禁止检查
+        ///// </summary>
+        //public char IsDisablePreparePregnancy { get; set; }
 
-        /// <summary>
-        /// 怀孕期间禁止检查
-        /// </summary>
-        public char IsDisablePregnancy { get; set; } 
+        ///// <summary>
+        ///// 怀孕期间禁止检查
+        ///// </summary>
+        //public char IsDisablePregnancy { get; set; } 
 
 
     }

src/Shentun.Peis.Application.Contracts/Asbitems/CreateAsbitemDto.cs

@@ -141,12 +141,17 @@ namespace Shentun.Peis.Asbitems
         /// <summary>
         /// 备孕期间禁止检查
         /// </summary>
-        public char IsDisablePreparePregnancy { get; set; } = 'N';
+        public char PregnantFlag { get; set; } = 'A';
 
-        /// <summary>
-        /// 怀孕期间禁止检查
-        /// </summary>
-        public char IsDisablePregnancy { get; set; } = 'N';
+        ///// <summary>
+        ///// 备孕期间禁止检查
+        ///// </summary>
+        //public char IsDisablePreparePregnancy { get; set; } = 'N';
+
+        ///// <summary>
+        ///// 怀孕期间禁止检查
+        ///// </summary>
+        //public char IsDisablePregnancy { get; set; } = 'N';
 
 
     }

src/Shentun.Peis.Application.Contracts/Asbitems/UpdateAsbitemDto.cs

@@ -135,16 +135,20 @@ namespace Shentun.Peis.Asbitems
         /// </summary>
         public string Warn { get; set; }
 
-
         /// <summary>
         /// 备孕期间禁止检查
         /// </summary>
-        public char IsDisablePreparePregnancy { get; set; } = 'N';
+        public char PregnantFlag { get; set; }
 
-        /// <summary>
-        /// 怀孕期间禁止检查
-        /// </summary>
-        public char IsDisablePregnancy { get; set; } = 'N';
+        ///// <summary>
+        ///// 备孕期间禁止检查
+        ///// </summary>
+        //public char IsDisablePreparePregnancy { get; set; } = 'N';
+
+        ///// <summary>
+        ///// 怀孕期间禁止检查
+        ///// </summary>
+        //public char IsDisablePregnancy { get; set; } = 'N';
 
 
     }

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();

src/Shentun.Peis.Domain/Asbitems/Asbitem.cs

@@ -182,18 +182,26 @@ namespace Shentun.Peis.Models
         [Column("warn")]
         public string Warn { get; set; }
 
+
         /// <summary>
         /// 备孕期间禁止检查
         /// </summary>
         [MaxLength(1)]
-        [Column("is_disable_prepare_pregnancy")]
-        public char IsDisablePreparePregnancy { get; set; }
-        /// <summary>
-        /// 怀孕期间禁止检查
-        /// </summary>
-        [MaxLength(1)]
-        [Column("is_disable_pregnancy")]
-        public char IsDisablePregnancy { get; set; }
+        [Column("pregnant_flag")]
+        public char PregnantFlag { get; set; }
+
+        ///// <summary>
+        ///// 备孕期间禁止检查
+        ///// </summary>
+        //[MaxLength(1)]
+        //[Column("is_disable_prepare_pregnancy")]
+        //public char IsDisablePreparePregnancy { get; set; }
+        ///// <summary>
+        ///// 怀孕期间禁止检查
+        ///// </summary>
+        //[MaxLength(1)]
+        //[Column("is_disable_pregnancy")]
+        //public char IsDisablePregnancy { get; set; }
 
         [Column("concurrency_stamp")]
         public string ConcurrencyStamp { get; set; }

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 
             };
         }
         /// <summary>
@@ -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)

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");