日常管理-警情填报

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/ESAlertCalledService.java

@@ -172,7 +172,7 @@ public class ESAlertCalledService {
         currentTime = currentTime - 120*60*1000;
         BoolQueryBuilder qb1 = QueryBuilders.boolQuery()
         		.must(QueryBuilders.rangeQuery("callTimeLong").gte(currentTime));
-        boolMust.should(qb1);
+        boolMust.must(qb1);
         //报警电话一致
         if (!ValidationUtil.isEmpty(alertCalled.getEmergencyCall()) && !ValidationUtil.isEmpty(alertCalled.getContactPhone()))
 		{
@@ -191,13 +191,13 @@ public class ESAlertCalledService {
         //警情类型一致
         BoolQueryBuilder qb4 = QueryBuilders.boolQuery()
         		.must(QueryBuilders.termQuery("alarmTypeCode", alertCalled.getAlarmTypeCode()));
-        boolMust.should(qb4);
+        boolMust.must(qb4);
         //使用单位名称一致
         if (!ValidationUtil.isEmpty(alertCalled.getUseUnit()))
 		{
         	BoolQueryBuilder qb5 = QueryBuilders.boolQuery()
         			.must(QueryBuilders.termQuery("useUnit.keyword", alertCalled.getUseUnit()));
-        	boolMust.should(qb5);
+        	boolMust.must(qb5);
 		}
         //电梯识别码一致
         if(!ValidationUtil.isEmpty(alertCalled.getDeviceId())) {