diff --git a/detection/src/main/java/com/njcn/gather/detection/handler/SocketFreqConverterService.java b/detection/src/main/java/com/njcn/gather/detection/handler/SocketFreqConverterService.java
index af5e57ac..d35d1467 100644
--- a/detection/src/main/java/com/njcn/gather/detection/handler/SocketFreqConverterService.java
+++ b/detection/src/main/java/com/njcn/gather/detection/handler/SocketFreqConverterService.java
@@ -327,28 +327,33 @@ public class SocketFreqConverterService {
                 socketDataMsg.setData(JSON.toJSONString(newTolerantPointVO));
                 WebServiceManager.sendMsg(this.userId, JSON.toJSONString(socketDataMsg));
 
-                if (ObjectUtil.isNotNull(this.lastTolerancePoint)) {
-//                    boolean isNewGroup = this.isNewGroup(this.lastTolerancePoint, newTolerantPointVO);
-//                    if (isNewGroup) {
-//                        // 纵向分组
-//                        if (freqConverterConfig.getDirection() == 1) {
-//                            if (this.lastTolerancePoint.getTolerant() == 1 && testRes.getTolerant() == 1) {
-//                                TolerantPointVO featurePointVO = new TolerantPointVO();
-//                                featurePointVO.setResidualVoltage(this.lastTolerancePoint.getResidualVoltage());
-//                                featurePointVO.setDurationMs(this.lastTolerancePoint.getDurationMs());
-//                                featurePointVO.setTolerant(2);
-//                                socketDataMsg.setData(JSON.toJSONString(featurePointVO));
-//                                WebServiceManager.sendMsg(this.userId, JSON.toJSONString(socketDataMsg));
-//                                testRes.setTolerant(2);
-//                            }
-//                        }
-//                    } else {
-                    if (testRes.getTolerant() == 0) {
-                        if (this.lastTolerancePoint.getTolerant() == 1) {
+                if (testRes.getTolerant() == 0) {
+                    if (ObjectUtil.isNotNull(this.lastTolerancePoint) && this.lastTolerancePoint.getTolerant() == 1) {
+                        TolerantPointVO featurePointVO = new TolerantPointVO();
+
+                        featurePointVO.setResidualVoltage(Math.round((task.getPqDipData().getResidualVoltage() + this.lastTolerancePoint.getResidualVoltage()) / 2D * 100) / 100D);
+                        featurePointVO.setDurationMs(Integer.valueOf((task.getPqDipData().getDurationMs().intValue() + this.lastTolerancePoint.getDurationMs().intValue()) / 2));
+                        featurePointVO.setTolerant(2);
+                        socketDataMsg.setData(JSON.toJSONString(featurePointVO));
+                        WebServiceManager.sendMsg(this.userId, JSON.toJSONString(socketDataMsg));
+
+                        PqFreqConverterTestRes featureTestRes = new PqFreqConverterTestRes();
+                        featureTestRes.setId(IdUtil.fastSimpleUUID());
+                        featureTestRes.setDurationMs(featurePointVO.getDurationMs());
+                        featureTestRes.setResidualVoltage(featurePointVO.getResidualVoltage());
+                        featureTestRes.setTolerant(2);
+                        featureTestRes.setTime(LocalDateTime.now());
+                        saveTestResList.add(featureTestRes);
+                    }
+
+                    // 从数据库按照列查询距离该暂降点最近的一个暂降点
+                    if (freqConverterConfig.getDirection() == 0) {
+                        PqFreqConverterTestRes lastByDuration = pqFreqConverterTestResService.getLastByDuration(suffix, key, task.getPqDipData().getDurationMs());
+                        if (ObjectUtil.isNotNull(lastByDuration) && lastByDuration.getTolerant() == 1) {
                             TolerantPointVO featurePointVO = new TolerantPointVO();
 
-                            featurePointVO.setResidualVoltage(Math.round((task.getPqDipData().getResidualVoltage() + this.lastTolerancePoint.getResidualVoltage()) / 2D * 100) / 100D);
-                            featurePointVO.setDurationMs(Integer.valueOf((task.getPqDipData().getDurationMs().intValue() + this.lastTolerancePoint.getDurationMs().intValue()) / 2));
+                            featurePointVO.setResidualVoltage(Math.round((task.getPqDipData().getResidualVoltage() + lastByDuration.getResidualVoltage()) / 2D * 100) / 100D);
+                            featurePointVO.setDurationMs(Integer.valueOf((task.getPqDipData().getDurationMs().intValue() + lastByDuration.getDurationMs().intValue()) / 2));
                             featurePointVO.setTolerant(2);
                             socketDataMsg.setData(JSON.toJSONString(featurePointVO));
                             WebServiceManager.sendMsg(this.userId, JSON.toJSONString(socketDataMsg));
@@ -361,56 +366,32 @@ public class SocketFreqConverterService {
                             featureTestRes.setTime(LocalDateTime.now());
                             saveTestResList.add(featureTestRes);
                         }
+                    }
+                    // 从数据库按照行查询距离该暂降点最近的一个暂降点
+                    if (freqConverterConfig.getDirection() == 1) {
+                        PqFreqConverterTestRes lastByResidualVoltage = pqFreqConverterTestResService.getLastByResidualVoltage(suffix, key, task.getPqDipData().getResidualVoltage());
+                        if (ObjectUtil.isNotNull(lastByResidualVoltage) && lastByResidualVoltage.getTolerant() == 1) {
+                            TolerantPointVO featurePointVO = new TolerantPointVO();
 
-                        // 从数据库按照列查询距离该暂降点最近的一个暂降点
-                        if (freqConverterConfig.getDirection() == 0) {
-                            PqFreqConverterTestRes lastByDuration = pqFreqConverterTestResService.getLastByDuration(suffix, key, task.getPqDipData().getDurationMs());
-                            if (ObjectUtil.isNotNull(lastByDuration) && lastByDuration.getTolerant() == 1) {
-                                TolerantPointVO featurePointVO = new TolerantPointVO();
+                            featurePointVO.setResidualVoltage(Math.round((task.getPqDipData().getResidualVoltage() + lastByResidualVoltage.getResidualVoltage()) / 2D * 100) / 100D);
+                            featurePointVO.setDurationMs(Integer.valueOf((task.getPqDipData().getDurationMs().intValue() + lastByResidualVoltage.getDurationMs().intValue()) / 2));
+                            featurePointVO.setTolerant(2);
+                            socketDataMsg.setData(JSON.toJSONString(featurePointVO));
+                            WebServiceManager.sendMsg(this.userId, JSON.toJSONString(socketDataMsg));
 
-                                featurePointVO.setResidualVoltage(Math.round((task.getPqDipData().getResidualVoltage() + lastByDuration.getResidualVoltage()) / 2D * 100) / 100D);
-                                featurePointVO.setDurationMs(Integer.valueOf((task.getPqDipData().getDurationMs().intValue() + lastByDuration.getDurationMs().intValue()) / 2));
-                                featurePointVO.setTolerant(2);
-                                socketDataMsg.setData(JSON.toJSONString(featurePointVO));
-                                WebServiceManager.sendMsg(this.userId, JSON.toJSONString(socketDataMsg));
-
-                                PqFreqConverterTestRes featureTestRes = new PqFreqConverterTestRes();
-                                featureTestRes.setId(IdUtil.fastSimpleUUID());
-                                featureTestRes.setDurationMs(featurePointVO.getDurationMs());
-                                featureTestRes.setResidualVoltage(featurePointVO.getResidualVoltage());
-                                featureTestRes.setTolerant(2);
-                                featureTestRes.setTime(LocalDateTime.now());
-                                saveTestResList.add(featureTestRes);
-                            }
-                        }
-                        // 从数据库按照行查询距离该暂降点最近的一个暂降点
-                        if (freqConverterConfig.getDirection() == 1) {
-                            PqFreqConverterTestRes lastByResidualVoltage = pqFreqConverterTestResService.getLastByResidualVoltage(suffix, key, task.getPqDipData().getResidualVoltage());
-                            if (ObjectUtil.isNotNull(lastByResidualVoltage) && lastByResidualVoltage.getTolerant() == 1) {
-                                TolerantPointVO featurePointVO = new TolerantPointVO();
-
-                                featurePointVO.setResidualVoltage(Math.round((task.getPqDipData().getResidualVoltage() + lastByResidualVoltage.getResidualVoltage()) / 2D * 100) / 100D);
-                                featurePointVO.setDurationMs(Integer.valueOf((task.getPqDipData().getDurationMs().intValue() + lastByResidualVoltage.getDurationMs().intValue()) / 2));
-                                featurePointVO.setTolerant(2);
-                                socketDataMsg.setData(JSON.toJSONString(featurePointVO));
-                                WebServiceManager.sendMsg(this.userId, JSON.toJSONString(socketDataMsg));
-
-                                PqFreqConverterTestRes featureTestRes = new PqFreqConverterTestRes();
-                                featureTestRes.setId(IdUtil.fastSimpleUUID());
-                                featureTestRes.setDurationMs(featurePointVO.getDurationMs());
-                                featureTestRes.setResidualVoltage(featurePointVO.getResidualVoltage());
-                                featureTestRes.setTolerant(2);
-                                featureTestRes.setTime(LocalDateTime.now());
-                                saveTestResList.add(featureTestRes);
-                            }
+                            PqFreqConverterTestRes featureTestRes = new PqFreqConverterTestRes();
+                            featureTestRes.setId(IdUtil.fastSimpleUUID());
+                            featureTestRes.setDurationMs(featurePointVO.getDurationMs());
+                            featureTestRes.setResidualVoltage(featurePointVO.getResidualVoltage());
+                            featureTestRes.setTolerant(2);
+                            featureTestRes.setTime(LocalDateTime.now());
+                            saveTestResList.add(featureTestRes);
                         }
                     }
                 }
-//                }
                 this.lastTolerancePoint = newTolerantPointVO;
                 updateTestResList.add(testRes);
             }
-
         });
 
         if (!saveTestResList.isEmpty()) {