From 33e5704b760d049670beeceaa931bda89f6c1031 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Tue, 7 Jun 2022 15:56:05 +0800
Subject: [PATCH] xx

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

diff --git a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
index be4be5bf5..5ec8f85db 100644
--- a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
@@ -6,6 +6,8 @@
 using System;
 using IRaCIS.Core.Domain.Share;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+
 namespace IRaCIS.Core.Application.ViewModel
 {
     /// <summary> VisitTaskView  列表视图模型 </summary>
@@ -25,7 +27,6 @@ namespace IRaCIS.Core.Application.ViewModel
         public DateTime? CheckPassedTime { get; set; }
         public DateTime? AllocateTime { get; set; }
         public Guid SubjectId { get; set; }
-        public int Code { get; set; }
 
         public string TaskCode { get; set; }
         public bool IsUrgent { get; set; }
@@ -49,6 +50,7 @@ namespace IRaCIS.Core.Application.ViewModel
 
     public class VisitTaskQuery : PageInput
     {
+        [NotDefault]
         public Guid TrialId { get; set; }
 
         public Guid? SiteId { get; set; }
diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
index 43adc75d7..54d523b82 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@@ -28,8 +28,7 @@ namespace IRaCIS.Core.Application.Service
         public async Task<PageOutput<VisitTaskView>> GetVisitTaskList(VisitTaskQuery queryVisitTask)
         {
 
-            var visitTaskQueryable = _visitTaskRepository
-                .WhereIf(queryVisitTask.TrialId != null, t => t.Subject.SiteId == queryVisitTask.TrialId)
+            var visitTaskQueryable = _visitTaskRepository.Where(t => t.TrialId == queryVisitTask.TrialId)
                 .WhereIf(queryVisitTask.SiteId != null, t => t.Subject.SiteId == queryVisitTask.SiteId)
                 .WhereIf(queryVisitTask.SubjectId != null, t => t.SubjectId == queryVisitTask.SubjectId)
                 .WhereIf(queryVisitTask.IsUrgent != null, t => t.IsUrgent == queryVisitTask.IsUrgent)