Commit 162495d7f8080be2d3786fe8301440eb7b3692a7
1 parent
e91156e513
Exists in
master
and in
6 other branches
导出excel
Showing 1 changed file with 9 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java
View file @
162495d
| ... | ... | @@ -393,11 +393,16 @@ |
| 393 | 393 | } catch (Exception e) { |
| 394 | 394 | index++; |
| 395 | 395 | } |
| 396 | - if (CollectionUtils.isEmpty(babyStatisticsManagerWeekAgeGroupQueryModelList) || babyStatisticsManagerWeekAgeGroupQueryModelList.size() < index || babyStatisticsManagerWeekAgeGroupQueryModelList.get(index) == null || !i.toString().equals(babyStatisticsManagerWeekAgeGroupQueryModelList.get(index).getWeekAge())) { | |
| 396 | + if (CollectionUtils.isEmpty(babyStatisticsManagerWeekAgeGroupQueryModelList) || babyStatisticsManagerWeekAgeGroupQueryModelList.size() < index) { | |
| 397 | 397 | BabyStatisticsManagerWeekAgeGroupQueryModel babyStatisticsManagerWeekAgeGroupQueryModel = new BabyStatisticsManagerWeekAgeGroupQueryModel(); |
| 398 | 398 | babyStatisticsManagerWeekAgeGroupQueryModel.setCount("0"); |
| 399 | 399 | babyStatisticsManagerWeekAgeGroupQueryModel.setWeekAge(i.toString()); |
| 400 | 400 | babyStatisticsManagerWeekAgeGroupQueryModelListResult.add(babyStatisticsManagerWeekAgeGroupQueryModel); |
| 401 | + } else if (babyStatisticsManagerWeekAgeGroupQueryModelList.size() > index && (babyStatisticsManagerWeekAgeGroupQueryModelList.get(index) == null || !i.toString().equals(babyStatisticsManagerWeekAgeGroupQueryModelList.get(index).getWeekAge()))) { | |
| 402 | + BabyStatisticsManagerWeekAgeGroupQueryModel babyStatisticsManagerWeekAgeGroupQueryModel = new BabyStatisticsManagerWeekAgeGroupQueryModel(); | |
| 403 | + babyStatisticsManagerWeekAgeGroupQueryModel.setCount("0"); | |
| 404 | + babyStatisticsManagerWeekAgeGroupQueryModel.setWeekAge(i.toString()); | |
| 405 | + babyStatisticsManagerWeekAgeGroupQueryModelListResult.add(babyStatisticsManagerWeekAgeGroupQueryModel); | |
| 401 | 406 | } else { |
| 402 | 407 | babyStatisticsManagerWeekAgeGroupQueryModelListResult.add(babyStatisticsManagerWeekAgeGroupQueryModelList.get(index)); |
| 403 | 408 | index++; |
| ... | ... | @@ -776,7 +781,9 @@ |
| 776 | 781 | } catch (Exception e) { |
| 777 | 782 | index++; |
| 778 | 783 | } |
| 779 | - if (CollectionUtils.isEmpty(list) || list.size() < index || list.get(index) == null || !i.toString().equals(list.get(index).get("EXAMINE_MONTH") == null ? "" : list.get(index).get("EXAMINE_MONTH").toString())) { | |
| 784 | + if (CollectionUtils.isEmpty(list) || list.size() < index) { | |
| 785 | + result.add(0); | |
| 786 | + } else if (list.size() < index && (list.get(index) == null || !i.toString().equals(list.get(index).get("EXAMINE_MONTH").toString()))) { | |
| 780 | 787 | result.add(0); |
| 781 | 788 | } else { |
| 782 | 789 | try { |