From 50712aefc6d6b84c5a9ffc3f50e14f665d21d79b Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Sun, 29 Sep 2024 15:00:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bm=20=E5=AF=BC=E8=88=AA?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E9=85=8D=E7=BD=AE=E9=81=97=E6=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.Domain/Image/DicomInstance.cs          |  3 +++
 .../SubjectCriteriaEvaluationVisitStudyFilter.cs   |  1 +
 .../EntityConfigration/ImageConfigration.cs        | 14 +++++++++++++-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Domain/Image/DicomInstance.cs b/IRaCIS.Core.Domain/Image/DicomInstance.cs
index 393f1fa84..a6c22faa3 100644
--- a/IRaCIS.Core.Domain/Image/DicomInstance.cs
+++ b/IRaCIS.Core.Domain/Image/DicomInstance.cs
@@ -12,6 +12,9 @@ public class DicomInstance : BaseFullAuditEntity, IEntitySeqId
     [JsonIgnore]
     [ForeignKey("StudyId")]
     public DicomStudy DicomStudy { get; set; }
+
+    [JsonIgnore]
+    public List<ReadingTableAnswerRowInfo> ReadingTableAnswerRowInfoList { get; set; }
     #endregion
 
     public bool Anonymize { get; set; }
diff --git a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitStudyFilter.cs b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitStudyFilter.cs
index 39855f498..63e7e46ee 100644
--- a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitStudyFilter.cs
+++ b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitStudyFilter.cs
@@ -15,6 +15,7 @@ public class SubjectCriteriaEvaluationVisitStudyFilter : BaseFullAuditEntity
     [ForeignKey("SeriesId")]
     [JsonIgnore]
     public DicomSeries Series { get; set; }
+
     [ForeignKey("StudyId")]
     [JsonIgnore]
     public DicomStudy Study { get; set; }
diff --git a/IRaCIS.Core.Infra.EFCore/EntityConfigration/ImageConfigration.cs b/IRaCIS.Core.Infra.EFCore/EntityConfigration/ImageConfigration.cs
index 22cdb7da9..873e12540 100644
--- a/IRaCIS.Core.Infra.EFCore/EntityConfigration/ImageConfigration.cs
+++ b/IRaCIS.Core.Infra.EFCore/EntityConfigration/ImageConfigration.cs
@@ -13,9 +13,11 @@ public class DicomStudyConfigration : IEntityTypeConfiguration<DicomStudy>
     {
         builder.HasKey(e => e.SeqId);
 
-        builder.HasMany(s => s.SeriesList).WithOne(se => se.DicomStudy).HasForeignKey(se => se.StudyId).HasPrincipalKey(st=>st.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);
+
+        builder.HasMany(s => s.SubjectCriteriaEvaluationVisitStudyFilterList).WithOne(sm => sm.Study).HasForeignKey(sm => sm.StudyId).HasPrincipalKey(se => se.Id);
     }
 }
 
@@ -27,6 +29,8 @@ public class DicomSeriesConfigration : IEntityTypeConfiguration<DicomSeries>
 
         builder.HasMany(s => s.DicomInstanceList).WithOne(di => di.DicomSerie).HasForeignKey(t => t.SeriesId).HasPrincipalKey(se => se.Id);
 
+        builder.HasMany(s => s.SubjectCriteriaEvaluationVisitStudyFilterList).WithOne(di => di.Series).HasForeignKey(t => t.SeriesId).HasPrincipalKey(se => se.Id);
+        
     }
 }
 
@@ -35,6 +39,9 @@ public class DicomInstanceConfigration : IEntityTypeConfiguration<DicomInstance>
     public void Configure(EntityTypeBuilder<DicomInstance> builder)
     {
         builder.HasKey(e => e.SeqId);
+
+        builder.HasMany(s => s.ReadingTableAnswerRowInfoList).WithOne(di => di.Instance).HasForeignKey(t => t.InstanceId).HasPrincipalKey(se => se.Id);
+        
     }
 }
 
@@ -95,3 +102,8 @@ public class SCPInstanceConfigration : IEntityTypeConfiguration<SCPInstance>
         builder.HasKey(e => e.SeqId);
     }
 }
+
+
+
+
+