Merge branch 'master' of http://140.143.162.39:3000/shentun/peis

src/Shentun.Peis.Application/TransToWebPeis/TransToWebPeisAppService.cs

@@ -438,10 +438,10 @@ namespace Shentun.Peis.TransToWebPeis
                     await WebDb.Ado.ExecuteCommandAsync("INSERT INTO public.asbitem(asbitem_id, asbitem_name, short_name, for_sex_id, item_type_id," +
                         "price, device_type_id, is_before_eat, clinical_meaning, default_result," +
                         "is_picture_rotate, is_check, is_active, simple_code, display_order, concurrency_stamp," +
-                        "creation_time, creator_id, last_modification_time, last_modifier_id, is_web_appoint,warn,disease_screening_type_id,is_disable_pregnancy,is_disable_prepare_pregnancy,marital_status_id) values " +
+                        "creation_time, creator_id, last_modification_time, last_modifier_id, is_web_appoint,warn,disease_screening_type_id,pregnant_flag,marital_status_id) values " +
                         "(@asbitem_id,@asbitem_name,@short_name,@for_sex_id,@item_type_id,@price,@device_type_id::uuid,@is_before_eat,@clinical_meaning," +
                         "@default_result,@is_picture_rotate,@is_check,@is_active,@simple_code,@display_order,@concurrency_stamp,@creation_time," +
-                        "@creator_id,@last_modification_time,@last_modifier_id,@is_web_appoint,@warn,@disease_screening_type_id::uuid,@is_disable_pregnancy,@is_disable_prepare_pregnancy,@marital_status_id)",
+                        "@creator_id,@last_modification_time,@last_modifier_id,@is_web_appoint,@warn,@disease_screening_type_id::uuid,@pregnant_flag,@marital_status_id)",
                               new List<SugarParameter>() {
                                   new SugarParameter("asbitem_id",asbitem.Id),
                                   new SugarParameter("asbitem_name",asbitem.DisplayName),
@@ -466,8 +466,7 @@ namespace Shentun.Peis.TransToWebPeis
                                   new SugarParameter("is_web_appoint",asbitem.IsWebAppoint),
                                   new SugarParameter("warn",asbitem.Warn),
                                   new SugarParameter("disease_screening_type_id",asbitem.DiseaseScreeningTypeId),
-                                  new SugarParameter("is_disable_pregnancy",asbitem.IsDisablePregnancy),
-                                  new SugarParameter("is_disable_prepare_pregnancy",asbitem.IsDisablePreparePregnancy),
+                                  new SugarParameter("pregnant_flag",asbitem.PregnantFlag),
                                   new SugarParameter("marital_status_id",asbitem.MaritalStatusId)
                           });
 

src/Shentun.Peis.EntityFrameworkCore/Migrations/20240610162717_init20240610003.cs

@@ -0,0 +1,54 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Shentun.Peis.Migrations
+{
+    public partial class init20240610003 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "is_disable_pregnancy",
+                table: "asbitem");
+
+            migrationBuilder.DropColumn(
+                name: "is_disable_prepare_pregnancy",
+                table: "asbitem");
+
+            migrationBuilder.AddColumn<char>(
+                name: "pregnant_flag",
+                table: "asbitem",
+                type: "character(1)",
+                maxLength: 1,
+                nullable: false,
+                defaultValueSql: "'A'",
+                comment: "备怀孕期间禁止检查");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "pregnant_flag",
+                table: "asbitem");
+
+            migrationBuilder.AddColumn<char>(
+                name: "is_disable_pregnancy",
+                table: "asbitem",
+                type: "character(1)",
+                maxLength: 1,
+                nullable: false,
+                defaultValueSql: "'N'",
+                comment: "怀孕期间禁止检查");
+
+            migrationBuilder.AddColumn<char>(
+                name: "is_disable_prepare_pregnancy",
+                table: "asbitem",
+                type: "character(1)",
+                maxLength: 1,
+                nullable: false,
+                defaultValueSql: "'N'",
+                comment: "备孕期间禁止检查");
+        }
+    }
+}

src/Shentun.Peis.EntityFrameworkCore/Migrations/PeisDbContextModelSnapshot.cs

@@ -578,22 +578,6 @@ namespace Shentun.Peis.Migrations
                         .HasDefaultValueSql("'N'")
                         .HasComment("启用诊断函数");
 
-                    b.Property<char>("IsDisablePregnancy")
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(1)
-                        .HasColumnType("character(1)")
-                        .HasColumnName("is_disable_pregnancy")
-                        .HasDefaultValueSql("'N'")
-                        .HasComment("怀孕期间禁止检查");
-
-                    b.Property<char>("IsDisablePreparePregnancy")
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(1)
-                        .HasColumnType("character(1)")
-                        .HasColumnName("is_disable_prepare_pregnancy")
-                        .HasDefaultValueSql("'N'")
-                        .HasComment("备孕期间禁止检查");
-
                     b.Property<char>("IsItemResultMerger")
                         .ValueGeneratedOnAdd()
                         .HasMaxLength(1)
@@ -642,6 +626,14 @@ namespace Shentun.Peis.Migrations
                         .HasDefaultValueSql("'A'")
                         .HasComment("适用婚姻状况，0-未婚,1-已婚，A-全部");
 
+                    b.Property<char>("PregnantFlag")
+                        .ValueGeneratedOnAdd()
+                        .HasMaxLength(1)
+                        .HasColumnType("character(1)")
+                        .HasColumnName("pregnant_flag")
+                        .HasDefaultValueSql("'A'")
+                        .HasComment("备怀孕期间禁止检查");
+
                     b.Property<decimal>("Price")
                         .ValueGeneratedOnAdd()
                         .HasPrecision(8, 2)