预约

src/Shentun.WebPeis.Application/AppointPatientRegisters/AppointPatientRegisterAppService.cs

@@ -262,7 +262,7 @@ namespace Shentun.WebPeis.AppointPatientRegisters
                       MedicalPackageName = o.FirstOrDefault().haveMedicalPackage == null ? "" : o.FirstOrDefault().haveMedicalPackage.MedicalPackageName,
                       MedicalCenterId = o.FirstOrDefault().appointPatientRegister.MedicalCenterId,
                       CompleteFlag = o.FirstOrDefault().appointPatientRegister.CompleteFlag,
-
+                      ChargeFlag = o.FirstOrDefault().appointPatientRegister.ChargeFlag,
                       AppointDate = o.FirstOrDefault().appointPatientRegister.AppointDate,
                       Remark = o.FirstOrDefault().appointPatientRegister.Remark,
                       PregnantFlag = o.FirstOrDefault().appointPatientRegister.PregnantFlag,

src/Shentun.WebPeis.DbMigrator/appsettings.json

@@ -1,7 +1,8 @@
 {
   "AdminId": "3a12a8a6-beb9-fc29-b4e7-4acfb00d8370",
   "ConnectionStrings": {
-    "Default": "Host=140.143.162.39;Port=5432;Database=WebPeis;User ID=postgres;Password=shentun123"
+    //"Default": "Host=140.143.162.39;Port=5432;Database=WebPeis;User ID=postgres;Password=shentun123",
+    "Default": "Host=192.168.2.181;Port=5432;Database=WebPeis;User ID=postgres;Password=st123"
   },
   "Redis": {
     "Configuration": "127.0.0.1"

src/Shentun.WebPeis.Domain/Charges/ChargeManager.cs

@@ -134,8 +134,8 @@ namespace Shentun.WebPeis.Charges
             )
         {
             //收费主表
-            var chargeEnt = await _chargeRepository.LastOrDefaultAsync(f => f.AppointPatientRegisterId == appointPatientRegister.AppointPatientRegisterId
-            && f.ChargeFlag == '0');
+            var chargeEnt = (await _chargeRepository.GetQueryableAsync()).Where(f => f.AppointPatientRegisterId == appointPatientRegister.AppointPatientRegisterId
+            && f.ChargeFlag == '0').OrderByDescending(o => o.ChargeId).FirstOrDefault();
 
             if (chargeEnt != null)
             {

src/Shentun.WebPeis.Domain/Models/Asbitem.cs

@@ -120,7 +120,7 @@ public partial class Asbitem:AuditedEntity, IHasConcurrencyStamp
 
     public virtual ICollection<AsbitemDetail> AsbitemDetails { get; set; } = new List<AsbitemDetail>();
 
-    public virtual ICollection<ChargeAsbitem> ChargeAsbitems { get; set; } = new List<ChargeAsbitem>();
+    //public virtual ICollection<ChargeAsbitem> ChargeAsbitems { get; set; } = new List<ChargeAsbitem>();
 
     public virtual ICollection<CustomerOrgGroupDetail> CustomerOrgGroupDetails { get; set; } = new List<CustomerOrgGroupDetail>();
 

src/Shentun.WebPeis.Domain/Models/ChargeAsbitem.cs

@@ -41,7 +41,7 @@ public partial class ChargeAsbitem : AuditedEntity, IHasConcurrencyStamp
 
     public Guid LastModifierId { get; set; }
 
-    public virtual Asbitem Asbitem { get; set; } = null!;
+    //public virtual Asbitem Asbitem { get; set; } = null!;
 
     public virtual Charge Charge { get; set; } = null!;
 

src/Shentun.WebPeis.EntityFrameworkCore/Configures/ChargeAsbitemConfigure.cs

@@ -47,10 +47,10 @@ namespace Shentun.WebPeis.Configures
                 .HasColumnName("last_modification_time");
             entity.Property(e => e.LastModifierId).HasColumnName("last_modifier_id");
 
-            entity.HasOne(d => d.Asbitem).WithMany(p => p.ChargeAsbitems)
-                .HasForeignKey(d => d.AsbitemId)
-                .OnDelete(DeleteBehavior.ClientSetNull)
-                .HasConstraintName("fk_charge_asbitem_asbitem");
+            //entity.HasOne(d => d.Asbitem).WithMany(p => p.ChargeAsbitems)
+            //    .HasForeignKey(d => d.AsbitemId)
+            //    .OnDelete(DeleteBehavior.ClientSetNull)
+            //    .HasConstraintName("fk_charge_asbitem_asbitem");
 
             entity.HasOne(d => d.Charge).WithMany(p => p.ChargeAsbitems)
                 .HasForeignKey(d => d.ChargeId)

src/Shentun.WebPeis.EntityFrameworkCore/Configures/ChargePayConfigure.cs

@@ -14,9 +14,10 @@ namespace Shentun.WebPeis.Configures
     {
         public void Configure(EntityTypeBuilder<ChargePay> entity)
         {
-            entity
-                .HasNoKey()
-                .ToTable("charge_pay", tb => tb.HasComment("收费支付方式"));
+
+            entity.HasKey(e => e.ChargePayId).HasName("charge_pay_key");
+
+            entity.ToTable("charge_pay", tb => tb.HasComment("收费方式"));
 
             entity.HasIndex(e => new { e.ChargeId, e.PayModeId }, "ix_charge_pay").IsUnique();
 

src/Shentun.WebPeis.EntityFrameworkCore/Migrations/20241119071328_update_charge_pay.cs

@@ -0,0 +1,79 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Shentun.WebPeis.Migrations
+{
+    /// <inheritdoc />
+    public partial class update_charge_pay : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterTable(
+                name: "charge_pay",
+                comment: "收费方式",
+                oldComment: "收费支付方式");
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "creation_time",
+                table: "charge_pay",
+                type: "timestamp with time zone",
+                nullable: false,
+                defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "creator_id",
+                table: "charge_pay",
+                type: "uuid",
+                nullable: true);
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "last_modification_time",
+                table: "charge_pay",
+                type: "timestamp with time zone",
+                nullable: true);
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "last_modifier_id",
+                table: "charge_pay",
+                type: "uuid",
+                nullable: true);
+
+            migrationBuilder.AddPrimaryKey(
+                name: "charge_pay_key",
+                table: "charge_pay",
+                column: "charge_pay_id");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropPrimaryKey(
+                name: "charge_pay_key",
+                table: "charge_pay");
+
+            migrationBuilder.DropColumn(
+                name: "creation_time",
+                table: "charge_pay");
+
+            migrationBuilder.DropColumn(
+                name: "creator_id",
+                table: "charge_pay");
+
+            migrationBuilder.DropColumn(
+                name: "last_modification_time",
+                table: "charge_pay");
+
+            migrationBuilder.DropColumn(
+                name: "last_modifier_id",
+                table: "charge_pay");
+
+            migrationBuilder.AlterTable(
+                name: "charge_pay",
+                comment: "收费支付方式",
+                oldComment: "收费方式");
+        }
+    }
+}

src/Shentun.WebPeis.EntityFrameworkCore/Migrations/20241119080012_update_charge_asbitem.cs

@@ -0,0 +1,38 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Shentun.WebPeis.Migrations
+{
+    /// <inheritdoc />
+    public partial class update_charge_asbitem : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "fk_charge_asbitem_asbitem",
+                table: "charge_asbitem");
+
+            migrationBuilder.DropIndex(
+                name: "IX_charge_asbitem_asbitem_id",
+                table: "charge_asbitem");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateIndex(
+                name: "IX_charge_asbitem_asbitem_id",
+                table: "charge_asbitem",
+                column: "asbitem_id");
+
+            migrationBuilder.AddForeignKey(
+                name: "fk_charge_asbitem_asbitem",
+                table: "charge_asbitem",
+                column: "asbitem_id",
+                principalTable: "asbitem",
+                principalColumn: "asbitem_id");
+        }
+    }
+}

src/Shentun.WebPeis.EntityFrameworkCore/Migrations/WebPeisDbContextModelSnapshot.cs

@@ -894,8 +894,6 @@ namespace Shentun.WebPeis.Migrations
                     b.HasKey("ChargeAsbitemId")
                         .HasName("charge_asbitem_pkey");
 
-                    b.HasIndex("AsbitemId");
-
                     b.HasIndex(new[] { "ChargeId", "AsbitemId" }, "ix_charge_asbitem")
                         .IsUnique();
 
@@ -1064,6 +1062,11 @@ namespace Shentun.WebPeis.Migrations
 
             modelBuilder.Entity("Shentun.WebPeis.Models.ChargePay", b =>
                 {
+                    b.Property<Guid>("ChargePayId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("charge_pay_id");
+
                     b.Property<Guid?>("CardBillId")
                         .HasColumnType("uuid")
                         .HasColumnName("card_bill_id")
@@ -1080,10 +1083,6 @@ namespace Shentun.WebPeis.Migrations
                         .HasColumnName("charge_money")
                         .HasComment("金额");
 
-                    b.Property<Guid>("ChargePayId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("charge_pay_id");
-
                     b.Property<string>("ConcurrencyStamp")
                         .HasMaxLength(40)
                         .HasColumnType("character varying(40)")
@@ -1112,12 +1111,15 @@ namespace Shentun.WebPeis.Migrations
                         .HasColumnName("pay_mode_id")
                         .HasComment("支付方式");
 
+                    b.HasKey("ChargePayId")
+                        .HasName("charge_pay_key");
+
                     b.HasIndex(new[] { "ChargeId", "PayModeId" }, "ix_charge_pay")
                         .IsUnique();
 
                     b.ToTable("charge_pay", null, t =>
                         {
-                            t.HasComment("收费支付方式");
+                            t.HasComment("收费方式");
                         });
                 });
 
@@ -7343,20 +7345,12 @@ namespace Shentun.WebPeis.Migrations
 
             modelBuilder.Entity("Shentun.WebPeis.Models.ChargeAsbitem", b =>
                 {
-                    b.HasOne("Shentun.WebPeis.Models.Asbitem", "Asbitem")
-                        .WithMany("ChargeAsbitems")
-                        .HasForeignKey("AsbitemId")
-                        .IsRequired()
-                        .HasConstraintName("fk_charge_asbitem_asbitem");
-
                     b.HasOne("Shentun.WebPeis.Models.Charge", "Charge")
                         .WithMany("ChargeAsbitems")
                         .HasForeignKey("ChargeId")
                         .IsRequired()
                         .HasConstraintName("fk_charge_asbitem");
 
-                    b.Navigation("Asbitem");
-
                     b.Navigation("Charge");
                 });
 
@@ -7927,8 +7921,6 @@ namespace Shentun.WebPeis.Migrations
                 {
                     b.Navigation("AsbitemDetails");
 
-                    b.Navigation("ChargeAsbitems");
-
                     b.Navigation("CustomerOrgGroupDetails");
 
                     b.Navigation("MedicalPackageDetails");