报表、菜单

src/Shentun.Peis.Application.Contracts/MenuInfos/GetMyMenuInfoListDto.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Text;
+
+namespace Shentun.Peis.MenuInfos
+{
+    public class GetMyMenuInfoListDto
+    {
+        public Guid Id { get; set; }
+
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string DisplayName { get; set; }
+
+
+        /// <summary>
+        /// 路由地址
+        /// </summary>
+        public string? RouteUrl { get; set; }
+
+
+        /// <summary>
+        /// 菜单图标
+        /// </summary>
+        public string? IconName { get; set; }
+
+
+        /// <summary>
+        /// 父id
+        /// </summary>
+        public Guid? ParentId { get; set; }
+
+        public int DisplayOrder { get; set; }
+
+
+        /// <summary>
+        /// 菜单类型  0 一级菜单  1 带路径的菜单  2 按钮
+        /// </summary>
+        public char MenuType { get; set; }
+    }
+}

src/Shentun.Peis.Application.Contracts/MenuInfos/MenuInfoDto.cs

@@ -45,7 +45,6 @@ namespace Shentun.Peis.MenuInfos
         /// <summary>
         /// 菜单类型  0 一级菜单  1 带路径的菜单  2 按钮
         /// </summary>
-        [Column("menu_type")]
         public char MenuType { get; set; }
 
     }

src/Shentun.Peis.Application/DataMigrations/BaseDataHandleAppService.cs

@@ -55,6 +55,14 @@ namespace Shentun.Peis.DataMigrations
         });
 
         private readonly SqlSugarClient PgDb = new SqlSugarClient(new ConnectionConfig()
+        {
+            ConnectionString = "Host=140.143.162.39;Port=5432;Database=ShentunPeis070703;User ID=postgres;Password=shentun123;",
+            DbType = SqlSugar.DbType.PostgreSQL,
+            IsAutoCloseConnection = true
+        });
+
+
+        private readonly SqlSugarClient PgNWDb = new SqlSugarClient(new ConnectionConfig()
         {
             ConnectionString = "Host=10.1.12.140;Port=5432;Database=ShentunPeis;User ID=postgres;Password=st123;",
             DbType = SqlSugar.DbType.PostgreSQL,
@@ -62,6 +70,7 @@ namespace Shentun.Peis.DataMigrations
         });
 
 
+
         ////默认指引类别ID
         //private readonly Guid defaultGuidTypeId = Guid.Parse("3a120284-df18-7b36-4b12-0423a7d5c1c6");
         ////默认体检报告类别ID
@@ -117,6 +126,9 @@ namespace Shentun.Peis.DataMigrations
         private readonly IRepository<SumSuggestionHeader, Guid> _sumSuggestionHeaderRepository;
         private readonly IRepository<SumSuggestionContent, Guid> _sumSuggestionContentRepository;
         private readonly IRepository<SumDiagnosis> _sumDiagnosisRepository;
+        private readonly IRepository<Report, string> _reportRepository;
+        private readonly IRepository<ReportFormat, string> _reportFormatRepository;
+        private readonly IRepository<ReportFormatTemplate, string> _reportFormatTemplateRepository;
 
         private Dictionary<string, string> veryPatientNo = new Dictionary<string, string>();
 
@@ -163,7 +175,10 @@ namespace Shentun.Peis.DataMigrations
             IRepository<SumSummaryContent, Guid> sumSummaryContentRepository,
             IRepository<SumSuggestionHeader, Guid> sumSuggestionHeaderRepository,
             IRepository<SumSuggestionContent, Guid> sumSuggestionContentRepository,
-            IRepository<SumDiagnosis> sumDiagnosisRepository)
+            IRepository<SumDiagnosis> sumDiagnosisRepository,
+            IRepository<Report, string> reportRepository,
+            IRepository<ReportFormat, string> reportFormatRepository,
+            IRepository<ReportFormatTemplate, string> reportFormatTemplateRepository)
         {
             _deviceTypeRepository = deviceTypeRepository;
             _itemTypeRepository = itemTypeRepository;
@@ -208,6 +223,9 @@ namespace Shentun.Peis.DataMigrations
             _sumSuggestionHeaderRepository = sumSuggestionHeaderRepository;
             _sumSuggestionContentRepository = sumSuggestionContentRepository;
             _sumDiagnosisRepository = sumDiagnosisRepository;
+            _reportRepository = reportRepository;
+            _reportFormatRepository = reportFormatRepository;
+            _reportFormatTemplateRepository = reportFormatTemplateRepository;
         }
 
 
@@ -2215,7 +2233,7 @@ namespace Shentun.Peis.DataMigrations
 
                     sql_update += $" where id='{patientRegisterId}' ";
 
-                    await PgDb.Ado.ExecuteCommandAsync(sql_update);
+                    await PgNWDb.Ado.ExecuteCommandAsync(sql_update);
                     string sql_update_status = $"update patient_register set is_doctor='Y'  where patient_register_id='{row["patient_register_id"].ToString()}' ";
                     await Db.Ado.ExecuteCommandAsync(sql_update_status);
 
@@ -3004,6 +3022,86 @@ namespace Shentun.Peis.DataMigrations
 
         #endregion
 
+
+
+        #region 迁移报表数据
+
+        /// <summary>
+        /// 迁移云端报表数据
+        /// </summary>
+        /// <returns></returns>
+        public async Task TransferReportData()
+        {
+            var oldReportList = await PgDb.Ado.GetDataTableAsync("select id,display_name,is_active from report  ");
+
+            if (oldReportList.Rows.Count > 0)
+            {
+                foreach (DataRow row in oldReportList.Rows)
+                {
+                    Report reportEntity = new Report
+                    {
+                        DisplayName = row["display_name"].ToString(),
+                        IsActive = Convert.ToChar(row["is_active"].ToString())
+                    };
+
+                    reportEntity.SetId(row["id"].ToString());
+
+                    await _reportRepository.InsertAsync(reportEntity, true);
+
+
+                }
+            }
+
+            var oldReportFormatList = await PgDb.Ado.GetDataTableAsync("select id,display_name,is_default,report_id from report_format  ");
+
+            if (oldReportFormatList.Rows.Count > 0)
+            {
+                foreach (DataRow row in oldReportFormatList.Rows)
+                {
+                    ReportFormat reportFormatEntity = new ReportFormat
+                    {
+                        DisplayName = row["display_name"].ToString(),
+                        IsDefault = Convert.ToChar(row["is_default"].ToString()),
+                        ReportId = row["report_id"].ToString()
+                    };
+
+                    reportFormatEntity.SetId(row["id"].ToString());
+
+                    await _reportFormatRepository.InsertAsync(reportFormatEntity, true);
+
+                }
+            }
+
+            var oldReportFormatTemplateList = await PgDb.Ado.GetDataTableAsync("select id,display_name,report_format_id,template_file_type,template_file,data_set_json,is_system,is_default from report_format_template  ");
+
+            if (oldReportFormatTemplateList.Rows.Count > 0)
+            {
+                foreach (DataRow row in oldReportFormatTemplateList.Rows)
+                {
+                    ReportFormatTemplate reportFormatTemplateEntity = new ReportFormatTemplate
+                    {
+                        DisplayName = row["display_name"].ToString(),
+                        IsDefault = Convert.ToChar(row["is_default"].ToString()),
+                        DataSetJson = row["data_set_json"].ToString(),
+                        IsSystem = Convert.ToChar(row["is_system"].ToString()),
+                        ReportFormatId = row["report_format_id"].ToString(),
+                        TemplateFile = row["template_file"].ToString(),
+                        TemplateFileType = Convert.ToChar(row["template_file_type"].ToString())
+                    };
+
+                    reportFormatTemplateEntity.SetId(row["id"].ToString());
+
+                    await _reportFormatTemplateRepository.InsertAsync(reportFormatTemplateEntity, true);
+
+                }
+            }
+
+        }
+
+
+        #endregion
+
+
         private void LoadDLL()
         {
             // 定义dll文件夹路径

src/Shentun.Peis.Application/MenuInfos/MenuInfoAppService.cs

@@ -190,19 +190,10 @@ namespace Shentun.Peis.MenuInfos
         /// </summary>
         /// <returns></returns>
         [HttpGet("api/app/menuinfo/getmymenuinfolist")]
-        public async Task<List<MenuInfoDto>> GetMyMenuInfoListAsync()
+        public async Task<List<GetMyMenuInfoListDto>> GetMyMenuInfoListAsync()
         {
-            var query = from a in await _menuInfoRepository.GetQueryableAsync()
-                        join b in await _identityUserRepository.GetQueryableAsync() on a.CreatorId equals b.Id into bb
-                        from ab in bb.DefaultIfEmpty()
-                        join c in await _identityUserRepository.GetQueryableAsync() on a.LastModifierId equals c.Id into cc
-                        from ac in cc.DefaultIfEmpty()
-                        select new
-                        {
-                            a,
-                            LastModifierName = ac != null ? ac.UserName : "",
-                            CreatorName = ab != null ? ab.UserName : ""
-                        };
+            var query = await _menuInfoRepository.GetQueryableAsync();
+
 
 
             string AdminId = _configuration.GetValue<string>("AdminId");
@@ -211,32 +202,24 @@ namespace Shentun.Peis.MenuInfos
             {
                 var userRoles = await _userRepository.GetRolesAsync(_currentUser.Id.Value); //获取当前用户的角色
                 if (!userRoles.Any())
-                    return new List<MenuInfoDto>();
+                    return new List<GetMyMenuInfoListDto>();
                 var userMenuInfoList = await _roleMenuInfoRepository.GetListAsync(m => userRoles.Select(s => s.Id).Contains(m.RoleId)); //当前持有的菜单项
                 if (!userMenuInfoList.Any())
-                    return new List<MenuInfoDto>();
-                query = query.Where(m => userMenuInfoList.Select(s => s.MenuInfoId).Distinct().Contains(m.a.Id));
+                    return new List<GetMyMenuInfoListDto>();
+                query = query.Where(m => userMenuInfoList.Select(s => s.MenuInfoId).Distinct().Contains(m.Id));
             }
 
 
-            var entlistdto = query.Select(s => new MenuInfoDto
+            var entlistdto = query.Select(s => new GetMyMenuInfoListDto
             {
-                CreationTime = s.a.CreationTime,
-                CreatorId = s.a.CreatorId,
-                DisplayName = s.a.DisplayName,
-                DisplayOrder = s.a.DisplayOrder,
-                IconName = s.a.IconName,
-                Id = s.a.Id,
-                IsActive = s.a.IsActive,
-                LastModifierId = s.a.LastModifierId,
-                LastModificationTime = s.a.LastModificationTime,
-                MenuType = s.a.MenuType,
-                ParentId = s.a.ParentId,
-                RouteUrl = s.a.RouteUrl,
-                SimpleCode = s.a.SimpleCode,
-                CreatorName = s.CreatorName,
-                LastModifierName = s.LastModifierName
-            }).OrderBy(o => o.DisplayOrder).ThenBy(o => o.DisplayName).ToList();
+                DisplayName = s.DisplayName,
+                DisplayOrder = s.DisplayOrder,
+                IconName = s.IconName,
+                Id = s.Id,
+                MenuType = s.MenuType,
+                ParentId = s.ParentId,
+                RouteUrl = s.RouteUrl,
+            }).OrderBy(o => o.ParentId).ThenBy(o => o.DisplayOrder).ToList();
 
             return entlistdto;
         }

src/Shentun.Peis.Domain/L_JYTMXX_TJs/L_JYTMXX_TJ.cs

@@ -44,7 +44,7 @@ namespace Shentun.Peis.L_JYTMXX_TJs
         /// 出生年月  YYYY-MM-DD
         /// </summary>
         [Column("BRITHDAY")]
-        public DateTime BRITHDAY { get; set; }
+        public DateOnly BRITHDAY { get; set; }
 
         /// <summary>
         /// 性别  （1-男，2-女，3-未知，传代码）

src/Shentun.Peis.Domain/ReportFormatTemplates/ReportFormatTemplate.cs

@@ -49,14 +49,14 @@ namespace Shentun.Peis.Models
         [Comment("模板文件")]
         public string DataSetJson { get; set; }
 
-        [Column("isSystem")]
+        [Column("is_system")]
         [Comment("是否系统自定义(N:停用，Y:启用)")]
         [Required]
         [MaxLength(1)]
         [DefaultValue('N')]
         public char IsSystem { get; set; }
 
-        [Column("isDefault")]
+        [Column("is_default")]
         [Comment("是否默认(N:不默认，Y:默认)")]
         [Required]
         [MaxLength(1)]

src/Shentun.Peis.Domain/ReportFormats/ReportFormat.cs

@@ -31,7 +31,7 @@ namespace Shentun.Peis.Models
         [StringLength(64)]
         public string DisplayName { get; set; } = null!;
 
-        [Column("isDefault")]
+        [Column("is_default")]
         [Comment("默认标志(N:不默认，Y:默认)")]
         [Required]
         [MaxLength(1)]

src/Shentun.Peis.EntityFrameworkCore/Migrations/20240426142107_init20240426001.cs

@@ -0,0 +1,153 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Shentun.Peis.Migrations
+{
+    public partial class init20240426001 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<Guid>(
+                name: "charge_request_id",
+                table: "register_check_asbitem",
+                type: "uuid",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "his_patient_id",
+                table: "patient_register",
+                type: "character varying(20)",
+                maxLength: 20,
+                nullable: true);
+
+         
+            migrationBuilder.CreateTable(
+                name: "charge_request",
+                columns: table => new
+                {
+                    id = table.Column<Guid>(type: "uuid", nullable: false, comment: "收据申请单号"),
+                    patient_register_id = table.Column<Guid>(type: "uuid", nullable: false, comment: "登记流水号"),
+                    charge_request_no = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: true),
+                    his_charge_no = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: true),
+                    charge_request_flag = table.Column<char>(type: "character(1)", maxLength: 1, nullable: false, defaultValueSql: "0"),
+                    concurrency_stamp = table.Column<string>(type: "character varying(40)", maxLength: 40, nullable: true),
+                    creation_time = table.Column<DateTime>(type: "timestamp without time zone", nullable: false),
+                    creator_id = table.Column<Guid>(type: "uuid", nullable: false),
+                    last_modification_time = table.Column<DateTime>(type: "timestamp without time zone", nullable: false),
+                    last_modifier_id = table.Column<Guid>(type: "uuid", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_charge_request", x => x.id);
+                    table.ForeignKey(
+                        name: "FK_charge_request_patient_register_patient_register_id",
+                        column: x => x.patient_register_id,
+                        principalTable: "patient_register",
+                        principalColumn: "id",
+                        onDelete: ReferentialAction.Cascade);
+                },
+                comment: "收费申请单主档");
+
+            migrationBuilder.CreateTable(
+                name: "third_interface",
+                columns: table => new
+                {
+                    id = table.Column<Guid>(type: "uuid", fixedLength: true, nullable: false, comment: "编号"),
+                    display_name = table.Column<string>(type: "character varying(30)", maxLength: 30, nullable: false, comment: "名称"),
+                    third_interface_type = table.Column<string>(type: "character varying(2)", maxLength: 2, nullable: false, comment: "接口类型"),
+                    parm_value = table.Column<string>(type: "character varying(1000)", maxLength: 1000, nullable: true),
+                    is_active = table.Column<char>(type: "character(1)", maxLength: 1, nullable: false, comment: "是否启用"),
+                    display_order = table.Column<int>(type: "integer", nullable: false, comment: "显示顺序"),
+                    concurrency_stamp = table.Column<string>(type: "character varying(40)", maxLength: 40, nullable: true),
+                    creation_time = table.Column<DateTime>(type: "timestamp without time zone", nullable: false),
+                    creator_id = table.Column<Guid>(type: "uuid", nullable: false),
+                    last_modification_time = table.Column<DateTime>(type: "timestamp without time zone", nullable: false),
+                    last_modifier_id = table.Column<Guid>(type: "uuid", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_third_interface", x => x.id);
+                },
+                comment: "第三方接口表");
+
+            migrationBuilder.CreateTable(
+                name: "charge_request_asbitem",
+                columns: table => new
+                {
+                    id = table.Column<Guid>(type: "uuid", nullable: false),
+                    charge_request_id = table.Column<Guid>(type: "uuid", nullable: false, comment: "收费申请单号"),
+                    asbitem_id = table.Column<Guid>(type: "uuid", fixedLength: true, nullable: false, comment: "组合项目"),
+                    charge_price = table.Column<decimal>(type: "numeric(10,2)", precision: 10, scale: 2, nullable: false, comment: "价格"),
+                    amount = table.Column<short>(type: "smallint", nullable: false),
+                    register_check_asbitem_id = table.Column<Guid>(type: "uuid", nullable: false),
+                    is_charge = table.Column<char>(type: "character(1)", nullable: false),
+                    concurrency_stamp = table.Column<string>(type: "character varying(40)", maxLength: 40, nullable: true),
+                    creation_time = table.Column<DateTime>(type: "timestamp without time zone", nullable: false),
+                    creator_id = table.Column<Guid>(type: "uuid", nullable: false),
+                    last_modification_time = table.Column<DateTime>(type: "timestamp without time zone", nullable: false),
+                    last_modifier_id = table.Column<Guid>(type: "uuid", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_charge_request_asbitem", x => x.id);
+                    table.ForeignKey(
+                        name: "fk_charge_request_asbitem_asbitem",
+                        column: x => x.asbitem_id,
+                        principalTable: "asbitem",
+                        principalColumn: "id");
+                    table.ForeignKey(
+                        name: "fk_charge_request_asbitem_charge",
+                        column: x => x.charge_request_id,
+                        principalTable: "charge_request",
+                        principalColumn: "id",
+                        onDelete: ReferentialAction.Cascade);
+                },
+                comment: "收费申请包含组合项目");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_charge_request_patient_register_id",
+                table: "charge_request",
+                column: "patient_register_id");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_charge_request_asbitem_asbitem_id",
+                table: "charge_request_asbitem",
+                column: "asbitem_id");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_charge_request_asbitem_charge_request_id",
+                table: "charge_request_asbitem",
+                column: "charge_request_id");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "charge_request_asbitem");
+
+            migrationBuilder.DropTable(
+                name: "third_interface");
+
+            migrationBuilder.DropTable(
+                name: "charge_request");
+
+            migrationBuilder.DropColumn(
+                name: "charge_request_id",
+                table: "register_check_asbitem");
+
+            migrationBuilder.DropColumn(
+                name: "his_patient_id",
+                table: "patient_register");
+
+            migrationBuilder.AlterColumn<DateOnly>(
+                name: "BRITHDAY",
+                table: "L_JYTMXX_TJ",
+                type: "date",
+                nullable: false,
+                oldClrType: typeof(DateTime),
+                oldType: "timestamp without time zone");
+        }
+    }
+}

src/Shentun.Peis.EntityFrameworkCore/Migrations/20240426151955_init20240426002.cs

@@ -0,0 +1,36 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Shentun.Peis.Migrations
+{
+    public partial class init20240426002 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.RenameColumn(
+                name: "isDefault",
+                table: "report_format",
+                newName: "is_default");
+
+            
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.RenameColumn(
+                name: "is_default",
+                table: "report_format",
+                newName: "isDefault");
+
+            migrationBuilder.AlterColumn<DateTime>(
+                name: "BRITHDAY",
+                table: "L_JYTMXX_TJ",
+                type: "timestamp without time zone",
+                nullable: false,
+                oldClrType: typeof(DateOnly),
+                oldType: "date");
+        }
+    }
+}

src/Shentun.Peis.EntityFrameworkCore/Migrations/20240426153157_init20240426003.cs

@@ -0,0 +1,35 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Shentun.Peis.Migrations
+{
+    public partial class init20240426003 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.RenameColumn(
+                name: "isSystem",
+                table: "report_format_template",
+                newName: "is_system");
+
+            migrationBuilder.RenameColumn(
+                name: "isDefault",
+                table: "report_format_template",
+                newName: "is_default");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.RenameColumn(
+                name: "is_system",
+                table: "report_format_template",
+                newName: "isSystem");
+
+            migrationBuilder.RenameColumn(
+                name: "is_default",
+                table: "report_format_template",
+                newName: "isDefault");
+        }
+    }
+}

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

@@ -1836,6 +1836,140 @@ namespace Shentun.Peis.Migrations
                     b.HasComment("收费价表项目");
                 });
 
+            modelBuilder.Entity("Shentun.Peis.Models.ChargeRequest", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id")
+                        .HasComment("收据申请单号");
+
+                    b.Property<char>("ChargeRequestFlag")
+                        .ValueGeneratedOnAdd()
+                        .HasMaxLength(1)
+                        .HasColumnType("character(1)")
+                        .HasColumnName("charge_request_flag")
+                        .HasDefaultValueSql("0");
+
+                    b.Property<string>("ChargeRequestNo")
+                        .HasMaxLength(20)
+                        .HasColumnType("character varying(20)")
+                        .HasColumnName("charge_request_no");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("concurrency_stamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("creation_time");
+
+                    b.Property<Guid?>("CreatorId")
+                        .IsRequired()
+                        .HasColumnType("uuid")
+                        .HasColumnName("creator_id");
+
+                    b.Property<string>("HisChargeNo")
+                        .HasMaxLength(20)
+                        .HasColumnType("character varying(20)")
+                        .HasColumnName("his_charge_no");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .IsRequired()
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("last_modification_time");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .IsRequired()
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_modifier_id");
+
+                    b.Property<Guid>("PatientRegisterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("patient_register_id")
+                        .HasComment("登记流水号");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PatientRegisterId");
+
+                    b.ToTable("charge_request");
+
+                    b.HasComment("收费申请单主档");
+                });
+
+            modelBuilder.Entity("Shentun.Peis.Models.ChargeRequestAsbitem", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<short>("Amount")
+                        .HasColumnType("smallint")
+                        .HasColumnName("amount");
+
+                    b.Property<Guid>("AsbitemId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("asbitem_id")
+                        .IsFixedLength()
+                        .HasComment("组合项目");
+
+                    b.Property<decimal>("ChargePrice")
+                        .HasPrecision(10, 2)
+                        .HasColumnType("numeric(10,2)")
+                        .HasColumnName("charge_price")
+                        .HasComment("价格");
+
+                    b.Property<Guid>("ChargeRequestId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("charge_request_id")
+                        .HasComment("收费申请单号");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("concurrency_stamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("creation_time");
+
+                    b.Property<Guid?>("CreatorId")
+                        .IsRequired()
+                        .HasColumnType("uuid")
+                        .HasColumnName("creator_id");
+
+                    b.Property<char>("IsCharge")
+                        .HasColumnType("character(1)")
+                        .HasColumnName("is_charge");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .IsRequired()
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("last_modification_time");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .IsRequired()
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_modifier_id");
+
+                    b.Property<Guid>("RegisterCheckAsbitemId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("register_check_asbitem_id");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AsbitemId");
+
+                    b.HasIndex("ChargeRequestId");
+
+                    b.ToTable("charge_request_asbitem");
+
+                    b.HasComment("收费申请包含组合项目");
+                });
+
             modelBuilder.Entity("Shentun.Peis.Models.ColumnReference", b =>
                 {
                     b.Property<Guid>("Id")
@@ -6478,6 +6612,11 @@ namespace Shentun.Peis.Migrations
                         .HasColumnName("guide_print_times")
                         .HasComment("指引单打印次数");
 
+                    b.Property<string>("HisPatientId")
+                        .HasMaxLength(20)
+                        .HasColumnType("character varying(20)")
+                        .HasColumnName("his_patient_id");
+
                     b.Property<char?>("InterposeMeasure")
                         .HasMaxLength(1)
                         .HasColumnType("character(1)")
@@ -7617,6 +7756,10 @@ namespace Shentun.Peis.Migrations
                         .HasColumnName("charge_price")
                         .HasComment("实收价格");
 
+                    b.Property<Guid?>("ChargeRequestId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("charge_request_id");
+
                     b.Property<string>("ConcurrencyStamp")
                         .IsConcurrencyToken()
                         .HasMaxLength(40)
@@ -8158,7 +8301,7 @@ namespace Shentun.Peis.Migrations
                         .HasMaxLength(1)
                         .HasColumnType("character(1)")
                         .HasDefaultValue('N')
-                        .HasColumnName("isDefault")
+                        .HasColumnName("is_default")
                         .HasComment("默认标志(N:不默认，Y:默认)");
 
                     b.Property<DateTime?>("LastModificationTime")
@@ -8227,7 +8370,7 @@ namespace Shentun.Peis.Migrations
                         .HasMaxLength(1)
                         .HasColumnType("character(1)")
                         .HasDefaultValue('N')
-                        .HasColumnName("isDefault")
+                        .HasColumnName("is_default")
                         .HasComment("是否默认(N:不默认，Y:默认)");
 
                     b.Property<char>("IsSystem")
@@ -8235,7 +8378,7 @@ namespace Shentun.Peis.Migrations
                         .HasMaxLength(1)
                         .HasColumnType("character(1)")
                         .HasDefaultValue('N')
-                        .HasColumnName("isSystem")
+                        .HasColumnName("is_system")
                         .HasComment("是否系统自定义(N:停用，Y:启用)");
 
                     b.Property<DateTime?>("LastModificationTime")
@@ -10504,6 +10647,76 @@ namespace Shentun.Peis.Migrations
                     b.HasComment("角色对应菜单权限");
                 });
 
+            modelBuilder.Entity("Shentun.Peis.ThirdInterfaces.ThirdInterface", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id")
+                        .IsFixedLength()
+                        .HasComment("编号");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("concurrency_stamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("creation_time");
+
+                    b.Property<Guid?>("CreatorId")
+                        .IsRequired()
+                        .HasColumnType("uuid")
+                        .HasColumnName("creator_id");
+
+                    b.Property<string>("DisplayName")
+                        .IsRequired()
+                        .HasMaxLength(30)
+                        .HasColumnType("character varying(30)")
+                        .HasColumnName("display_name")
+                        .HasComment("名称");
+
+                    b.Property<int>("DisplayOrder")
+                        .HasColumnType("integer")
+                        .HasColumnName("display_order")
+                        .HasComment("显示顺序");
+
+                    b.Property<char>("IsActive")
+                        .HasMaxLength(1)
+                        .HasColumnType("character(1)")
+                        .HasColumnName("is_active")
+                        .HasComment("是否启用");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .IsRequired()
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("last_modification_time");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .IsRequired()
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_modifier_id");
+
+                    b.Property<string>("ParmValue")
+                        .HasMaxLength(1000)
+                        .HasColumnType("character varying(1000)")
+                        .HasColumnName("parm_value");
+
+                    b.Property<string>("ThirdInterfaceType")
+                        .IsRequired()
+                        .HasMaxLength(2)
+                        .HasColumnType("character varying(2)")
+                        .HasColumnName("third_interface_type")
+                        .HasComment("接口类型");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("third_interface");
+
+                    b.HasComment("第三方接口表");
+                });
+
             modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b =>
                 {
                     b.Property<Guid>("Id")
@@ -12321,6 +12534,37 @@ namespace Shentun.Peis.Migrations
                     b.Navigation("ChargeAsbitem");
                 });
 
+            modelBuilder.Entity("Shentun.Peis.Models.ChargeRequest", b =>
+                {
+                    b.HasOne("Shentun.Peis.Models.PatientRegister", "PatientRegister")
+                        .WithMany("ChargeRequests")
+                        .HasForeignKey("PatientRegisterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("PatientRegister");
+                });
+
+            modelBuilder.Entity("Shentun.Peis.Models.ChargeRequestAsbitem", b =>
+                {
+                    b.HasOne("Shentun.Peis.Models.Asbitem", "Asbitem")
+                        .WithMany("ChargeRequestAsbitems")
+                        .HasForeignKey("AsbitemId")
+                        .IsRequired()
+                        .HasConstraintName("fk_charge_request_asbitem_asbitem");
+
+                    b.HasOne("Shentun.Peis.Models.ChargeRequest", "ChargeRequest")
+                        .WithMany("ChargeRequestAsbitems")
+                        .HasForeignKey("ChargeRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_charge_request_asbitem_charge");
+
+                    b.Navigation("Asbitem");
+
+                    b.Navigation("ChargeRequest");
+                });
+
             modelBuilder.Entity("Shentun.Peis.Models.ColumnReferenceCode", b =>
                 {
                     b.HasOne("Shentun.Peis.Models.ColumnReference", "ColumnReference")
@@ -13426,6 +13670,8 @@ namespace Shentun.Peis.Migrations
 
                     b.Navigation("ChargeAsbitems");
 
+                    b.Navigation("ChargeRequestAsbitems");
+
                     b.Navigation("CustomerOrgGroupDetails");
 
                     b.Navigation("MedicalPackageDetails");
@@ -13476,6 +13722,11 @@ namespace Shentun.Peis.Migrations
                     b.Navigation("ChargeBackPays");
                 });
 
+            modelBuilder.Entity("Shentun.Peis.Models.ChargeRequest", b =>
+                {
+                    b.Navigation("ChargeRequestAsbitems");
+                });
+
             modelBuilder.Entity("Shentun.Peis.Models.ColumnReference", b =>
                 {
                     b.Navigation("ColumnReferenceCodes");
@@ -13651,6 +13902,8 @@ namespace Shentun.Peis.Migrations
 
             modelBuilder.Entity("Shentun.Peis.Models.PatientRegister", b =>
                 {
+                    b.Navigation("ChargeRequests");
+
                     b.Navigation("Charges");
 
                     b.Navigation("HealthCertificate");

src/Shentun.Peis.HttpApi.Host/appsettings.json

@@ -6,9 +6,9 @@
     "RedirectAllowedUrls": "http://localhost:9530"
   },
   "ConnectionStrings": {
-    "Default": "Host=140.143.162.39;Port=5432;Database=ShentunPeis070703;User ID=postgres;Password=shentun123;"
+    //"Default": "Host=140.143.162.39;Port=5432;Database=ShentunPeis070703;User ID=postgres;Password=shentun123;"
     //"Default": "Host=localhost;Port=5432;Database=ShentunPeis1218;User ID=postgres;Password=wxd123;"
-    //"Default": "Host=10.1.12.140;Port=5432;Database=ShentunPeis;User ID=postgres;Password=st123;"
+    "Default": "Host=10.1.12.140;Port=5432;Database=ShentunPeis;User ID=postgres;Password=st123;"
   },
   "AuthServer": {
     "Authority": "http://localhost:9530",
@@ -33,7 +33,7 @@
     "RequestPath": "/CheckPictureImg",
     "Alias": "CheckPictureImg"
   },
-  //"AdminId": "3a11fe49-5719-0e9e-dd44-0c4aff0900b0",
-  "AdminId": "3a0c4180-107c-0c89-b25b-0bd34666dcec",
+  "AdminId": "3a11fe49-5719-0e9e-dd44-0c4aff0900b0",
+  //"AdminId": "3a0c4180-107c-0c89-b25b-0bd34666dcec",
   "PeisReportPdfPath": "E:\\mypeis\\PeisReportPdf\\"
 }