From aa9c8c6294b70d39f56fc11b8c51578189e26c10 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 6 Jul 2022 17:55:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E5=8E=BB=E6=8E=89=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

---
 .../Service/Allocation/DTO/TaskConsistentRuleViewModel.cs       | 2 +-
 .../Service/Allocation/TaskConsistentRuleService.cs             | 2 +-
 IRaCIS.Core.Domain/Allocation/VisitTask.cs                      | 2 +-
 IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs             | 1 -
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Allocation/DTO/TaskConsistentRuleViewModel.cs b/IRaCIS.Core.Application/Service/Allocation/DTO/TaskConsistentRuleViewModel.cs
index 5ad7fd71..9f171a53 100644
--- a/IRaCIS.Core.Application/Service/Allocation/DTO/TaskConsistentRuleViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/DTO/TaskConsistentRuleViewModel.cs
@@ -100,7 +100,7 @@ namespace IRaCIS.Core.Application.ViewModel
         public string SubjectCode { get; set; } = String.Empty;
 
         [JsonIgnore]
-        public List<UserSimpleInfo> RelationDoctorUserList { get; set; }
+        public List<UserSimpleInfo> RelationDoctorUserList { get; set; } = new List<UserSimpleInfo>();
 
         [JsonIgnore]
         public Guid? DoctorUserId { get; set; }
diff --git a/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs b/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs
index ba8caef8..6dc87fb8 100644
--- a/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs
@@ -164,7 +164,7 @@ namespace IRaCIS.Core.Application.Service
                                         // 组内一致性分析
                                         .WhereIf(isSelfAnalysis == false && subjectfilter != null, t => t.DoctorUserId == filterObj.AnalysisDoctorUserId && subjectfilter.Contains(t.SubjectId))
                                         .Where(t => t.ReadingTaskState == ReadingTaskState.HaveSigned && t.TaskState == TaskState.Effect)
-                                        .Where(t => t.SignTime!.Value.AddDays(filterObj.IntervalWeeks * 7 + 1) > DateTime.Now)
+                                        .Where(t => t.SignTime!.Value.AddDays(filterObj.IntervalWeeks * 7 + 1) < DateTime.Now)
                                           //重阅产生的访视任务  要把之前的访视任务去除
                                         .Where(t => t.ReReadingApplyState == ReReadingApplyState.Default || t.ReReadingApplyState == ReReadingApplyState.Reject)
 
diff --git a/IRaCIS.Core.Domain/Allocation/VisitTask.cs b/IRaCIS.Core.Domain/Allocation/VisitTask.cs
index b5df1903..58c558b4 100644
--- a/IRaCIS.Core.Domain/Allocation/VisitTask.cs
+++ b/IRaCIS.Core.Domain/Allocation/VisitTask.cs
@@ -82,7 +82,7 @@ namespace IRaCIS.Core.Domain.Models
 
 
         //排除一致性分析  因为souceVisitId 没值
-        public List<VisitTask> SameVisitTaskList { get; set; }
+        //public List<VisitTask> SameVisitTaskList { get; set; }
 
       
 
diff --git a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs
index 06b8786d..726f641c 100644
--- a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs
+++ b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs
@@ -97,7 +97,6 @@ namespace IRaCIS.Core.Infra.EFCore
             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 });
             modelBuilder.Entity<VisitTask>().HasMany(t => t.JudgeVisitList).WithOne(t=>t.JudgeVisitTask);
 
-            modelBuilder.Entity<VisitTask>().HasMany(t => t.SameVisitTaskList).WithOne().HasForeignKey(t => t.SourceSubjectVisitId);
 
             //modelBuilder.Entity<VisitTask>().HasMany(t => t.AnalysisVisitTaskList).WithOne().HasForeignKey(t => t.TaskConsistentRuleId).HasPrincipalKey(u => u.SourceSubjectVisitId);