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

@@ -1080,9 +1080,12 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
                                                 .must(existsQuery("USE_ORG_CODE"))
                                                 .mustNot(QueryBuilders.termQuery("USE_ORG_CODE",""));
                                     } else {
-                                        queryBuilder.should(QueryBuilders.boolQuery().mustNot(existsQuery("IS_INTO_MANAGEMENT")))
-                                                .should(QueryBuilders.matchQuery("IS_INTO_MANAGEMENT", Boolean.FALSE))
+                                        queryBuilder
+                                                .should(QueryBuilders.boolQuery().mustNot(existsQuery("IS_INTO_MANAGEMENT")))
+                                                .should(QueryBuilders.boolQuery().mustNot(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", "")))
+                                                .should(QueryBuilders.termsQuery("IS_INTO_MANAGEMENT", Boolean.FALSE))
                                                 .should(QueryBuilders.boolQuery().mustNot(existsQuery("USE_ORG_CODE")))
+                                                .should(QueryBuilders.termQuery("USE_ORG_CODE", ""))
                                                 .minimumShouldMatch(1);
                                     }
                                     enhancedDynamicQueryBuilder.add(queryBuilder, or);