|
@@ -1103,7 +1103,7 @@ namespace Hotline.Api.Controllers.Bi
|
|
|
{
|
|
|
var query = _orderVisitRepository.Queryable()
|
|
|
.Includes(x => x.Employee)
|
|
|
- .Where(x => x.VisitTime >= dto.StartTime && x.VisitTime <= dto.EndTime && x.VisitState == EVisitState.Visited)
|
|
|
+ .Where(x => x.VisitTime >= dto.StartTime && x.VisitTime <= dto.EndTime && x.VisitState == EVisitState.Visited && x.EmployeeId != "" && x.EmployeeId != null)
|
|
|
.WhereIF(!string.IsNullOrEmpty(dto.VisitName), x => x.Employee.Name.Contains(dto.VisitName))
|
|
|
.GroupBy(x => new { x.EmployeeId, x.Employee.Name })
|
|
|
.Select(x => new VisitMeasureStatisticsModelDto()
|