修改一版
parent
240a77f65d
commit
6a81ffc513
|
@ -185,9 +185,9 @@ namespace IRaCIS.Application.Services
|
||||||
{
|
{
|
||||||
var visitquery = _subjectVisitRepository.Where(x => x.SubjectId == dto.SubjectId && x.InPlan);
|
var visitquery = _subjectVisitRepository.Where(x => x.SubjectId == dto.SubjectId && x.InPlan);
|
||||||
|
|
||||||
visitquery = visitquery.WhereIf(dto.ExpirationDate != null,x => x.LatestScanDate <= dto.ExpirationDate.Value);
|
visitquery = visitquery.WhereIf(dto.ExpirationDate != null, x => x.LatestScanDate <= dto.ExpirationDate.Value)
|
||||||
|
.WhereIf(dto.ExpirationVisitNum != null, x => x.VisitNum <= dto.ExpirationVisitNum.Value);
|
||||||
|
|
||||||
visitquery = visitquery.WhereIf(dto.ExpirationVisitNum != null, x => x.VisitNum <= dto.ExpirationVisitNum.Value);
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -89,8 +89,8 @@ namespace IRaCIS.Application.Services
|
||||||
visitquery = visitquery.Where(x => siteids.Contains(x.SiteId));
|
visitquery = visitquery.Where(x => siteids.Contains(x.SiteId));
|
||||||
}
|
}
|
||||||
|
|
||||||
visitquery = visitquery.WhereIf(readset.ExpirationDate != null, x => x.LatestScanDate <= readset.ExpirationDate.Value);
|
visitquery = visitquery.WhereIf(readset.ExpirationDate != null, x => x.LatestScanDate <= readset.ExpirationDate.Value)
|
||||||
visitquery = visitquery.WhereIf(readset.ExpirationVisitNum != null, x => x.VisitNum <= readset.ExpirationVisitNum);
|
.WhereIf(readset.ExpirationVisitNum != null, x => x.VisitNum <= readset.ExpirationVisitNum);
|
||||||
var visits = (await visitquery.Include(x=>x.Subject).Include(x=>x.TrialSite).GroupBy(x => x.SubjectId).Select(x => new
|
var visits = (await visitquery.Include(x=>x.Subject).Include(x=>x.TrialSite).GroupBy(x => x.SubjectId).Select(x => new
|
||||||
{
|
{
|
||||||
SubjectId = x.Key,
|
SubjectId = x.Key,
|
||||||
|
|
Loading…
Reference in New Issue