fix(Statistics): 统计分析人员统计增加officeRegion查询

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

@@ -3192,7 +3192,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
         companyBoolMust.must(companyUnitTypeBoolMust);
 
         BoolQueryBuilder personBoolMust = QueryBuilders.boolQuery();
-        personBoolMust.must(QueryBuilders.prefixQuery("superviseOrgCode", orgCode));
+        personOrgCodeBoolMust(orgCode, personBoolMust);
         personBoolMust.must(companyUnitTypeBoolMust);
 
         BoolQueryBuilder inspectionCompanyBoolMust = QueryBuilders.boolQuery();
@@ -3202,7 +3202,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
 
 
         BoolQueryBuilder inspectionPersonBoolMust = QueryBuilders.boolQuery();
-        inspectionPersonBoolMust.must(QueryBuilders.prefixQuery("superviseOrgCode", orgCode));
+        personOrgCodeBoolMust(orgCode, inspectionPersonBoolMust);
         inspectionPersonBoolMust.must(inspectionUnitTypeBoolMust);
         inspectionPersonBoolMust.mustNot(QueryBuilders.wildcardQuery("unitType.keyword", "*检验检测机构*"));