wxd 11 months ago
parent
commit
c4539a7d9a
  1. 26
      src/Shentun.Pacs.Application/PacsDataMigrates/PacsDataMigrateAppService.cs
  2. 12
      src/Shentun.Pacs.Domain/BigtextResultTemplates/BigtextResultTemplate.cs
  3. 4
      src/Shentun.Pacs.Domain/BigtextResultTypes/BigtextResultType.cs
  4. 4
      src/Shentun.Pacs.Domain/ItemTypes/ItemType.cs
  5. 10
      src/Shentun.Pacs.EntityFrameworkCore/DbMapping/BigtextResultTypes/BigtextResultTypeDbMapping.cs
  6. 17
      src/Shentun.Pacs.EntityFrameworkCore/Migrations/PeisDbContextModelSnapshot.cs

26
src/Shentun.Pacs.Application/PacsDataMigrates/PacsDataMigrateAppService.cs

@ -0,0 +1,26 @@
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Volo.Abp.Application.Services;
namespace Shentun.Pacs.PacsDataMigrates
{
/// <summary>
/// 迁移老数据
/// </summary>
[ApiExplorerSettings(GroupName = "Work")]
//[Authorize]
public class PacsDataMigrateAppService : ApplicationService
{
public PacsDataMigrateAppService()
{
}
}
}

12
src/Shentun.Pacs.Domain/BigtextResultTemplates/BigtextResultTemplate.cs

@ -43,17 +43,7 @@ namespace Shentun.Pacs.Models
[Column("concurrency_stamp")] [Column("concurrency_stamp")]
public string ConcurrencyStamp { get; set; } public string ConcurrencyStamp { get; set; }
//[Column("last_modifier_id")]
//public Guid LastModifierId { get; set; }
//[Column("last_modification_time", TypeName = "timestamp without time zone")]
//public DateTime LastModificationTime { get; set; }
//[Column("creator_id")]
//public Guid CreatorId { get; set; }
//[Column("creation_time", TypeName = "timestamp without time zone")]
//public DateTime CreationTime { get; set; }
//[Column("concurrency_stamp")]
//[StringLength(40)]
//public string ConcurrencyStamp { get; set; } = null!;
[ForeignKey(nameof(BigtextResultTypeId))] [ForeignKey(nameof(BigtextResultTypeId))]
[InverseProperty("BigtextResultTemplates")] [InverseProperty("BigtextResultTemplates")]

4
src/Shentun.Pacs.Domain/BigtextResultTypes/BigtextResultType.cs

@ -54,9 +54,7 @@ namespace Shentun.Pacs.Models
[Column("concurrency_stamp")] [Column("concurrency_stamp")]
public string ConcurrencyStamp { get; set; } public string ConcurrencyStamp { get; set; }
[ForeignKey(nameof(ItemTypeId))]
[InverseProperty("BigtextResultTypes")]
public virtual ItemType ItemType { get; set; } = null!;
[InverseProperty(nameof(BigtextResultTemplate.BigtextResultType))] [InverseProperty(nameof(BigtextResultTemplate.BigtextResultType))]
public virtual ICollection<BigtextResultTemplate> BigtextResultTemplates { get; set; } public virtual ICollection<BigtextResultTemplate> BigtextResultTemplates { get; set; }

4
src/Shentun.Pacs.Domain/ItemTypes/ItemType.cs

@ -26,7 +26,6 @@ namespace Shentun.Pacs.Models
: base(id) : base(id)
{ {
Asbitems = new HashSet<Asbitem>(); Asbitems = new HashSet<Asbitem>();
BigtextResultTypes = new HashSet<BigtextResultType>();
Diagnoses = new HashSet<Diagnosis>(); Diagnoses = new HashSet<Diagnosis>();
Items = new HashSet<Item>(); Items = new HashSet<Item>();
Rooms = new HashSet<Room>(); Rooms = new HashSet<Room>();
@ -121,8 +120,7 @@ namespace Shentun.Pacs.Models
public virtual MedicalReportType MedicalReportType { get; set; } = null!; public virtual MedicalReportType MedicalReportType { get; set; } = null!;
[InverseProperty(nameof(Asbitem.ItemType))] [InverseProperty(nameof(Asbitem.ItemType))]
public virtual ICollection<Asbitem> Asbitems { get; set; } public virtual ICollection<Asbitem> Asbitems { get; set; }
[InverseProperty(nameof(BigtextResultType.ItemType))]
public virtual ICollection<BigtextResultType> BigtextResultTypes { get; set; }
[InverseProperty(nameof(Diagnosis.ItemType))] [InverseProperty(nameof(Diagnosis.ItemType))]
public virtual ICollection<Diagnosis> Diagnoses { get; set; } public virtual ICollection<Diagnosis> Diagnoses { get; set; }
[InverseProperty(nameof(Item.ItemType))] [InverseProperty(nameof(Item.ItemType))]

10
src/Shentun.Pacs.EntityFrameworkCore/DbMapping/BigtextResultTypes/BigtextResultTypeDbMapping.cs

@ -24,11 +24,11 @@ namespace Shentun.Pacs.DbMapping
//entity.Property(e => e.CreationTime).HasDefaultValueSql("(date(timezone('UTC-8'::text, now())) - 1)"); //entity.Property(e => e.CreationTime).HasDefaultValueSql("(date(timezone('UTC-8'::text, now())) - 1)");
entity.HasOne(d => d.ItemType)
.WithMany(p => p.BigtextResultTypes)
.HasForeignKey(d => d.ItemTypeId)
.OnDelete(DeleteBehavior.ClientSetNull)
.HasConstraintName("fk_bigtext");
//entity.HasOne(d => d.ItemType)
// .WithMany(p => p.BigtextResultTypes)
// .HasForeignKey(d => d.ItemTypeId)
// .OnDelete(DeleteBehavior.ClientSetNull)
// .HasConstraintName("fk_bigtext");
entity.ConfigureByConvention(); entity.ConfigureByConvention();
} }

17
src/Shentun.Pacs.EntityFrameworkCore/Migrations/PeisDbContextModelSnapshot.cs

@ -1081,8 +1081,6 @@ namespace Shentun.Pacs.Migrations
b.HasKey("Id"); b.HasKey("Id");
b.HasIndex("ItemTypeId");
b.ToTable("bigtext_result_type"); b.ToTable("bigtext_result_type");
b.HasComment("大文本结果类别"); b.HasComment("大文本结果类别");
@ -12906,7 +12904,7 @@ namespace Shentun.Pacs.Migrations
.HasColumnName("method_name"); .HasColumnName("method_name");
b.Property<string>("Parameters") b.Property<string>("Parameters")
.HasMaxLength(2000)
.HasMaxLength(50000)
.HasColumnType("text") .HasColumnType("text")
.HasColumnName("parameters"); .HasColumnName("parameters");
@ -14436,17 +14434,6 @@ namespace Shentun.Pacs.Migrations
b.Navigation("BigtextResultType"); b.Navigation("BigtextResultType");
}); });
modelBuilder.Entity("Shentun.Pacs.Models.BigtextResultType", b =>
{
b.HasOne("Shentun.Pacs.Models.ItemType", "ItemType")
.WithMany("BigtextResultTypes")
.HasForeignKey("ItemTypeId")
.IsRequired()
.HasConstraintName("fk_bigtext");
b.Navigation("ItemType");
});
modelBuilder.Entity("Shentun.Pacs.Models.CardBill", b => modelBuilder.Entity("Shentun.Pacs.Models.CardBill", b =>
{ {
b.HasOne("Shentun.Pacs.Models.CardRegister", "CardRegister") b.HasOne("Shentun.Pacs.Models.CardRegister", "CardRegister")
@ -16021,8 +16008,6 @@ namespace Shentun.Pacs.Migrations
{ {
b.Navigation("Asbitems"); b.Navigation("Asbitems");
b.Navigation("BigtextResultTypes");
b.Navigation("Diagnoses"); b.Navigation("Diagnoses");
b.Navigation("Items"); b.Navigation("Items");

Loading…
Cancel
Save