From a423c7c73a8ec9d72cec632b170c630dc5db0de8 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Thu, 26 Sep 2024 11:41:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=BE=E7=A4=BA=E5=AF=BC?=
 =?UTF-8?q?=E8=88=AA=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.Domain/Image/TaskStudy.cs            |  2 --
 .../EntityConfigration/ImageConfigration.cs      | 16 +++++++++++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/IRaCIS.Core.Domain/Image/TaskStudy.cs b/IRaCIS.Core.Domain/Image/TaskStudy.cs
index cf2c91c4e..c08f94a49 100644
--- a/IRaCIS.Core.Domain/Image/TaskStudy.cs
+++ b/IRaCIS.Core.Domain/Image/TaskStudy.cs
@@ -9,8 +9,6 @@ public class TaskStudy : BaseFullDeleteAuditEntity, IEntitySeqId
     [ForeignKey("VisitTaskId")]
     public VisitTask VisitTask { get; set; }
 
-    [JsonIgnore]
-    public List<StudyMonitor> DicomStudyMonitorList { get; set; } = new List<StudyMonitor>();
 
     [JsonIgnore]
     public List<TaskInstance> InstanceList { get; set; }
diff --git a/IRaCIS.Core.Infra.EFCore/EntityConfigration/ImageConfigration.cs b/IRaCIS.Core.Infra.EFCore/EntityConfigration/ImageConfigration.cs
index 0f5762cc1..22cdb7da9 100644
--- a/IRaCIS.Core.Infra.EFCore/EntityConfigration/ImageConfigration.cs
+++ b/IRaCIS.Core.Infra.EFCore/EntityConfigration/ImageConfigration.cs
@@ -13,7 +13,9 @@ public class DicomStudyConfigration : IEntityTypeConfiguration<DicomStudy>
     {
         builder.HasKey(e => e.SeqId);
 
-        builder.HasMany(s => s.SeriesList).WithOne(sv => sv.DicomStudy).HasForeignKey(t => t.StudyId).HasPrincipalKey(t=>t.Id);
+        builder.HasMany(s => s.SeriesList).WithOne(se => se.DicomStudy).HasForeignKey(se => se.StudyId).HasPrincipalKey(st=>st.Id);
+
+        builder.HasMany(s => s.DicomStudyMonitorList).WithOne(sm => sm.DicomStudy).HasForeignKey(sm => sm.StudyId).HasPrincipalKey(se => se.Id);
     }
 }
 
@@ -22,6 +24,9 @@ public class DicomSeriesConfigration : IEntityTypeConfiguration<DicomSeries>
     public void Configure(EntityTypeBuilder<DicomSeries> builder)
     {
         builder.HasKey(e => e.SeqId);
+
+        builder.HasMany(s => s.DicomInstanceList).WithOne(di => di.DicomSerie).HasForeignKey(t => t.SeriesId).HasPrincipalKey(se => se.Id);
+
     }
 }
 
@@ -38,6 +43,9 @@ public class TaskStudyConfigration : IEntityTypeConfiguration<TaskStudy>
     public void Configure(EntityTypeBuilder<TaskStudy> builder)
     {
         builder.HasKey(e => e.SeqId);
+
+        builder.HasMany(s => s.SeriesList).WithOne(se => se.TaskStudy).HasForeignKey(se => se.StudyId).HasPrincipalKey(st => st.Id);
+
     }
 }
 
@@ -46,6 +54,8 @@ public class TaskSeriesConfigration : IEntityTypeConfiguration<TaskSeries>
     public void Configure(EntityTypeBuilder<TaskSeries> builder)
     {
         builder.HasKey(e => e.SeqId);
+
+        builder.HasMany(s => s.InstanceList).WithOne(di => di.TaskSeries).HasForeignKey(t => t.SeriesId).HasPrincipalKey(se => se.Id);
     }
 }
 
@@ -63,6 +73,9 @@ public class SCPStudyConfigration : IEntityTypeConfiguration<SCPStudy>
     public void Configure(EntityTypeBuilder<SCPStudy> builder)
     {
         builder.HasKey(e => e.SeqId);
+
+        builder.HasMany(s => s.SeriesList).WithOne(se => se.SCPStudy).HasForeignKey(se => se.StudyId).HasPrincipalKey(st => st.Id);
+
     }
 }
 
@@ -71,6 +84,7 @@ public class SCPSeriesConfigration : IEntityTypeConfiguration<SCPSeries>
     public void Configure(EntityTypeBuilder<SCPSeries> builder)
     {
         builder.HasKey(e => e.SeqId);
+        builder.HasMany(s => s.SCPInstanceList).WithOne(di => di.SCPSeries).HasForeignKey(t => t.SeriesId).HasPrincipalKey(se => se.Id);
     }
 }