修改大屏综合统计-人员总量第二层分组总数无数据

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/ComprehensiveStatisticalAnalysisServiceImpl.java

@@ -3273,8 +3273,16 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
         } else if (!is3LeveFlag) {
             if (unitCategory.equals(UnitCategoryEnum.use.getCode())) {
                 companyBoolMust(boolMust, UnitCategoryEnum.use.getCode());
+                long total = this.queryDpStatisticsTotalByIndex(boolMust, StatisticalAnalysisEnum.person.getKey());
+                result.put("tabTotalMap", new JSONObject().fluentPut("personTypeTotal", total));
+                Map<String, Object> totalAggMapsByUnitType = getTotalAggMapsByUnitType(request, builder, boolMust, tabTotalMap, StatisticalAnalysisEnum.person);
+                result.put("datas",totalAggMapsByUnitType);
             } else if (unitCategory.equals(UnitCategoryEnum.produce.getCode())) {
                 companyBoolMust(boolMust, UnitCategoryEnum.produce.getCode());
+                long total = this.queryDpStatisticsTotalByIndex(boolMust, StatisticalAnalysisEnum.person.getKey());
+                result.put("tabTotalMap", new JSONObject().fluentPut("personTypeTotal", total));
+                Map<String, Object> totalAggMapsByUnitType = getTotalAggMapsByUnitType(request, builder, boolMust, tabTotalMap, StatisticalAnalysisEnum.person);
+                result.put("datas",totalAggMapsByUnitType);
             } else {
                 companyBoolMust(boolMust, UnitCategoryEnum.filling.getCode());
                 JSONObject expiryDateStatus = this.getExpiryDateStatusGroupStatistics(boolMust);
@@ -3286,7 +3294,6 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
                         .fluentPut("expiryDateStatus", expiryDateStatus)
                         .fluentPut("personType", personType));
             }
-            result = getTotalAggMapsByUnitType(request, builder, boolMust, tabTotalMap, StatisticalAnalysisEnum.person);
         } else {
             JSONArray threeLevel = filterParams.getJSONArray("threeLevel");
             String filterCode = threeLevel.getString(0);