From 92d12735060476a25b0926de191bf5aee6ad3908 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Thu, 21 Jul 2022 15:44:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=8D=E9=98=85=E8=BF=BD?=
 =?UTF-8?q?=E8=B8=AA=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Allocation/DTO/VisitTaskViewModel.cs            | 6 ++++--
 .../Service/Allocation/VisitTaskService.cs                  | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
index b2873e0a5..e8562c12a 100644
--- a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
@@ -48,6 +48,8 @@ namespace IRaCIS.Core.Application.ViewModel
         public Guid SiteId { get; set; }
         public String TrialSiteCode { get; set; } = String.Empty;
         public string SubjectCode { get; set; } = String.Empty;
+
+        public bool 
     }
 
 
@@ -94,7 +96,7 @@ namespace IRaCIS.Core.Application.ViewModel
 
     public class AnalysisTaskView: ReadingTaskView
     {
-        public bool IsSelfAnalysis { get; set; }
+        public bool? IsSelfAnalysis { get; set; }
     }
 
     //public class IRReReadingTaskView: ReReadingTaskView
@@ -112,7 +114,7 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public Guid Id { get; set; }
 
-        public VisitTaskView OriginalReReadingTask { get; set; }
+        public AnalysisTaskView OriginalReReadingTask { get; set; }
 
         public string? ReReadingNewTaskCode { get; set; }
 
diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
index 94b66bb04..f1704831e 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@@ -757,7 +757,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
 
 
             var visitTaskQueryable = _visitTaskReReadingRepository
-                .Where(t => t.OriginalReReadingTask.TrialId == queryVisitTask.TrialId && t.OriginalReReadingTask.IsAnalysisCreate == false)
+                .Where(t => t.OriginalReReadingTask.TrialId == queryVisitTask.TrialId /*&& t.OriginalReReadingTask.IsAnalysisCreate == false*/)
                 .WhereIf(queryVisitTask.RootReReadingTaskId != null, t => t.RootReReadingTaskId == queryVisitTask.RootReReadingTaskId || t.OriginalReReadingTaskId == queryVisitTask.RootReReadingTaskId)
                 .WhereIf(!string.IsNullOrEmpty(queryVisitTask.TaskCode), t => t.OriginalReReadingTask.TaskCode.Contains(queryVisitTask.TaskCode) || t.RootReReadingTask.TaskCode.Contains(queryVisitTask.TaskCode))
                 .WhereIf(queryVisitTask.SiteId != null, t => t.OriginalReReadingTask.Subject.SiteId == queryVisitTask.SiteId)