diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GridDiagramServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GridDiagramServiceImpl.java
index 2152416ce..a58abf93f 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GridDiagramServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GridDiagramServiceImpl.java
@@ -386,11 +386,14 @@ public class GridDiagramServiceImpl implements GridDiagramService {
                         .filter(x -> finalI == x.getRunFlag())
                         .map(Device::getId).distinct().collect(Collectors.toList());
                 list.add(String.valueOf(devices.size()));
+                //当终端信息是0标识需要进行在线率查询，并进行赋值
                 if (i == 0) {
-                    onlineRateParam.setIds(devices);
-                    list.add(String.valueOf(onLineRateDMapper.getTotalOnlineRates(onlineRateParam)));
-                } else {
-                    list.add(String.valueOf(3.14159));
+                    if(CollUtil.isNotEmpty(devices)) {
+                        onlineRateParam.setIds(devices);
+                        list.add(String.valueOf(onLineRateDMapper.getTotalOnlineRates(onlineRateParam)));
+                    }else {
+                        list.add("0");
+                    }
                 }
             }
             data = new GridDiagramVO.DevData();
@@ -398,7 +401,7 @@ public class GridDiagramServiceImpl implements GridDiagramService {
             data.setOrgName(dto.getName());
             data.setRunNum(Long.valueOf(list.get(0)));
             data.setOverhaulNum(Long.valueOf(list.get(2)));
-            data.setRefundNum(Long.valueOf(list.get(4)));
+            data.setRefundNum(Long.valueOf(list.get(3)));
             data.setOnLineRate(Float.valueOf(list.get(1)));
             info.add(data);
         }
@@ -456,7 +459,11 @@ public class GridDiagramServiceImpl implements GridDiagramService {
         details.setOnLineNum(onIds.size());
         details.setOnLineNumList(onIds);
         baseQueryParam.setLineIds(ids);
-        details.setIntegrityRate(integrityDMapper.selectTotalIntegrityByLineIds(baseQueryParam));
+        if(CollUtil.isNotEmpty(ids)){
+            details.setIntegrityRate(integrityDMapper.selectTotalIntegrityByLineIds(baseQueryParam));
+        }else{
+            details.setIntegrityRate(0.0f);
+        }
         return details;
     }
 
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/gridDiagram/impl/GridDiagramServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/gridDiagram/impl/GridDiagramServiceImpl.java
index 044e23487..e6e039b7b 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/gridDiagram/impl/GridDiagramServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/gridDiagram/impl/GridDiagramServiceImpl.java
@@ -89,6 +89,7 @@ public class GridDiagramServiceImpl implements GridDiagramService {
         //在线监测问题
         List<LineWarning> lineWarningList = lineWarningService.list(new LambdaQueryWrapper<LineWarning>()
                 .in(LineWarning::getDeptId, deptIds)
+                .isNotNull(LineWarning::getStep)
                 .ge(StrUtil.isNotBlank(param.getStartTime()), LineWarning::getCreateTime, DateUtil.beginOfDay(DateUtil.parse(param.getStartTime())))
                 .le(StrUtil.isNotBlank(param.getEndTime()), LineWarning::getCreateTime, DateUtil.endOfDay(DateUtil.parse(param.getEndTime())))
         );
@@ -174,6 +175,7 @@ public class GridDiagramServiceImpl implements GridDiagramService {
         //在线监测问题
         List<LineWarning> lineWarningList = lineWarningService.list(new LambdaQueryWrapper<LineWarning>()
                 .in(LineWarning::getDeptId, ids)
+                .isNotNull(LineWarning::getStep)
                 .ge(StrUtil.isNotBlank(baseParam.getStartTime()), LineWarning::getCreateTime, DateUtil.beginOfDay(DateUtil.parse(baseParam.getStartTime())))
                 .le(StrUtil.isNotBlank(baseParam.getEndTime()), LineWarning::getCreateTime, DateUtil.endOfDay(DateUtil.parse(baseParam.getEndTime())))
         );