diff --git a/src/main/java/com/sunyo/wlpt/message/bus/service/controller/es/ElasticSearchInfoController.java b/src/main/java/com/sunyo/wlpt/message/bus/service/controller/es/ElasticSearchInfoController.java
index 4131ee1..e2a4cee 100644
--- a/src/main/java/com/sunyo/wlpt/message/bus/service/controller/es/ElasticSearchInfoController.java
+++ b/src/main/java/com/sunyo/wlpt/message/bus/service/controller/es/ElasticSearchInfoController.java
@@ -173,19 +173,20 @@ public class ElasticSearchInfoController {
             queryBuilder =  queryBuilder.must(QueryBuilders.termQuery("ADMIN.RCVLOG.USER",messageBusMsg.getRcvlogUsername()));
         }
         if (messageBusMsg.getCreatimeSearch() !=null && !messageBusMsg.getCreatimeSearch().isEmpty()  && StringUtils.isNotBlank(messageBusMsg.getCreatimeSearch().get(0)) && StringUtils.isNotBlank(messageBusMsg.getCreatimeSearch().get(1))){
-//            queryBuilder =  queryBuilder.must(QueryBuilders.rangeQuery("MSG.HEADER.DDTM").from(messageBusMsg.getCreatimeSearch().get(0)).to(messageBusMsg.getCreatimeSearch().get(1)));
+            queryBuilder =  queryBuilder.must(QueryBuilders.rangeQuery("MSG.HEADER.DDTM").from(messageBusMsg.getCreatimeSearch().get(0)).to(messageBusMsg.getCreatimeSearch().get(1)));
             //or条件
-            queryBuilder =  queryBuilder.should(QueryBuilders.rangeQuery("ADMIN.CREATTIME").from(messageBusMsg.getCreatimeSearch().get(0)).to(messageBusMsg.getCreatimeSearch().get(1)));
+            //queryBuilder =  queryBuilder.should(QueryBuilders.rangeQuery("ADMIN.CREATTIME").from(messageBusMsg.getCreatimeSearch().get(0)).to(messageBusMsg.getCreatimeSearch().get(1)));
         }
 
         if (StringUtils.isNotBlank(messageBusMsg.getMsgid())){
-            queryBuilder =  queryBuilder.should(QueryBuilders.termQuery("_id",messageBusMsg.getMsgid()));
+            queryBuilder =  queryBuilder.must(QueryBuilders.termQuery("_id",messageBusMsg.getMsgid()));
         }
         //wild搜索大写搜不到小写也搜不到大写的包含，要转成小写
         if (StringUtils.isNotBlank(messageBusMsg.getAlias_sendContent())){
             queryBuilder =  queryBuilder.must(QueryBuilders.wildcardQuery("MSG.BODY", "*"+messageBusMsg.getAlias_sendContent().toLowerCase()+"*"));
         }
         log.info("bool查询语句为:{}",queryBuilder);
+        queryBuilder.minimumShouldMatch(1);
         return queryBuilder;
     }