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
{
/// VisitTaskView 列表视图模型
@@ -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> 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)