diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/GwMonitorPushServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/GwMonitorPushServiceImpl.java
index 71a49b303..3ae8d66e7 100644
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/GwMonitorPushServiceImpl.java
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/GwMonitorPushServiceImpl.java
@@ -109,7 +109,7 @@ public class GwMonitorPushServiceImpl implements GwMonitorPushService {
 
         LambdaQueryWrapper<Monitor> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         if(CollUtil.isEmpty(ids)){
-            lambdaQueryWrapper.in(Monitor::getMonitorUploadStatus, Stream.of(0,3).collect(Collectors.toList())).eq(Monitor::getMonitorState,monitorStateDic.getId())
+            lambdaQueryWrapper.eq(Monitor::getMonitorState,monitorStateDic.getId())
                     .eq(Monitor::getStatus, DataStateEnum.ENABLE.getCode()).eq(Monitor::getIsUpToGrid,1);
         }else {
             lambdaQueryWrapper.in(Monitor::getId, ids).eq(Monitor::getStatus, DataStateEnum.ENABLE.getCode());
@@ -254,6 +254,9 @@ public class GwMonitorPushServiceImpl implements GwMonitorPushService {
 
 
 
+
+
+
         if(pushResult.size()>100){
             List<List<PushMonitorDTO>> pushMonitorDTOList = ListUtil.split(pushResult,100);
 
@@ -318,10 +321,10 @@ public class GwMonitorPushServiceImpl implements GwMonitorPushService {
 
         LambdaQueryWrapper<Monitor> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         if(CollUtil.isEmpty(ids)){
-            lambdaQueryWrapper.in(Monitor::getMonitorUploadStatus, Stream.of(0,3).collect(Collectors.toList())).eq(Monitor::getMonitorState,monitorStateDic.getId())
+            lambdaQueryWrapper.eq(Monitor::getMonitorState,monitorStateDic.getId())
                     .eq(Monitor::getStatus, DataStateEnum.ENABLE.getCode()).eq(Monitor::getIsUpToGrid,1);
         }else {
-            lambdaQueryWrapper.in(Monitor::getId, ids).eq(Monitor::getStatus, DataStateEnum.ENABLE.getCode());
+            lambdaQueryWrapper.in(Monitor::getId, ids).eq(Monitor::getMonitorState,monitorStateDic.getId()).eq(Monitor::getIsUpToGrid,1).eq(Monitor::getStatus, DataStateEnum.ENABLE.getCode());
         }
         List<Monitor> monitorList = monitorService.list(lambdaQueryWrapper);