清理、整理代码

IRaCIS.Core.Infra.EFCore/EntityConfigration/DictionaryConfigration.cs

@@ -0,0 +1,24 @@
+using IRaCIS.Core.Domain.Models;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IRaCIS.Core.Infra.EFCore.EntityConfigration
+{
+    public class DictionaryConfigration : IEntityTypeConfiguration<Dictionary>
+    {
+
+
+        public void Configure(EntityTypeBuilder<Dictionary> builder)
+        {
+
+
+            builder.HasMany(t => t.ChildList).WithOne(t => t.Parent);
+
+        }
+    }
+}

IRaCIS.Core.Infra.EFCore/EntityConfigration/DoctorConfigration.cs

@@ -2,6 +2,7 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using System.Reflection.Emit;
 
 
 namespace IRaCIS.Core.Infra.EFCore.EntityConfigration
@@ -28,16 +29,5 @@ namespace IRaCIS.Core.Infra.EFCore.EntityConfigration
 
 
 
-    public class DictionaryConfigration : IEntityTypeConfiguration<Dictionary>
-    {
-
-
-        public void Configure(EntityTypeBuilder<Dictionary> builder)
-        {
-
-           //builder.Property(e => e.MappedValue).Metadata.SetBeforeSaveBehavior(PropertySaveBehavior.Ignore);
-           // builder.Property(e => e.MappedValue).Metadata.SetAfterSaveBehavior(PropertySaveBehavior.Ignore);
-
-        }
-    }
+  
 }

IRaCIS.Core.Infra.EFCore/EntityConfigration/NoneDicomStudyConfigration.cs

@@ -1,6 +1,7 @@
 using IRaCIS.Core.Domain.Models;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using System.Reflection.Emit;
 
 
 namespace IRaCIS.Core.Infra.EFCore.EntityConfigration
@@ -12,7 +13,8 @@ namespace IRaCIS.Core.Infra.EFCore.EntityConfigration
         public void Configure(EntityTypeBuilder<NoneDicomStudy> builder)
         {
 
-
+            builder.HasMany(t => t.NoneDicomFileList).WithOne(s => s.NoneDicomStudy).HasForeignKey(t => t.NoneDicomStudyId);
+            builder.HasMany(t => t.TaskNoneDicomFileList).WithOne(s => s.OriginNoneDicomStudy).HasForeignKey(t => t.OriginNoneDicomStudyId);
         }
     }
 }

IRaCIS.Core.Infra.EFCore/EntityConfigration/ReadingPeriodSiteConfigration.cs

@@ -1,18 +0,0 @@
-using IRaCIS.Core.Domain.Models;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Metadata.Builders;
-
-
-namespace IRaCIS.Core.Infra.EFCore.EntityConfigration
-{
-    public class ReadingPeriodSiteConfigration : IEntityTypeConfiguration<ReadingPeriodSite>
-    {
-       
-
-        public void Configure(EntityTypeBuilder<ReadingPeriodSite> builder)
-        {
-         
-          
-        }
-    }
-}

IRaCIS.Core.Infra.EFCore/EntityConfigration/ReadingQuestionTrialConfigration.cs

@@ -0,0 +1,25 @@
+using IRaCIS.Core.Domain.Models;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IRaCIS.Core.Infra.EFCore.EntityConfigration
+{
+
+    public class ReadingQuestionTrialConfigration : IEntityTypeConfiguration<ReadingQuestionTrial>
+    {
+
+
+        public void Configure(EntityTypeBuilder<ReadingQuestionTrial> builder)
+        {
+
+
+            builder.HasQueryFilter(p => p.IsAdditional == false);
+
+        }
+    }
+}

IRaCIS.Core.Infra.EFCore/EntityConfigration/StudyMonitorConfigration.cs

@@ -1,19 +0,0 @@
-using IRaCIS.Core.Domain.Models;
-//using IRaCIS.Core.Infra.EFCore.ValueGenerator;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Metadata.Builders;
-
-
-namespace IRaCIS.Core.Infra.EFCore.EntityConfigration
-{
-    public class StudyMonitorConfigration : IEntityTypeConfiguration<StudyMonitor>
-    {
-       
-
-        public void Configure(EntityTypeBuilder<StudyMonitor> builder)
-        {
-          
-
-        }
-    }
-}

IRaCIS.Core.Infra.EFCore/EntityConfigration/TrialUserConfigration.cs

@@ -20,4 +20,15 @@ namespace IRaCIS.Core.Infra.EFCore.EntityConfigration
 
         }
     }
+
+    public class UserConfigration : IEntityTypeConfiguration<User>
+    {
+
+
+        public void Configure(EntityTypeBuilder<User> builder)
+        {
+            builder.HasMany(t => t.VisitTaskList).WithOne(t => t.DoctorUser).HasForeignKey(t => t.DoctorUserId).IsRequired(false);
+
+        }
+    }
 }

IRaCIS.Core.Infra.EFCore/EntityConfigration/VisitTaskConfigration.cs

@@ -0,0 +1,57 @@
+using IRaCIS.Core.Domain.Models;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using System.Reflection.Emit;
+
+
+namespace IRaCIS.Core.Infra.EFCore.EntityConfigration
+{
+    public class VisitTaskConfigration : IEntityTypeConfiguration<VisitTask>
+    {
+       
+
+        public void Configure(EntityTypeBuilder<VisitTask> builder)
+        {
+
+            builder.HasMany(t => t.JudgeVisitList).WithOne(t => t.JudgeVisitTask);
+
+
+            builder.HasMany(t => t.TaskMedicalReviewList).WithOne(t => t.VisitTask).HasForeignKey(t => t.VisitTaskId);
+
+            builder.HasOne(t => t.Subject).WithMany(s => s.SubjectVisitTaskList).HasForeignKey(t => t.SubjectId);
+
+            builder.HasMany(t => t.TaskInfluenceList).WithOne(s => s.OriginalTask).HasForeignKey(t => t.OriginalTaskId);
+
+
+            builder.HasMany(t => t.GlobalVisitResultList).WithOne(s => s.GlobalVisitTask).HasForeignKey(t => t.GlobalTaskId);
+
+
+
+            builder.HasQueryFilter(b => b.Subject.IsDeleted == false);
+
+
+            //modelBuilder.Entity<TaskMedicalReviewRule>().HasMany(t => t.DoctorTrialVisitTaskList).WithOne(t => t.DoctorTaskMedicalReviewRule).HasForeignKey(t => new { t.DoctorUserId, t.TrialId }).HasPrincipalKey(u => new { u.DoctorUserId, u.TrialId });
+
+            //modelBuilder.Entity<TaskMedicalReviewRule>().HasMany(t => t.TaskMedicalReviewList).WithOne(t => t.TaskMedicalReviewRule).HasForeignKey(t => new { t.DoctorUserId, t.TrialId }).HasPrincipalKey(u => new { u.DoctorUserId, u.TrialId });
+
+            //会导致级联删除  
+            //modelBuilder.Entity<SubjectUser>().HasMany(t => t.SubjectArmVisitTaskList).WithOne(t => t.SujectArm).HasForeignKey(t => new { t.SubjectId, t.ArmEnum }).HasPrincipalKey(u => new { u.SubjectId, u.ArmEnum })
+            //    ./*IsRequired(false)*/OnDelete(DeleteBehavior.NoAction);
+
+            // builder.HasOne(t => t.SujectArm).WithMany(s => s.SubjectArmVisitTaskList).HasForeignKey(t => new { t.SubjectId, t.ArmEnum }).HasPrincipalKey(u => new { u.SubjectId, u.ArmEnum });
+
+
+        }
+    }
+
+    public class SubjectUserConfigration : IEntityTypeConfiguration<SubjectUser>
+    {
+        public void Configure(EntityTypeBuilder<SubjectUser> builder)
+        {
+            builder.HasMany(t => t.EarlierSubjectUserList).WithOne(t => t.OrignalSubjectUser);
+        }
+    }
+
+
+
+}