Browse Source

修改统计基准线比较

master
ma 4 years ago
parent
commit
959b5ac087
  1. 36
      src/main/java/com/ccsens/carbasics/service/DataStatisticsService.java

36
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) { if (areaResult.getValue().compareTo(advance.getDatumLine()) > -1) {
arrive++; arrive++;
} }
if (areaResult.getValue().compareTo(basics.getDatumLine()) < 1) { if (areaResult.getValue().compareTo(basics.getDatumLine()) < 0) {
unArrive++; unArrive++;
} }
} }
@ -220,23 +220,35 @@ public class DataStatisticsService implements IDataStatisticsService {
List<StatisticsVo.XgzlData> xgzlDataList = new ArrayList<>(); List<StatisticsVo.XgzlData> xgzlDataList = new ArrayList<>();
if (0 == param.getQueryType()) { if (0 == param.getQueryType()) {
xgzlDataList = dataStatisticsDao.xgzlDataForCity(param); 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()) { if (1 == param.getQueryType()) {
xgzlDataList = dataStatisticsDao.xgzlDataForHospital(param); xgzlDataList = dataStatisticsDao.xgzlDataForHospital(param);
} if (CollectionUtil.isNotEmpty(xgzlDataList)) {
if (CollectionUtil.isNotEmpty(xgzlDataList)) { for (StatisticsVo.XgzlData xgzlData : xgzlDataList) {
for (StatisticsVo.XgzlData xgzlData : xgzlDataList) { if (xgzlData.getZxgnzll().compareTo(advance.getDatumLine()) > -1) {
if (xgzlData.getZxgnzll().compareTo(advance.getDatumLine()) > -1) { arrive++;
arrive++; }
} if (xgzlData.getZxgnzll().compareTo(basics.getDatumLine()) < 0) {
if (xgzlData.getZxgnzll().compareTo(basics.getDatumLine()) < 1) { unArrive++;
unArrive++; }
xgzlSynopsis.setLess50(unArrive);
xgzlSynopsis.setThan90(arrive);
} }
xgzlSynopsis.setLess50(unArrive);
xgzlSynopsis.setThan90(arrive);
} }
} }
return xgzlSynopsis; return xgzlSynopsis;
} }

Loading…
Cancel
Save