diff --git a/src/main/java/com/ccsens/carbasics/service/DataStatisticsService.java b/src/main/java/com/ccsens/carbasics/service/DataStatisticsService.java index cdf3f9b..86c6d57 100644 --- a/src/main/java/com/ccsens/carbasics/service/DataStatisticsService.java +++ b/src/main/java/com/ccsens/carbasics/service/DataStatisticsService.java @@ -68,7 +68,7 @@ public class DataStatisticsService implements IDataStatisticsService { if (areaResult.getValue().compareTo(advance.getDatumLine()) > -1) { arrive++; } - if (areaResult.getValue().compareTo(basics.getDatumLine()) < 1) { + if (areaResult.getValue().compareTo(basics.getDatumLine()) < 0) { unArrive++; } } @@ -220,23 +220,35 @@ public class DataStatisticsService implements IDataStatisticsService { List xgzlDataList = new ArrayList<>(); if (0 == param.getQueryType()) { xgzlDataList = dataStatisticsDao.xgzlDataForCity(param); - + if (CollectionUtil.isNotEmpty(xgzlDataList)) { + for (StatisticsVo.XgzlData xgzlData : xgzlDataList) { + if (xgzlData.getZxgnzllCity().compareTo(advance.getDatumLine()) > -1) { + arrive++; + } + if (xgzlData.getZxgnzllCity().compareTo(basics.getDatumLine()) < 0) { + unArrive++; + } + xgzlSynopsis.setLess50(unArrive); + xgzlSynopsis.setThan90(arrive); + } + } } if (1 == param.getQueryType()) { xgzlDataList = dataStatisticsDao.xgzlDataForHospital(param); - } - if (CollectionUtil.isNotEmpty(xgzlDataList)) { - for (StatisticsVo.XgzlData xgzlData : xgzlDataList) { - if (xgzlData.getZxgnzll().compareTo(advance.getDatumLine()) > -1) { - arrive++; - } - if (xgzlData.getZxgnzll().compareTo(basics.getDatumLine()) < 1) { - unArrive++; + if (CollectionUtil.isNotEmpty(xgzlDataList)) { + for (StatisticsVo.XgzlData xgzlData : xgzlDataList) { + if (xgzlData.getZxgnzll().compareTo(advance.getDatumLine()) > -1) { + arrive++; + } + if (xgzlData.getZxgnzll().compareTo(basics.getDatumLine()) < 0) { + unArrive++; + } + xgzlSynopsis.setLess50(unArrive); + xgzlSynopsis.setThan90(arrive); } - xgzlSynopsis.setLess50(unArrive); - xgzlSynopsis.setThan90(arrive); } } + return xgzlSynopsis; }