refactor: 修改安全追溯中屏地图企业总览和人员总量的计算方式

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

@@ -924,7 +924,7 @@ public class AQZSDPStatisticsServiceImpl {
         BoolQueryBuilder personBoolMust = QueryBuilders.boolQuery();
         personBoolMust.must(QueryBuilders.prefixQuery("superviseOrgCode", orgCode));
         Long personCount = statisticalAnalysisService.getStatisticCount(personBoolMust, StatisticalAnalysisEnum.person.getKey());
-        result.put(DPMapStatisticsItemEnum.OPERATORS.getCode(), personCount);
+        result.put(DPMapStatisticsItemEnum.PERSON_TOTAL.getCode(), personCount);
     }
 
     private void staticsCenterMapCompanyCountToEs(Map<String, Object> result, String orgCode) {
@@ -1020,10 +1020,14 @@ public class AQZSDPStatisticsServiceImpl {
         stCommonService.staticsCenterMapCountDataForEquip(result, cylinderNum, orgCode,true,true, false);
         // 2. 压力管道长度统计
         stCommonService.staticsCenterMapCountDataForPipeline(result, orgCode,true, false);
-        // 3.单位数量统计
-        this.staticsCenterMapCountDataForCompany(result, orgCode, dpFilterParamDto.getCityCode());
-        // 4. 人员数量统计
-        this.staticsCenterMapCountDataForPerson(result, dpFilterParamDto, orgCode);
+        //3.单位数量统计
+        // 单位统计修改为查询es
+//        this.staticsCenterMapCountDataForCompany(result, orgCode, dpFilterParamDto.getCityCode());
+        this.staticsCenterMapCompanyCountToEs(result, orgCode);
+        //4.人员数量统计
+        // 人员统计改为查询es，修改之前查询的是作业人员的总数，修改为所有人员的总数
+//        this.staticsCenterMapCountDataForPerson(result, dpFilterParamDto, orgCode);
+        this.staticsCenterMapPersonCountToEs(result, orgCode);
         // 5.问题统计
         this.staticsCenterMapCountDataForIssue(result, orgCode);