组合项目

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) values " +
+                        "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 " +
                         "(@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)",
+                        "@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)",
                               new List<SugarParameter>() {
                                   new SugarParameter("asbitem_id",asbitem.Id),
                                   new SugarParameter("asbitem_name",asbitem.DisplayName),
@@ -467,7 +467,8 @@ namespace Shentun.Peis.TransToWebPeis
                                   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("is_disable_prepare_pregnancy",asbitem.IsDisablePreparePregnancy),
+                                  new SugarParameter("marital_status_id",asbitem.MaritalStatusId)
                           });
 
                     //插入明细

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

@@ -106,7 +106,8 @@ namespace Shentun.Peis.Asbitems
                 Warn = entity.Warn,
                 DiseaseScreeningTypeId = entity.DiseaseScreeningTypeId,
                 IsDisablePregnancy = entity.IsDisablePregnancy,
-                IsDisablePreparePregnancy = entity.IsDisablePreparePregnancy
+                IsDisablePreparePregnancy = entity.IsDisablePreparePregnancy,
+                MaritalStatusId = entity.MaritalStatusId
             };
         }
         /// <summary>
@@ -153,6 +154,8 @@ namespace Shentun.Peis.Asbitems
             targetEntity.Warn = sourceEntity.Warn;
             targetEntity.IsDisablePregnancy = sourceEntity.IsDisablePregnancy;
             targetEntity.IsDisablePreparePregnancy = sourceEntity.IsDisablePreparePregnancy;
+            targetEntity.MaritalStatusId = sourceEntity.MaritalStatusId;
+
         }
 
 
@@ -166,6 +169,7 @@ namespace Shentun.Peis.Asbitems
             DataHelper.CheckEntityIsNull(entity);
             DataHelper.CheckStringIsNull(entity.DisplayName, "名称");
             DataHelper.CheckForSex(entity.ForSexId);
+            DataHelper.CheckForMaritalStatus(entity.MaritalStatusId);
 
             DataHelper.CheckGuidIsDefaultValue(entity.ItemTypeId, "项目类别");
             DataHelper.CheckGuidIsDefaultValue(entity.CollectItemTypeId, "汇总项目类别");

src/Shentun.Peis.EntityFrameworkCore/Migrations/20240610155017_init20240610002.cs

@@ -0,0 +1,28 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Shentun.Peis.Migrations
+{
+    public partial class init20240610002 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<char>(
+                name: "marital_status_id",
+                table: "asbitem",
+                type: "character(1)",
+                maxLength: 1,
+                nullable: false,
+                defaultValueSql: "'A'",
+                comment: "适用婚姻状况，0-未婚,1-已婚，A-全部");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "marital_status_id",
+                table: "asbitem");
+        }
+    }
+}

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

@@ -634,6 +634,14 @@ namespace Shentun.Peis.Migrations
                         .HasColumnType("uuid")
                         .HasColumnName("last_modifier_id");
 
+                    b.Property<char>("MaritalStatusId")
+                        .ValueGeneratedOnAdd()
+                        .HasMaxLength(1)
+                        .HasColumnType("character(1)")
+                        .HasColumnName("marital_status_id")
+                        .HasDefaultValueSql("'A'")
+                        .HasComment("适用婚姻状况，0-未婚,1-已婚，A-全部");
+
                     b.Property<decimal>("Price")
                         .ValueGeneratedOnAdd()
                         .HasPrecision(8, 2)