diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadPointStatisticalDataDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadPointStatisticalDataDServiceImpl.java
index 41c3dc4aa..63a7275db 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadPointStatisticalDataDServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadPointStatisticalDataDServiceImpl.java
@@ -120,10 +120,15 @@ public class RUploadPointStatisticalDataDServiceImpl extends MppServiceImpl<RUpl
 
             List<LineDevGetDTO> otherMonitor = item.getLineBaseList().stream().filter(me->!otherIds.contains(me.getObjType())).collect(Collectors.toList());
 
+            List<LineDevGetDTO> temBaseList = item.getLineBaseList();
+            long monitorCount = temBaseList.stream().map(LineDevGetDTO::getPointId).distinct().count();
+            long devCount = temBaseList.stream().map(LineDevGetDTO::getDevId).distinct().count();
+
 
             mapKey.forEach((key, val) -> {
 
-                List<LineDevGetDTO> keyItem = item.getLineBaseList().stream().filter(o -> val.contains(o.getObjType())).collect(Collectors.toList());
+
+                List<LineDevGetDTO> keyItem = temBaseList.stream().filter(o -> val.contains(o.getObjType())).collect(Collectors.toList());
                 RUploadPointStatisticalDataD rUploadPointStatisticalDataD = new RUploadPointStatisticalDataD();
                 switch (key){
                     case "2100":
@@ -163,14 +168,14 @@ public class RUploadPointStatisticalDataDServiceImpl extends MppServiceImpl<RUpl
 
 
                 long pointCount = keyItem.stream().map(LineDevGetDTO::getPointId).distinct().count();
-                long devCount = keyItem.stream().map(LineDevGetDTO::getDevId).distinct().count();
+                //long devCount = keyItem.stream().map(LineDevGetDTO::getDevId).distinct().count();
                 rUploadPointStatisticalDataD.setRunTerminalNum((int) devCount);
-                rUploadPointStatisticalDataD.setOnlineMonitorNum((int) pointCount);
-                rUploadPointStatisticalDataD.setRunMonitorNum((int) pointCount);
-                rUploadPointStatisticalDataD.setOnlineMonitorRate(pointCount == 0 ? 0d : BigDecimal.valueOf(rUploadPointStatisticalDataD.getOnlineMonitorNum() * 100.0 / rUploadPointStatisticalDataD.getRunMonitorNum()).setScale(4, RoundingMode.HALF_UP).doubleValue());
+                rUploadPointStatisticalDataD.setOnlineMonitorNum((int) monitorCount);
+                rUploadPointStatisticalDataD.setRunMonitorNum((int) monitorCount);
+                rUploadPointStatisticalDataD.setOnlineMonitorRate(monitorCount == 0 ? 0d : BigDecimal.valueOf(rUploadPointStatisticalDataD.getOnlineMonitorNum() * 100.0 / rUploadPointStatisticalDataD.getRunMonitorNum()).setScale(4, RoundingMode.HALF_UP).doubleValue());
 
 
-                    List<RStatIntegrityD> l3 = dataList.stream().filter(it -> keyItem.stream().map(LineDevGetDTO::getPointId).collect(Collectors.toList()).contains(it.getLineIndex())).collect(Collectors.toList());
+                    List<RStatIntegrityD> l3 = dataList.stream().filter(it -> temBaseList.stream().map(LineDevGetDTO::getPointId).collect(Collectors.toList()).contains(it.getLineIndex())).collect(Collectors.toList());
                     int due = l3.stream().mapToInt(RStatIntegrityD::getDueTime).sum();
                     int real = l3.stream().mapToInt(RStatIntegrityD::getRealTime).sum();
                     rUploadPointStatisticalDataD.setExpectCollectNum(due);
@@ -181,7 +186,7 @@ public class RUploadPointStatisticalDataDServiceImpl extends MppServiceImpl<RUpl
                     } else {
                         rUploadPointStatisticalDataD.setDataFullRate(BigDecimal.valueOf(real * 100.0 / due).setScale(4, RoundingMode.HALF_UP).doubleValue());
                     }
-                    rUploadPointStatisticalDataD.setStationMonitorNum(l3.size());
+                    rUploadPointStatisticalDataD.setStationMonitorNum((int)pointCount);
 
 
 
@@ -208,14 +213,14 @@ public class RUploadPointStatisticalDataDServiceImpl extends MppServiceImpl<RUpl
 
 
             long pointCount = otherMonitor.stream().map(LineDevGetDTO::getPointId).distinct().count();
-            long devCount = otherMonitor.stream().map(LineDevGetDTO::getDevId).distinct().count();
+            //long devCount = otherMonitor.stream().map(LineDevGetDTO::getDevId).distinct().count();
             rUploadPointStatisticalDataD.setRunTerminalNum((int) devCount);
-            rUploadPointStatisticalDataD.setOnlineMonitorNum((int) pointCount);
-            rUploadPointStatisticalDataD.setRunMonitorNum((int) pointCount);
-            rUploadPointStatisticalDataD.setOnlineMonitorRate(pointCount == 0 ? 0d : BigDecimal.valueOf(rUploadPointStatisticalDataD.getOnlineMonitorNum() * 100.0 / rUploadPointStatisticalDataD.getRunMonitorNum()).setScale(4, RoundingMode.HALF_UP).doubleValue());
+            rUploadPointStatisticalDataD.setOnlineMonitorNum((int) monitorCount);
+            rUploadPointStatisticalDataD.setRunMonitorNum((int) monitorCount);
+            rUploadPointStatisticalDataD.setOnlineMonitorRate(monitorCount == 0 ? 0d : BigDecimal.valueOf(rUploadPointStatisticalDataD.getOnlineMonitorNum() * 100.0 / rUploadPointStatisticalDataD.getRunMonitorNum()).setScale(4, RoundingMode.HALF_UP).doubleValue());
 
 
-                List<RStatIntegrityD> l3 = dataList.stream().filter(it -> otherMonitor.stream().map(LineDevGetDTO::getPointId).collect(Collectors.toList()).contains(it.getLineIndex())).collect(Collectors.toList());
+                List<RStatIntegrityD> l3 = dataList.stream().filter(it -> temBaseList.stream().map(LineDevGetDTO::getPointId).collect(Collectors.toList()).contains(it.getLineIndex())).collect(Collectors.toList());
                 int due = l3.stream().mapToInt(RStatIntegrityD::getDueTime).sum();
                 int real = l3.stream().mapToInt(RStatIntegrityD::getRealTime).sum();
                 rUploadPointStatisticalDataD.setExpectCollectNum(due);
@@ -226,7 +231,7 @@ public class RUploadPointStatisticalDataDServiceImpl extends MppServiceImpl<RUpl
                 } else {
                     rUploadPointStatisticalDataD.setDataFullRate(BigDecimal.valueOf(real * 100.0 / due).setScale(4, RoundingMode.HALF_UP).doubleValue());
                 }
-                rUploadPointStatisticalDataD.setStationMonitorNum(l3.size());
+                rUploadPointStatisticalDataD.setStationMonitorNum((int)pointCount);
 
             result.add(rUploadPointStatisticalDataD);