*）统计其他

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/ZLDPStatisticsServiceImpl.java

@@ -465,7 +465,7 @@ public class ZLDPStatisticsServiceImpl {
         String orgCode = getAndSetOrgCode(screenDto.getCityCode());
         searchSourceBuilder.query(QueryBuilders.boolQuery()
                 .must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*")));
-        searchSourceBuilder.aggregation(AggregationBuilders.terms("count_by_use_site_code").field("USE_SITE_CODE").size(20));
+        searchSourceBuilder.aggregation(AggregationBuilders.terms("count_by_use_site_code").field("USE_SITE_CODE").size(500));
         searchRequest.source(searchSourceBuilder);
         Map<String, Integer> dataMap = new HashMap<>();
         List<Map<String, Object>> returnList = new ArrayList<>();
@@ -486,11 +486,12 @@ public class ZLDPStatisticsServiceImpl {
                 Map<String, Object> map = new HashMap<>();
                 map.put("name", x.getName());
                 map.put("value", dataMap.getOrDefault(x.getCode(), 0));
+                dataMap.remove(x.getCode());
                 returnList.add(map);
             });
             Map<String, Object> otherMap = new HashMap<>();
             otherMap.put("name", "其他");
-            otherMap.put("value", dataMap.getOrDefault("其他", 0) + dataMap.getOrDefault("", 0));
+            otherMap.put("value", dataMap.values().stream().mapToLong(e -> e).sum());
             returnList.add(otherMap);
         } catch (IOException e) {
             e.printStackTrace();