xiugai

src/Shentun.Peis.Domain/ChargeAsbitems/ChargeAsbitem.cs

@@ -17,6 +17,7 @@ namespace Shentun.Peis.Models
         public ChargeAsbitem()
         {
             ChargePriceItems = new HashSet<ChargePriceItem>();
+            ChargeBackAsbitems=new HashSet<ChargeBackAsbitem>();
         }
 
        
@@ -56,6 +57,9 @@ namespace Shentun.Peis.Models
         [InverseProperty(nameof(ChargePriceItem.ChargeAsbitem))]
         public virtual ICollection<ChargePriceItem> ChargePriceItems { get; set; }
 
+        [InverseProperty(nameof(ChargeBackAsbitem.ChargeAsbitem))]
+        public virtual ICollection<ChargeBackAsbitem> ChargeBackAsbitems { get; set; }
+
         //public override object[] GetKeys()
         //{
         //    return new object[] { ChargeAsbitemId };

src/Shentun.Peis.Domain/ChargeBackAsbitems/ChargeBackAsbitem.cs

@@ -0,0 +1,40 @@
+using Microsoft.EntityFrameworkCore;
+using Shentun.Peis.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp.Domain.Entities;
+using Volo.Abp.Domain.Entities.Auditing;
+
+namespace Shentun.Peis.Models
+{
+
+    /// <summary>
+    /// 退费组合项目表
+    /// </summary>
+    [Table("charge_back_asbitem")]
+    [Index(nameof(ChargeBackId), nameof(ChargeAsbitemId), Name = "IX_charge_bak_asbitem_asbitem_id", IsUnique = true)]
+    public class ChargeBackAsbitem : AuditedEntity<Guid>, IHasConcurrencyStamp
+    {
+        [Column("charge_back_id")]
+        public Guid ChargeBackId { get; set; }
+
+        [Column("charge_asbitem_id")]
+        public Guid ChargeAsbitemId { get; set; }
+
+        [Column("amount")]
+        public short Amount { get; set; }
+
+        public string ConcurrencyStamp { get; set; }
+
+
+        [ForeignKey(nameof(ChargeBackId))]
+        public virtual ChargeBack ChargeBack { get; set; }
+
+        [ForeignKey(nameof(ChargeAsbitemId))]
+        public virtual ChargeAsbitem ChargeAsbitem { get; set; } 
+    }
+}

src/Shentun.Peis.Domain/ChargeBackPays/ChargeBackPay.cs

@@ -11,15 +11,16 @@ namespace Shentun.Peis.Models
     /// 退费支付方式
     /// </summary>
     [Table("charge_back_pay")]
-    public  class ChargeBackPay : Entity, IHasConcurrencyStamp
+    [Index(nameof(ChargeBackId), nameof(PayModeId), Name = "IX_charge_back_pay_pay_mode_id", IsUnique = true)]
+    public  class ChargeBackPay : Entity<Guid>, IHasConcurrencyStamp
     {
-        [Key]
+
         [Column("charge_back_id")]
         public Guid ChargeBackId { get; set; }
+
         /// <summary>
         /// 支付方式ID
         /// </summary>
-        [Key]
         [Column("pay_mode_id")]
         [StringLength(4)]
         public string PayModeId { get; set; } = null!;
@@ -52,9 +53,6 @@ namespace Shentun.Peis.Models
         [InverseProperty("ChargeBackPays")]
         public virtual PayMode PayMode { get; set; } = null!;
 
-        public override object[] GetKeys()
-        {
-            return new object[] { ChargeBackId, PayModeId };
-        }
+        
     }
 }

src/Shentun.Peis.Domain/ChargeBacks/ChargeBack.cs

@@ -17,6 +17,7 @@ namespace Shentun.Peis.Models
         public ChargeBack()
         {
             ChargeBackPays = new HashSet<ChargeBackPay>();
+            ChargeBackAsbitems=new HashSet<ChargeBackAsbitem>();
         }
 
        
@@ -57,6 +58,9 @@ namespace Shentun.Peis.Models
         [InverseProperty(nameof(ChargeBackPay.ChargeBack))]
         public virtual ICollection<ChargeBackPay> ChargeBackPays { get; set; }
 
+        [InverseProperty(nameof(ChargeBackAsbitem.ChargeBack))]
+        public virtual ICollection<ChargeBackAsbitem> ChargeBackAsbitems { get; set; }
+
         //public override object[] GetKeys()
         //{
         //    return new object[] { ChargeBackId };

src/Shentun.Peis.Domain/ChargePays/ChargePay.cs

@@ -11,18 +11,17 @@ namespace Shentun.Peis.Models
     /// 收费支付方式
     /// </summary>
     [Table("charge_pay")]
-    public  class ChargePay : Entity, IHasConcurrencyStamp
+    [Index(nameof(ChargeId), nameof(PayModeId), Name = "IX_charge_pay_pay_mode_id", IsUnique = true)]
+    public class ChargePay : Entity<Guid>, IHasConcurrencyStamp
     {
         /// <summary>
         /// 收据号
         /// </summary>
-        [Key]
         [Column("charge_id")]
         public Guid ChargeId { get; set; }
         /// <summary>
         /// 支付方式
         /// </summary>
-        [Key]
         [Column("pay_mode_id")]
         [StringLength(4)]
         public string PayModeId { get; set; } = null!;
@@ -50,9 +49,6 @@ namespace Shentun.Peis.Models
         [InverseProperty("ChargePays")]
         public virtual PayMode PayMode { get; set; } = null!;
 
-        public override object[] GetKeys()
-        {
-            return new object[] { ChargeId, PayModeId };
-        }
+      
     }
 }

src/Shentun.Peis.EntityFrameworkCore/DbMapping/ChargeBackAsbitems/ChargeBackAsbitemDbMapping.cs

@@ -0,0 +1,42 @@
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using Microsoft.EntityFrameworkCore;
+using Shentun.Peis.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Shentun.Peis.EntityFrameworkCore;
+
+namespace Shentun.Peis.DbMapping
+{
+   
+    internal class ChargeBackAsbitemDbMapping : IEntityTypeConfiguration<ChargeBackAsbitem>
+    {
+        public void Configure(EntityTypeBuilder<ChargeBackAsbitem> entity)
+        {
+            entity.HasComment("退费组合项目表");
+
+            entity.Property(e => e.Id).ValueGeneratedNever();
+
+         
+            entity.Property(e => e.ChargeBackId).IsRequired();
+
+            entity.Property(e => e.ChargeAsbitemId).IsRequired();
+
+            entity.HasOne(d => d.ChargeBack)
+              .WithMany(p => p.ChargeBackAsbitems)
+              .HasForeignKey(d => d.ChargeBackId)
+              .OnDelete(DeleteBehavior.ClientSetNull)
+              .HasConstraintName("fk_chargebackasbitem_chargeback");
+
+            entity.HasOne(d => d.ChargeAsbitem)
+             .WithMany(p => p.ChargeBackAsbitems)
+             .HasForeignKey(d => d.ChargeAsbitemId)
+             .OnDelete(DeleteBehavior.ClientSetNull)
+             .HasConstraintName("fk_chargebackasbitem_chargeasbitem");
+
+            entity.ConfigureByConvention();
+        }
+    }
+}

src/Shentun.Peis.EntityFrameworkCore/EntityFrameworkCore/PeisDbContext.cs

@@ -338,6 +338,8 @@ public class PeisDbContext :
     public DbSet<PatientRegisterExter> PatientRegisterExters { get; set; } = null!;
 
     public DbSet<DiseaseScreeningType> DiseaseScreeningTypes { get; set; } = null!;
+
+    public DbSet<ChargeBackAsbitem> ChargeBackAsbitems { get; set; } = null!;
     public PeisDbContext(DbContextOptions<PeisDbContext> options)
         : base(options)
     {
@@ -571,7 +573,8 @@ public class PeisDbContext :
         .ApplyConfiguration(new ThirdInterfaceDbMapping())
         .ApplyConfiguration(new CollectItemTypeDbMapping())
         .ApplyConfiguration(new PatientRegisterExterDbMapping())
-        .ApplyConfiguration(new DiseaseScreeningTypeDbMapping());
+        .ApplyConfiguration(new DiseaseScreeningTypeDbMapping())
+        .ApplyConfiguration(new ChargeBackAsbitemDbMapping());
 
         #endregion
 

src/Shentun.Peis.EntityFrameworkCore/Migrations/20240520151345_init20240520003.cs

@@ -0,0 +1,60 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Shentun.Peis.Migrations
+{
+    public partial class init20240520003 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "charge_back_asbitem",
+                columns: table => new
+                {
+                    id = table.Column<Guid>(type: "uuid", nullable: false),
+                    charge_back_id = table.Column<Guid>(type: "uuid", nullable: false),
+                    charge_asbitem_id = table.Column<Guid>(type: "uuid", nullable: false),
+                    amount = table.Column<short>(type: "smallint", 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_back_asbitem", x => x.id);
+                    table.ForeignKey(
+                        name: "fk_chargebackasbitem_chargeasbitem",
+                        column: x => x.charge_asbitem_id,
+                        principalTable: "charge_asbitem",
+                        principalColumn: "id");
+                    table.ForeignKey(
+                        name: "fk_chargebackasbitem_chargeback",
+                        column: x => x.charge_back_id,
+                        principalTable: "charge_back",
+                        principalColumn: "id");
+                },
+                comment: "退费组合项目表");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_charge_back_asbitem_charge_asbitem_id",
+                table: "charge_back_asbitem",
+                column: "charge_asbitem_id");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_charge_bak_asbitem_asbitem_id",
+                table: "charge_back_asbitem",
+                columns: new[] { "charge_back_id", "charge_asbitem_id" },
+                unique: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "charge_back_asbitem");
+        }
+    }
+}

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

@@ -1602,6 +1602,61 @@ namespace Shentun.Peis.Migrations
                     b.HasComment("退费主档");
                 });
 
+            modelBuilder.Entity("Shentun.Peis.Models.ChargeBackAsbitem", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<short>("Amount")
+                        .HasColumnType("smallint")
+                        .HasColumnName("amount");
+
+                    b.Property<Guid>("ChargeAsbitemId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("charge_asbitem_id");
+
+                    b.Property<Guid>("ChargeBackId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("charge_back_id");
+
+                    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<DateTime?>("LastModificationTime")
+                        .IsRequired()
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("last_modification_time");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .IsRequired()
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_modifier_id");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ChargeAsbitemId");
+
+                    b.HasIndex(new[] { "ChargeBackId", "ChargeAsbitemId" }, "IX_charge_bak_asbitem_asbitem_id")
+                        .IsUnique();
+
+                    b.ToTable("charge_back_asbitem");
+
+                    b.HasComment("退费组合项目表");
+                });
+
             modelBuilder.Entity("Shentun.Peis.Models.ChargeBackPay", b =>
                 {
                     b.Property<Guid>("ChargeBackId")
@@ -12775,6 +12830,25 @@ namespace Shentun.Peis.Migrations
                     b.Navigation("Charge");
                 });
 
+            modelBuilder.Entity("Shentun.Peis.Models.ChargeBackAsbitem", b =>
+                {
+                    b.HasOne("Shentun.Peis.Models.ChargeAsbitem", "ChargeAsbitem")
+                        .WithMany("ChargeBackAsbitems")
+                        .HasForeignKey("ChargeAsbitemId")
+                        .IsRequired()
+                        .HasConstraintName("fk_chargebackasbitem_chargeasbitem");
+
+                    b.HasOne("Shentun.Peis.Models.ChargeBack", "ChargeBack")
+                        .WithMany("ChargeBackAsbitems")
+                        .HasForeignKey("ChargeBackId")
+                        .IsRequired()
+                        .HasConstraintName("fk_chargebackasbitem_chargeback");
+
+                    b.Navigation("ChargeAsbitem");
+
+                    b.Navigation("ChargeBack");
+                });
+
             modelBuilder.Entity("Shentun.Peis.Models.ChargeBackPay", b =>
                 {
                     b.HasOne("Shentun.Peis.Models.ChargeBack", "ChargeBack")
@@ -14016,11 +14090,15 @@ namespace Shentun.Peis.Migrations
 
             modelBuilder.Entity("Shentun.Peis.Models.ChargeAsbitem", b =>
                 {
+                    b.Navigation("ChargeBackAsbitems");
+
                     b.Navigation("ChargePriceItems");
                 });
 
             modelBuilder.Entity("Shentun.Peis.Models.ChargeBack", b =>
                 {
+                    b.Navigation("ChargeBackAsbitems");
+
                     b.Navigation("ChargeBackPays");
                 });