diff --git a/src/main/java/com/syjiaer/clinic/server/service/statistics/StatisticsService.java b/src/main/java/com/syjiaer/clinic/server/service/statistics/StatisticsService.java index 1dc6500..d135de6 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/statistics/StatisticsService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/statistics/StatisticsService.java @@ -113,7 +113,7 @@ public class StatisticsService extends BaseService { // vipQuery.isNotNull("vip_id"); // List> vipMaps = chargeOrderMapper.selectMaps(vipQuery); QueryWrapper commonQuery = new QueryWrapper<>(); - commonQuery.select("create_date,sum(total_price)"); + commonQuery.select("create_date,sum(total_price) as sum"); commonQuery.ge("pay_time", beginTime); commonQuery.le("pay_time", endTime); @@ -151,6 +151,10 @@ public class StatisticsService extends BaseService { OrganizationMember organizationMember = organizationMemberMapper.selectById(salePersonId); vo.setSalePersonName(organizationMember.getName()); } + + if (map.get("sum") == null){ + continue; + } vo.setTotalIncome(vo.getTotalIncome().add((BigDecimal) map.get("sum"))); vo.setCount(vo.getCount()+(Long) map.get("count")); RetailOrderPayTypeEnum payType = RetailOrderPayTypeEnum.getByCode((Integer) map.get("pay_type"));