组合项目

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

@@ -141,5 +141,16 @@ namespace Shentun.Peis.Asbitems
         public string Warn { get; set; }
 
 
+        /// <summary>
+        /// 备孕期间禁止检查
+        /// </summary>
+        public char IsDisablePreparePregnancy { get; set; }
+
+        /// <summary>
+        /// 怀孕期间禁止检查
+        /// </summary>
+        public char IsDisablePregnancy { get; set; } 
+
+
     }
 }

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

@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
 using System.Text;
 
 namespace Shentun.Peis.Asbitems
@@ -131,6 +133,16 @@ namespace Shentun.Peis.Asbitems
         /// </summary>
         public string Warn { get; set; }
 
+        /// <summary>
+        /// 备孕期间禁止检查
+        /// </summary>
+        public char IsDisablePreparePregnancy { get; set; } = 'N';
+
+        /// <summary>
+        /// 怀孕期间禁止检查
+        /// </summary>
+        public char IsDisablePregnancy { get; set; } = 'N';
+
 
     }
 }

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

@@ -132,5 +132,16 @@ namespace Shentun.Peis.Asbitems
         public string Warn { get; set; }
 
 
+        /// <summary>
+        /// 备孕期间禁止检查
+        /// </summary>
+        public char IsDisablePreparePregnancy { get; set; } = 'N';
+
+        /// <summary>
+        /// 怀孕期间禁止检查
+        /// </summary>
+        public char IsDisablePregnancy { get; set; } = 'N';
+
+
     }
 }

src/Shentun.Peis.Application/Asbitems/AsbitemAppService.cs

@@ -144,6 +144,8 @@ namespace Shentun.Peis.Asbitems
                 IsWebAppoint = s.a.IsWebAppoint,
                 DiseaseScreeningTypeId = s.a.DiseaseScreeningTypeId,
                 Warn = s.a.Warn,
+                IsDisablePregnancy = s.a.IsDisablePregnancy,
+                IsDisablePreparePregnancy = s.a.IsDisablePreparePregnancy,
                 CreatorName = s.ab != null ? s.ab.Surname : "",
                 LastModifierName = s.ac != null ? s.ac.Surname : ""
             }).OrderBy(o => o.DisplayOrder).ToList();

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

@@ -429,10 +429,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) 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) 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)",
+                        "@creator_id,@last_modification_time,@last_modifier_id,@is_web_appoint,@warn,@disease_screening_type_id::uuid,@is_disable_pregnancy,@is_disable_prepare_pregnancy)",
                               new List<SugarParameter>() {
                                   new SugarParameter("asbitem_id",asbitem.Id),
                                   new SugarParameter("asbitem_name",asbitem.DisplayName),
@@ -456,7 +456,9 @@ namespace Shentun.Peis.TransToWebPeis
                                   new SugarParameter("last_modifier_id",asbitem.LastModifierId),
                                   new SugarParameter("is_web_appoint",asbitem.IsWebAppoint),
                                   new SugarParameter("warn",asbitem.Warn),
-                                  new SugarParameter("disease_screening_type_id",asbitem.DiseaseScreeningTypeId)
+                                  new SugarParameter("disease_screening_type_id",asbitem.DiseaseScreeningTypeId),
+                                  new SugarParameter("is_disable_pregnancy",asbitem.IsDisablePregnancy),
+                                  new SugarParameter("is_disable_prepare_pregnancy",asbitem.IsDisablePreparePregnancy)
                           });
 
                     //插入明细

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

@@ -12,6 +12,7 @@ using System.Linq;
 //using System.Linq.Dynamic.Core;
 using System.Threading.Tasks;
 using Volo.Abp;
+using Volo.Abp.Domain.Entities;
 using Volo.Abp.Domain.Repositories;
 using Volo.Abp.Domain.Services;
 
@@ -103,7 +104,9 @@ namespace Shentun.Peis.Asbitems
                 BarcodeMode = entity.BarcodeMode,
                 IsWebAppoint = entity.IsWebAppoint,
                 Warn = entity.Warn,
-                DiseaseScreeningTypeId = entity.DiseaseScreeningTypeId
+                DiseaseScreeningTypeId = entity.DiseaseScreeningTypeId,
+                IsDisablePregnancy = entity.IsDisablePregnancy,
+                IsDisablePreparePregnancy = entity.IsDisablePreparePregnancy
             };
         }
         /// <summary>
@@ -148,6 +151,8 @@ namespace Shentun.Peis.Asbitems
             targetEntity.IsWebAppoint = sourceEntity.IsWebAppoint;
             targetEntity.DiseaseScreeningTypeId = sourceEntity.DiseaseScreeningTypeId;
             targetEntity.Warn = sourceEntity.Warn;
+            targetEntity.IsDisablePregnancy = sourceEntity.IsDisablePregnancy;
+            targetEntity.IsDisablePreparePregnancy = sourceEntity.IsDisablePreparePregnancy;
         }
 
 
@@ -172,6 +177,8 @@ namespace Shentun.Peis.Asbitems
             DataHelper.CheckCharIsYOrN(entity.IsCheck, "是否为检查项目");
             DataHelper.CheckCharIsYOrN(entity.IsActive, "是否启用");
             DataHelper.CheckCharIsYOrN(entity.IsWebAppoint, "是否支持网上预约");
+            DataHelper.CheckCharIsYOrN(entity.IsDisablePregnancy, "是否怀孕期间禁止检查");
+            DataHelper.CheckCharIsYOrN(entity.IsDisablePreparePregnancy, "是否备孕期间禁止检查");
             if (entity.BarcodeMode != BarcodeModeFlag.UsingItemType
                 && entity.BarcodeMode != BarcodeModeFlag.PrintPatientRegisterNumber
                 && entity.BarcodeMode != BarcodeModeFlag.NoPrint)

src/Shentun.Peis.EntityFrameworkCore/Migrations/20240603101852_init20240603001.cs

@@ -0,0 +1,53 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Shentun.Peis.Migrations
+{
+    public partial class init20240603001 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<Guid>(
+                name: "appoint_patient_register_id",
+                table: "patient_register",
+                type: "uuid",
+                nullable: true,
+                comment: "预约人员登记ID");
+
+            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: "备孕期间禁止检查");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "appoint_patient_register_id",
+                table: "patient_register");
+
+            migrationBuilder.DropColumn(
+                name: "is_disable_pregnancy",
+                table: "asbitem");
+
+            migrationBuilder.DropColumn(
+                name: "is_disable_prepare_pregnancy",
+                table: "asbitem");
+        }
+    }
+}

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

@@ -578,6 +578,22 @@ 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)
@@ -6977,6 +6993,11 @@ namespace Shentun.Peis.Migrations
                         .HasColumnName("age")
                         .HasComment("年龄");
 
+                    b.Property<Guid?>("AppointPatientRegisterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("appoint_patient_register_id")
+                        .HasComment("预约人员登记ID");
+
                     b.Property<DateTime?>("AuditDate")
                         .HasColumnType("timestamp without time zone")
                         .HasColumnName("audit_date")