组合项目

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

@@ -146,7 +146,7 @@ namespace Shentun.Peis.Asbitems
         /// <summary>
         /// 备孕期间禁止检查
         /// </summary>
-        public char PregnantFlag { get; set; }
+        public char ForPregnantFlag { get; set; }
         ///// <summary>
         ///// 备孕期间禁止检查
         ///// </summary>

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

@@ -21,7 +21,11 @@ namespace Shentun.Peis.Asbitems
         /// 适用性别，M-男,F-女，A-全部
         /// </summary>
         public char ForSexId { get; set; }
+        /// <summary>
+        /// 备孕期间禁止检查
+        /// </summary>
 
+        public char ForPregnantFlag { get; set; }
         /// <summary>
         /// 婚姻状况
         /// </summary>

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

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

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

@@ -138,7 +138,7 @@ namespace Shentun.Peis.Asbitems
         /// <summary>
         /// 备孕期间禁止检查
         /// </summary>
-        public char PregnantFlag { get; set; }
+        public char ForPregnantFlag { get; set; }
 
         ///// <summary>
         ///// 备孕期间禁止检查

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 : "",

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

@@ -187,8 +187,8 @@ namespace Shentun.Peis.Models
         /// 备孕期间禁止检查
         /// </summary>
         [MaxLength(1)]
-        [Column("pregnant_flag")]
-        public char PregnantFlag { get; set; }
+        [Column("for_pregnant_flag")]
+        public char ForPregnantFlag { get; set; }
 
         ///// <summary>
         ///// 备孕期间禁止检查

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

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)