修正

src/Shentun.Peis.Domain/Models/BirthPlace.cs

@@ -4,6 +4,7 @@ using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using Microsoft.EntityFrameworkCore;
 using Volo.Abp.Domain.Entities;
+using Volo.Abp.Domain.Entities.Auditing;
 
 namespace Shentun.Peis.Models
 {

src/Shentun.Peis.Domain/Models/CustomerOrgChargePay.cs

@@ -23,7 +23,7 @@ namespace Shentun.Peis.Models
         [Precision(10, 2)]
         public decimal ChargeMoney { get; set; }
 
-        [ForeignKey(nameof(CustomerOrgChargeId))]
+        [ForeignKey(nameof(Id))]
         [InverseProperty("CustomerOrgChargePay")]
         public virtual CustomerOrgCharge CustomerOrgCharge { get; set; } = null!;
         [ForeignKey(nameof(PayModeId))]

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

@@ -350,7 +350,7 @@ public class PeisDbContext :
 
 
 
-            entity.Property(e => e.AsbitemId)
+            entity.Property(e => e.Id)
                 .IsFixedLength()
                 .HasComment("编号");
 
@@ -421,7 +421,7 @@ public class PeisDbContext :
 
             entity.HasComment("组和项目包含价表项目");
 
-            entity.Property(e => e.AsbitemPriceItemId).IsFixedLength();
+            entity.Property(e => e.Id).IsFixedLength();
 
             entity.Property(e => e.AsbitemId).IsFixedLength();
 
@@ -432,7 +432,7 @@ public class PeisDbContext :
         {
             entity.HasComment("大文本结果结论");
 
-            entity.Property(e => e.BigtextResultConclusionId).IsFixedLength();
+            entity.Property(e => e.Id).IsFixedLength();
 
             entity.Property(e => e.BigtextResultTemplateId).IsFixedLength();
 
@@ -452,7 +452,7 @@ public class PeisDbContext :
 
             entity.HasComment("大文本结果描述");
 
-            entity.Property(e => e.BigtextResultDescriptionId).IsFixedLength();
+            entity.Property(e => e.Id).IsFixedLength();
 
             entity.Property(e => e.BigtextResultTemplateId).IsFixedLength();
 
@@ -471,7 +471,7 @@ public class PeisDbContext :
 
             entity.HasComment("大文本结果模板");
 
-            entity.Property(e => e.BigtextResultTemplateId).IsFixedLength();
+            entity.Property(e => e.Id).IsFixedLength();
 
             entity.Property(e => e.BigtextResultTypeId).IsFixedLength();
 
@@ -488,7 +488,7 @@ public class PeisDbContext :
 
             entity.HasComment("大文本结果类别");
 
-            entity.Property(e => e.BigtextResultTypeId).IsFixedLength();
+            entity.Property(e => e.Id).IsFixedLength();
 
             //entity.Property(e => e.CreationTime).HasDefaultValueSql("(date(timezone('UTC-8'::text, now())) - 1)");
 
@@ -508,7 +508,7 @@ public class PeisDbContext :
 
             entity.HasComment("出生地");
 
-            entity.Property(e => e.BirthPlaceId).IsFixedLength();
+            entity.Property(e => e.Id).IsFixedLength();
 
             //entity.Property(e => e.CreationTime).HasDefaultValueSql("(date(timezone('UTC-8'::text, now())) - 1)");
 
@@ -522,7 +522,7 @@ public class PeisDbContext :
 
             entity.HasComment("卡记账记录");
 
-            entity.Property(e => e.CardBillId)
+            entity.Property(e => e.Id)
                 .ValueGeneratedNever()
                 .HasComment("编号");
 
@@ -561,7 +561,7 @@ public class PeisDbContext :
 
             entity.HasComment("会员卡登记");
 
-            entity.Property(e => e.CardRegisterId)
+            entity.Property(e => e.Id)
                 .ValueGeneratedNever()
                 .HasComment("编号");
 
@@ -618,7 +618,7 @@ public class PeisDbContext :
 
             entity.HasComment("会员卡类别");
 
-            entity.Property(e => e.CardTypeId)
+            entity.Property(e => e.Id)
                 .IsFixedLength()
                 .HasComment("编号");
 
@@ -652,7 +652,7 @@ public class PeisDbContext :
 
             entity.HasComment("收费主档");
 
-            entity.Property(e => e.ChargeId)
+            entity.Property(e => e.Id)
                 .ValueGeneratedNever()
                 .HasComment("收据号");
 
@@ -678,7 +678,7 @@ public class PeisDbContext :
 
             entity.HasComment("收费包含组合项目");
 
-            entity.Property(e => e.ChargeAsbitemId).ValueGeneratedNever();
+            entity.Property(e => e.Id).ValueGeneratedNever();
 
             entity.Property(e => e.AsbitemId)
                 .IsFixedLength()
@@ -706,7 +706,7 @@ public class PeisDbContext :
 
             entity.HasComment("退费主档");
 
-            entity.Property(e => e.ChargeBackId)
+            entity.Property(e => e.Id)
                 .ValueGeneratedNever()
                 .HasComment("退费编号");
 
@@ -782,7 +782,7 @@ public class PeisDbContext :
 
             entity.HasComment("收费价表项目");
 
-            entity.Property(e => e.ChargePriceItemId).ValueGeneratedNever();
+            entity.Property(e => e.Id).ValueGeneratedNever();
 
             entity.HasOne(d => d.ChargeAsbitem)
                 .WithMany(p => p.ChargePriceItems)
@@ -799,7 +799,7 @@ public class PeisDbContext :
 
             entity.HasComment("常用字符");
 
-            entity.Property(e => e.CommonCharId).IsFixedLength();
+            entity.Property(e => e.Id).IsFixedLength();
 
             entity.Property(e => e.CommonCharTypeId).IsFixedLength();
 
@@ -819,7 +819,7 @@ public class PeisDbContext :
 
             entity.HasComment("常用字符类别");
 
-            entity.Property(e => e.CommonCharTypeId).IsFixedLength();
+            entity.Property(e => e.Id).IsFixedLength();
 
             //entity.Property(e => e.CreationTime).HasDefaultValueSql("(date(timezone('UTC-8'::text, now())) - 1)");
 
@@ -855,7 +855,7 @@ public class PeisDbContext :
 
             entity.HasComment("联系人");
 
-            entity.Property(e => e.ContactPersonId).IsFixedLength();
+            entity.Property(e => e.Id).IsFixedLength();
 
             //entity.Property(e => e.CreationTime).HasDefaultValueSql("(date(timezone('UTC-8'::text, now())) - 1)");
 
@@ -875,7 +875,7 @@ public class PeisDbContext :
 
             entity.HasComment("危急值关键字设置");
 
-            entity.Property(e => e.CriticalValueId).IsFixedLength();
+            entity.Property(e => e.Id).IsFixedLength();
 
             //entity.Property(e => e.CreationTime).HasDefaultValueSql("(date(timezone('UTC-8'::text, now())) - 1)");
 
@@ -893,7 +893,7 @@ public class PeisDbContext :
 
             entity.HasComment("危急值类别");
 
-            entity.Property(e => e.CriticalValueTypeId).IsFixedLength();
+            entity.Property(e => e.Id).IsFixedLength();
 
             //entity.Property(e => e.CreationTime).HasDefaultValueSql("(date(timezone('UTC-8'::text, now())) - 1)");
 
@@ -908,7 +908,7 @@ public class PeisDbContext :
 
             entity.HasComment("团检单位设置");
 
-            entity.Property(e => e.CustomerOrgId)
+            entity.Property(e => e.Id)
                 .IsFixedLength()
                 .HasComment("单位ID");
 
@@ -962,7 +962,7 @@ public class PeisDbContext :
 
             entity.HasComment("团检单位收费");
 
-            entity.Property(e => e.CustomerOrgChargeId).ValueGeneratedNever();
+            entity.Property(e => e.Id).ValueGeneratedNever();
 
             entity.HasOne(d => d.CustomerOrgRegister)
                 .WithMany(p => p.CustomerOrgCharges)
@@ -975,7 +975,7 @@ public class PeisDbContext :
         {
             entity.HasComment("团检单位退费");
 
-            entity.Property(e => e.CustomerOrgChargeBackId).ValueGeneratedNever();
+            entity.Property(e => e.Id).ValueGeneratedNever();
 
             //entity.Property(e => e.CreationTime).HasDefaultValueSql("(date(timezone('UTC-8'::text, now())) - 1)");
 
@@ -1010,18 +1010,18 @@ public class PeisDbContext :
 
         builder.Entity<CustomerOrgChargePay>(entity =>
         {
-            entity.HasKey(e => e.CustomerOrgChargeId)
+            entity.HasKey(e => e.Id)
                 .HasName("pk_org_charge_pay");
 
             entity.HasComment("团检收费支付方式");
 
-            entity.Property(e => e.CustomerOrgChargeId).ValueGeneratedNever();
+            entity.Property(e => e.Id).ValueGeneratedNever();
 
             entity.Property(e => e.PayModeId).IsFixedLength();
 
             entity.HasOne(d => d.CustomerOrgCharge)
                 .WithOne(p => p.CustomerOrgChargePay)
-                .HasForeignKey<CustomerOrgChargePay>(d => d.CustomerOrgChargeId)
+                .HasForeignKey<CustomerOrgChargePay>(d => d.Id)
                 .OnDelete(DeleteBehavior.ClientSetNull)
                 .HasConstraintName("fk_org_charge_pay_org_charge");
 
@@ -1036,7 +1036,7 @@ public class PeisDbContext :
         {
             entity.HasComment("团体分组主档");
 
-            entity.Property(e => e.CustomerOrgGroupId)
+            entity.Property(e => e.Id)
                 .IsFixedLength()
                 .HasComment("分组编号");
 
@@ -1108,7 +1108,7 @@ public class PeisDbContext :
         {
             entity.HasComment("团检体检登记");
 
-            entity.Property(e => e.CustomerOrgRegisterId).ValueGeneratedNever();
+            entity.Property(e => e.Id).ValueGeneratedNever();
 
             entity.Property(e => e.BeginTime)
                 .HasDefaultValueSql("(date(timezone('UTC-8'::text, now())) - 1)")
@@ -1140,12 +1140,11 @@ public class PeisDbContext :
 
         builder.Entity<CustomerOrgType>(entity =>
         {
-            entity.HasKey(e => e.OrgTypeId)
-                .HasName("pk_org_type");
+          
 
             entity.HasComment("团体类型设置");
 
-            entity.Property(e => e.OrgTypeId).IsFixedLength();
+            entity.Property(e => e.Id).IsFixedLength();
 
             //entity.Property(e => e.CreationTime).HasDefaultValueSql("(date(timezone('UTC-8'::text, now())) - 1)");
         });
@@ -1154,7 +1153,7 @@ public class PeisDbContext :
         {
             entity.HasComment("部门");
 
-            entity.Property(e => e.DepartmentId).IsFixedLength();
+            entity.Property(e => e.Id).IsFixedLength();
 
             //entity.Property(e => e.CreationTime).HasDefaultValueSql("(date(timezone('UTC-8'::text, now())) - 1)");
 
@@ -1169,7 +1168,7 @@ public class PeisDbContext :
         {
             entity.HasComment("仪器类别设置");
 
-            entity.Property(e => e.DeviceTypeId)
+            entity.Property(e => e.Id)
                 .IsFixedLength()
                 .HasComment("仪器类别编号");
 
@@ -1192,7 +1191,7 @@ public class PeisDbContext :
         {
             entity.HasComment("诊断设置");
 
-            entity.Property(e => e.DiagnosisId).IsFixedLength();
+            entity.Property(e => e.Id).IsFixedLength();
 
             //entity.Property(e => e.CreationTime).HasDefaultValueSql("(date(timezone('UTC-8'::text, now())) - 1)");
 
@@ -1250,7 +1249,7 @@ public class PeisDbContext :
 
         builder.Entity<DiagnosisLevel>(entity =>
         {
-            entity.Property(e => e.DiagnosisLevelId).ValueGeneratedNever();
+            entity.Property(e => e.Id).ValueGeneratedNever();
 
             //entity.Property(e => e.LastModificationTime).HasDefaultValueSql("(date(timezone('UTC-8'::text, now())) - 1)");
         });
@@ -1259,7 +1258,7 @@ public class PeisDbContext :
         {
             entity.HasComment("诊断后缀设置");
 
-            entity.Property(e => e.DiagnosisPostfixId).IsFixedLength();
+            entity.Property(e => e.Id).IsFixedLength();
 
             //entity.Property(e => e.CreationTime).HasDefaultValueSql("(date(timezone('UTC-8'::text, now())) - 1)");
         });
@@ -1269,7 +1268,7 @@ public class PeisDbContext :
         {
             entity.HasComment("诊断模板设置");
 
-            entity.Property(e => e.DiagnosisTemplateId).IsFixedLength();
+            entity.Property(e => e.Id).IsFixedLength();
 
             //entity.Property(e => e.CreationTime).HasDefaultValueSql("(date(timezone('UTC-8'::text, now())) - 1)");
         });
@@ -1302,7 +1301,7 @@ public class PeisDbContext :
         {
             entity.HasComment("诊断类别");
 
-            entity.Property(e => e.DiagnosisTypeId).IsFixedLength();
+            entity.Property(e => e.Id).IsFixedLength();
 
             //entity.Property(e => e.CreationTime).HasDefaultValueSql("(date(timezone('UTC-8'::text, now())) - 1)");
 
@@ -1311,12 +1310,12 @@ public class PeisDbContext :
 
         builder.Entity<FollowUpMode>(entity =>
         {
-            entity.Property(e => e.FollowUpModeId).IsFixedLength();
+            entity.Property(e => e.Id).IsFixedLength();
         });
 
         builder.Entity<FollowUpPlan>(entity =>
         {
-            entity.Property(e => e.FollowUpPlanId).ValueGeneratedNever();
+            entity.Property(e => e.Id).ValueGeneratedNever();
 
             entity.Property(e => e.FollowUpModeId).IsFixedLength();
 
@@ -1325,7 +1324,7 @@ public class PeisDbContext :
 
         builder.Entity<FollowUpType>(entity =>
         {
-            entity.Property(e => e.FollowUpTypeId).IsFixedLength();
+            entity.Property(e => e.Id).IsFixedLength();
         });
 
         builder.Entity<ForSex>(entity =>
@@ -1346,7 +1345,7 @@ public class PeisDbContext :
         {
             entity.HasComment("指引类别");
 
-            entity.Property(e => e.GuideTypeId).IsFixedLength();
+            entity.Property(e => e.Id).IsFixedLength();
 
             //entity.Property(e => e.CreationTime).HasDefaultValueSql("(date(timezone('UTC-8'::text, now())) - 1)");
 
@@ -1357,12 +1356,12 @@ public class PeisDbContext :
 
         builder.Entity<HealthCertificate>(entity =>
         {
-            entity.HasKey(e => e.PatientRegisterId)
-                .HasName("pk_health_certificate");
+            //entity.HasKey(e => e.Id)
+            //    .HasName("pk_health_certificate");
 
             entity.HasComment("健康证办理");
 
-            entity.Property(e => e.PatientRegisterId)
+            entity.Property(e => e.Id)
                 .ValueGeneratedNever()
                 .HasComment("登记流水号");
 
@@ -1384,7 +1383,7 @@ public class PeisDbContext :
 
             entity.HasOne(d => d.PatientRegister)
                 .WithOne(p => p.HealthCertificate)
-                .HasForeignKey<HealthCertificate>(d => d.PatientRegisterId)
+                .HasForeignKey<HealthCertificate>(d => d.Id)
                 .OnDelete(DeleteBehavior.ClientSetNull)
                 .HasConstraintName("fk_health_");
         });