套餐

src/Shentun.Peis.Application.Contracts/MedicalPackages/BasicMedicalPackageDto.cs

@@ -23,6 +23,10 @@ namespace Shentun.Peis.MedicalPackages
         /// </summary>
         public char ForSexId { get; set; }
 
+        /// <summary>
+        /// 适用婚姻状况
+        /// </summary>
+        public char MaritalStatusId { get; set; }
 
         /// <summary>
         /// 启用标志

src/Shentun.Peis.Application.Contracts/MedicalPackages/CreateMedicalPackageDto.cs

@@ -22,6 +22,13 @@ namespace Shentun.Peis.MedicalPackages
         public char ForSexId { get; set; }
 
 
+
+        /// <summary>
+        /// 适用婚姻状况
+        /// </summary>
+        public char MaritalStatusId { get; set; } = 'A';
+
+
         /// <summary>
         /// 启用标志
         /// </summary>

src/Shentun.Peis.Application.Contracts/MedicalPackages/MedicalPackageDto.cs

@@ -25,6 +25,11 @@ namespace Shentun.Peis.MedicalPackages
         public char ForSexId { get; set; }
 
 
+        /// <summary>
+        /// 适用婚姻状况
+        /// </summary>
+        public char MaritalStatusId { get; set; }
+
         /// <summary>
         /// 启用标志
         /// </summary>

src/Shentun.Peis.Application.Contracts/MedicalPackages/UpdateMedicalPackageDto.cs

@@ -21,6 +21,11 @@ namespace Shentun.Peis.MedicalPackages
         /// </summary>
         public char ForSexId { get; set; }
 
+        /// <summary>
+        /// 适用婚姻状况
+        /// </summary>
+        public char MaritalStatusId { get; set; }
+
 
         /// <summary>
         /// 启用标志

src/Shentun.Peis.Application/MedicalPackages/MedicalPackageAppService.cs

@@ -100,6 +100,7 @@ namespace Shentun.Peis.MedicalPackages
                 LastModifierId = s.LastModifierId,
                 SimpleCode = s.SimpleCode,
                 ForSexId = s.ForSexId,
+                MaritalStatusId = s.MaritalStatusId,
                 Remark = s.Remark,
                 Price = s.Price,
                 IsActive = s.IsActive,
@@ -134,6 +135,7 @@ namespace Shentun.Peis.MedicalPackages
                 Id = s.Id,
                 SimpleCode = s.SimpleCode,
                 ForSexId = s.ForSexId,
+                MaritalStatusId = s.MaritalStatusId,
                 Remark = s.Remark,
                 Price = s.Price,
                 IsActive = s.IsActive

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

@@ -491,9 +491,9 @@ namespace Shentun.Peis.TransToWebPeis
                 foreach (var medicalPackage in medicalPackageWithDetails)
                 {
                     await WebDb.Ado.ExecuteCommandAsync("INSERT INTO public.medical_package(medical_package_id, medical_package_name, price, for_sex_id, is_active, remark, display_order, simple_code," +
-                        "concurrency_stamp,creation_time, creator_id, last_modification_time, last_modifier_id, is_web_appoint) values " +
+                        "concurrency_stamp,creation_time, creator_id, last_modification_time, last_modifier_id, is_web_appoint, marital_status_id) values " +
                         "(@medical_package_id,@medical_package_name,@price,@for_sex_id,@is_active,@remark,@display_order,@simple_code, " +
-                        "@concurrency_stamp,@creation_time,@creator_id,@last_modification_time,@last_modifier_id,@is_web_appoint)",
+                        "@concurrency_stamp,@creation_time,@creator_id,@last_modification_time,@last_modifier_id,@is_web_appoint,@marital_status_id)",
                               new List<SugarParameter>() {
                                  new SugarParameter("medical_package_id",medicalPackage.Id),
                                   new SugarParameter("medical_package_name",medicalPackage.DisplayName),
@@ -508,7 +508,8 @@ namespace Shentun.Peis.TransToWebPeis
                                   new SugarParameter("creator_id",medicalPackage.CreatorId),
                                   new SugarParameter("last_modification_time",medicalPackage.LastModificationTime),
                                   new SugarParameter("last_modifier_id",medicalPackage.LastModifierId),
-                                  new SugarParameter("is_web_appoint",medicalPackage.IsWebAppoint)
+                                  new SugarParameter("is_web_appoint",medicalPackage.IsWebAppoint),
+                                  new SugarParameter("marital_status_id",medicalPackage.MaritalStatusId)
                           });
 
                     //插入明细

src/Shentun.Peis.Domain/MedicalPackages/MedicalPackage.cs

@@ -36,6 +36,14 @@ namespace Shentun.Peis.Models
         [Column("price")]
         [Precision(10, 2)]
         public decimal Price { get; set; }
+
+        /// <summary>
+        /// 适用婚姻状况
+        /// </summary>
+        [Column("marital_status_id")]
+        [MaxLength(1)]
+        public char MaritalStatusId { get; set; }
+
         /// <summary>
         /// 适用性别
         /// </summary>

src/Shentun.Peis.Domain/MedicalPackages/MedicalPackageManager.cs

@@ -55,6 +55,7 @@ namespace Shentun.Peis.MedicalPackages
                 DisplayName = entity.DisplayName,
                 SimpleCode = LanguageConverter.GetPYSimpleCode(entity.DisplayName),
                 ForSexId = entity.ForSexId,
+                 MaritalStatusId = entity.MaritalStatusId,
                 IsActive = entity.IsActive,
                 Price = entity.Price,
                 Remark = entity.Remark,
@@ -84,6 +85,7 @@ namespace Shentun.Peis.MedicalPackages
             }
 
             targetEntity.ForSexId = sourceEntity.ForSexId;
+            targetEntity.MaritalStatusId = sourceEntity.MaritalStatusId;
             targetEntity.IsActive = sourceEntity.IsActive;
             targetEntity.Price = sourceEntity.Price;
             targetEntity.Remark = sourceEntity.Remark;
@@ -107,6 +109,20 @@ namespace Shentun.Peis.MedicalPackages
             {
                 throw new ArgumentException($"适用性别参数为:{entity.ForSexId},是无效值,只能为'{ForSexFlag.All}','{ForSexFlag.Male}','{ForSexFlag.Female}'");
             }
+
+            if (entity.MaritalStatusId != MaritalStatusFlag.All
+           && entity.MaritalStatusId != MaritalStatusFlag.UnKnown
+           && entity.MaritalStatusId != MaritalStatusFlag.UnMarried
+            && entity.MaritalStatusId != MaritalStatusFlag.Married
+             && entity.MaritalStatusId != MaritalStatusFlag.Divorce
+              && entity.MaritalStatusId != MaritalStatusFlag.Widowed
+                && entity.MaritalStatusId != MaritalStatusFlag.DivorceOrWidowed
+           )
+            {
+                throw new ArgumentException($"适用婚姻状况参数为:{entity.MaritalStatusId},是无效值,只能为'{MaritalStatusFlag.All}','{MaritalStatusFlag.UnKnown}','{MaritalStatusFlag.UnMarried}'" +
+                    $",'{MaritalStatusFlag.Married}','{MaritalStatusFlag.Divorce}','{MaritalStatusFlag.Widowed}','{MaritalStatusFlag.DivorceOrWidowed}'");
+            }
+
             DataHelper.CheckCharIsYOrN(entity.IsActive, "是否启用");
             DataHelper.CheckCharIsYOrN(entity.IsWebAppoint, "是否支持网上预约");
         }

src/Shentun.Peis.EntityFrameworkCore/DbMapping/MedicalPackages/MedicalPackageDbMapping.cs

@@ -30,6 +30,10 @@ namespace Shentun.Peis.DbMapping
                 .HasDefaultValueSql("'A'::bpchar")
                 .HasComment("适用性别").IsRequired();
 
+            entity.Property(e => e.MaritalStatusId)
+           .HasDefaultValueSql("'A'::bpchar")
+           .HasComment("适用婚姻状况").IsRequired();
+
             entity.Property(e => e.IsActive).HasComment("启用标志").IsRequired();
 
             //entity.Property(e => e.LastModificationTime).HasComment("最后修改日期");

src/Shentun.Peis.EntityFrameworkCore/Migrations/20240530043519_init20240530.cs

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

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

@@ -5712,6 +5712,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'::bpchar")
+                        .HasComment("适用婚姻状况");
+
                     b.Property<decimal>("Price")
                         .HasPrecision(10, 2)
                         .HasColumnType("numeric(10,2)")