XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xx

Uat_Study
hang 2022-06-07 15:56:05 +08:00
parent d238e6676f
commit 33e5704b76
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
View File

@ -6,6 +6,8 @@
using System; using System;
using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Domain.Share;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace IRaCIS.Core.Application.ViewModel namespace IRaCIS.Core.Application.ViewModel
{ {
/// <summary> VisitTaskView 列表视图模型 </summary> /// <summary> VisitTaskView 列表视图模型 </summary>
@ -25,7 +27,6 @@ namespace IRaCIS.Core.Application.ViewModel
public DateTime? CheckPassedTime { get; set; } public DateTime? CheckPassedTime { get; set; }
public DateTime? AllocateTime { get; set; } public DateTime? AllocateTime { get; set; }
public Guid SubjectId { get; set; } public Guid SubjectId { get; set; }
public int Code { get; set; }
public string TaskCode { get; set; } public string TaskCode { get; set; }
public bool IsUrgent { get; set; } public bool IsUrgent { get; set; }
@ -49,6 +50,7 @@ namespace IRaCIS.Core.Application.ViewModel
public class VisitTaskQuery : PageInput public class VisitTaskQuery : PageInput
{ {
[NotDefault]
public Guid TrialId { get; set; } public Guid TrialId { get; set; }
public Guid? SiteId { get; set; } public Guid? SiteId { get; set; }

3
IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
View File

@ -28,8 +28,7 @@ namespace IRaCIS.Core.Application.Service
public async Task<PageOutput<VisitTaskView>> GetVisitTaskList(VisitTaskQuery queryVisitTask) public async Task<PageOutput<VisitTaskView>> GetVisitTaskList(VisitTaskQuery queryVisitTask)
{ {
var visitTaskQueryable = _visitTaskRepository var visitTaskQueryable = _visitTaskRepository.Where(t => t.TrialId == queryVisitTask.TrialId)
.WhereIf(queryVisitTask.TrialId != null, t => t.Subject.SiteId == queryVisitTask.TrialId)
.WhereIf(queryVisitTask.SiteId != null, t => t.Subject.SiteId == queryVisitTask.SiteId) .WhereIf(queryVisitTask.SiteId != null, t => t.Subject.SiteId == queryVisitTask.SiteId)
.WhereIf(queryVisitTask.SubjectId != null, t => t.SubjectId == queryVisitTask.SubjectId) .WhereIf(queryVisitTask.SubjectId != null, t => t.SubjectId == queryVisitTask.SubjectId)
.WhereIf(queryVisitTask.IsUrgent != null, t => t.IsUrgent == queryVisitTask.IsUrgent) .WhereIf(queryVisitTask.IsUrgent != null, t => t.IsUrgent == queryVisitTask.IsUrgent)