|
@@ -582,7 +582,7 @@ namespace Hotline.Api.Controllers
|
|
|
var list = await _enforcementOrdersRepository.Queryable()
|
|
|
.LeftJoin<OrderVisit>((x, o) => x.Id == o.OrderId)
|
|
|
.LeftJoin<OrderVisitDetail>((x, o, p) => o.Id == p.VisitId)
|
|
|
- .Where((x, o, p) => o.VisitTime >= StartTime && o.VisitTime <= EndDate && p.VisitTarget == EVisitTarget.Org)
|
|
|
+ .Where((x, o, p) => o.VisitTime >= StartTime && o.VisitTime <= EndTime && p.VisitTarget == EVisitTarget.Org)
|
|
|
.Where((x, o, p) => o.VisitState == EVisitState.Visited && !string.IsNullOrEmpty(p.VisitOrgCode))
|
|
|
.WhereIF(!string.IsNullOrEmpty(OrgCode) && OrgCode == "001", (x, o, p) => p.VisitOrgCode == OrgCode)
|
|
|
.WhereIF(!string.IsNullOrEmpty(OrgCode) && OrgCode != "001", (x, o, p) => p.VisitOrgCode.StartsWith(OrgCode))
|