组合项目增加隐私项目 危急值函数

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

@@ -157,6 +157,32 @@ namespace Shentun.Peis.Asbitems
         ///// </summary>
         //public char IsDisablePregnancy { get; set; } 
 
+        /// <summary>
+        /// 是否启用危急值函数  Y  N
+        /// </summary>
+        public char IsCriticalValueFunction { get; set; } = 'N';
+
+        /// <summary>
+        /// 危急值函数 
+        /// </summary>
+        public string CriticalValueFunction { get; set; }
+
+
+        /// <summary>
+        /// 是否启用随访函数   Y  N
+        /// </summary>
+        public char IsFollowUpFunction { get; set; } = 'N';
+
+
+        /// <summary>
+        /// 随访函数 
+        /// </summary>
+        public string FollowUpFunction { get; set; }
+
 
+        /// <summary>
+        /// 是否隐私项目
+        /// </summary>
+        public char IsPrivacy { get; set; }
     }
 }

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

@@ -153,6 +153,31 @@ namespace Shentun.Peis.Asbitems
         ///// </summary>
         //public char IsDisablePregnancy { get; set; } = 'N';
 
+        /// <summary>
+        /// 是否启用危急值函数  Y  N
+        /// </summary>
+        public char IsCriticalValueFunction { get; set; } = 'N';
+
+        /// <summary>
+        /// 危急值函数 
+        /// </summary>
+        public string CriticalValueFunction { get; set; }
+
 
+        /// <summary>
+        /// 是否启用随访函数   Y  N
+        /// </summary>
+        public char IsFollowUpFunction { get; set; } = 'N';
+
+
+        /// <summary>
+        /// 随访函数 
+        /// </summary>
+        public string FollowUpFunction { get; set; }
+
+        /// <summary>
+        /// 是否隐私项目
+        /// </summary>
+        public char IsPrivacy { get; set; } = 'N';
     }
 }

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

@@ -150,6 +150,31 @@ namespace Shentun.Peis.Asbitems
         ///// </summary>
         //public char IsDisablePregnancy { get; set; } = 'N';
 
+        /// <summary>
+        /// 是否启用危急值函数  Y  N
+        /// </summary>
+        public char IsCriticalValueFunction { get; set; } = 'N';
+
+        /// <summary>
+        /// 危急值函数 
+        /// </summary>
+        public string CriticalValueFunction { get; set; }
+
 
+        /// <summary>
+        /// 是否启用随访函数   Y  N
+        /// </summary>
+        public char IsFollowUpFunction { get; set; } = 'N';
+
+
+        /// <summary>
+        /// 随访函数 
+        /// </summary>
+        public string FollowUpFunction { get; set; }
+
+        /// <summary>
+        /// 是否隐私项目
+        /// </summary>
+        public char IsPrivacy { get; set; } = 'N';
     }
 }

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

@@ -218,6 +218,12 @@ namespace Shentun.Peis.Models
         [Column("follow_up_function")]
         public string FollowUpFunction { get; set; }
 
+        /// <summary>
+        /// 是否隐私项目
+        /// </summary>
+        [Column("is_privacy")]
+        public char IsPrivacy { get; set; }
+
         [Column("concurrency_stamp")]
         public string ConcurrencyStamp { get; set; }
 

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

@@ -108,7 +108,12 @@ namespace Shentun.Peis.Asbitems
                 //IsDisablePregnancy = entity.IsDisablePregnancy,
                 //IsDisablePreparePregnancy = entity.IsDisablePreparePregnancy,
                 MaritalStatusId = entity.MaritalStatusId,
-                ForPregnantFlag = entity.ForPregnantFlag 
+                ForPregnantFlag = entity.ForPregnantFlag,
+                IsCriticalValueFunction = entity.IsCriticalValueFunction,
+                IsFollowUpFunction = entity.IsFollowUpFunction,
+                CriticalValueFunction = entity.CriticalValueFunction,
+                FollowUpFunction = entity.FollowUpFunction,
+                IsPrivacy = entity.IsPrivacy
             };
         }
         /// <summary>
@@ -157,7 +162,11 @@ namespace Shentun.Peis.Asbitems
             //targetEntity.IsDisablePreparePregnancy = sourceEntity.IsDisablePreparePregnancy;
             targetEntity.MaritalStatusId = sourceEntity.MaritalStatusId;
             targetEntity.ForPregnantFlag = sourceEntity.ForPregnantFlag;
-
+            targetEntity.IsCriticalValueFunction = sourceEntity.IsCriticalValueFunction;
+            targetEntity.IsFollowUpFunction = sourceEntity.IsFollowUpFunction;
+            targetEntity.CriticalValueFunction = sourceEntity.CriticalValueFunction;
+            targetEntity.FollowUpFunction = sourceEntity.FollowUpFunction;
+            targetEntity.IsPrivacy = sourceEntity.IsPrivacy;
         }
 
 
@@ -191,6 +200,9 @@ namespace Shentun.Peis.Asbitems
             {
                 throw new ArgumentException($"BarcodeMode参数为:{entity.BarcodeMode},是无效值,只能为{BarcodeModeFlag.UsingItemType},{BarcodeModeFlag.PrintPatientRegisterNumber},{BarcodeModeFlag.NoPrint}");
             }
+            DataHelper.CheckCharIsYOrN(entity.IsPrivacy, "是否隐私项目");
+            DataHelper.CheckCharIsYOrN(entity.IsCriticalValueFunction, "是否启用危急值函数");
+            DataHelper.CheckCharIsYOrN(entity.IsFollowUpFunction, "是否启用随访函数");
         }
 
 

src/Shentun.Peis.EntityFrameworkCore/DbMapping/Asbitems/AsbitemDbMapping.cs

@@ -42,6 +42,8 @@ namespace Shentun.Peis.DbMapping
             entity.Property(t => t.CriticalValueFunction).HasComment("危急值函数");
             entity.Property(t => t.IsFollowUpFunction).HasComment("是否启用随访函数").IsRequired().HasDefaultValueSql("'N'");
             entity.Property(t => t.FollowUpFunction).HasComment("随访函数");
+            entity.Property(t => t.IsPrivacy).HasComment("是否隐私项目").IsRequired().HasDefaultValueSql("'N'");
+            
             entity.Property(e => e.Id)
                 .IsFixedLength()
                 .HasComment("编号").HasColumnName("id");

src/Shentun.Peis.EntityFrameworkCore/Migrations/20240911075125_update_asbitem.cs

@@ -0,0 +1,27 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Shentun.Peis.Migrations
+{
+    public partial class update_asbitem : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<char>(
+                name: "is_privacy",
+                table: "asbitem",
+                type: "character(1)",
+                nullable: false,
+                defaultValueSql: "'N'",
+                comment: "是否隐私项目");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "is_privacy",
+                table: "asbitem");
+        }
+    }
+}

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

@@ -591,6 +591,13 @@ namespace Shentun.Peis.Migrations
                         .HasDefaultValueSql("'N'")
                         .HasComment("体检报告图片旋转90°");
 
+                    b.Property<char>("IsPrivacy")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("character(1)")
+                        .HasColumnName("is_privacy")
+                        .HasDefaultValueSql("'N'")
+                        .HasComment("是否隐私项目");
+
                     b.Property<char>("IsWebAppoint")
                         .ValueGeneratedOnAdd()
                         .HasMaxLength(1)