From af4f000b1361efb6dff07aa285d56f49624d6615 Mon Sep 17 00:00:00 2001
From: caozehui <2427765068@qq.com>
Date: Thu, 30 Oct 2025 14:49:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PqMonitorServiceImpl.java    | 19 +++++++++++++++----
 .../service/impl/ResultServiceImpl.java       |  5 ++++-
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/detection/src/main/java/com/njcn/gather/monitor/service/impl/PqMonitorServiceImpl.java b/detection/src/main/java/com/njcn/gather/monitor/service/impl/PqMonitorServiceImpl.java
index d673e5a1..8acec3fc 100644
--- a/detection/src/main/java/com/njcn/gather/monitor/service/impl/PqMonitorServiceImpl.java
+++ b/detection/src/main/java/com/njcn/gather/monitor/service/impl/PqMonitorServiceImpl.java
@@ -197,7 +197,18 @@ public class PqMonitorServiceImpl extends ServiceImpl<PqMonitorMapper, PqMonitor
 
             if (CheckResultEnum.ACCORD.getValue().equals(oldMonitorResult)) {
                 if (CheckResultEnum.ACCORD.getValue().equals(newMonitorResult)) {
-                    qualifiedNum += 1;
+                    String oldNum = "";
+                    if (DataSourceEnum.REAL_DATA.getValue().equals(resultType)) {
+                        oldNum = monitor.getRealtimeNum();
+                    } else if (DataSourceEnum.WAVE_DATA.getValue().equals(resultType)) {
+                        oldNum = monitor.getRecordedNum();
+                    } else {
+                        oldNum = monitor.getStatisticsNum();
+                    }
+                    String[] split1 = oldNum.split(CnSocketUtil.SPLIT_TAG);
+                    if (!split1[0].equals(num.toString())) {
+                        qualifiedNum += 1;
+                    }
                     updateFlag = true;
                 }
             } else {
@@ -285,7 +296,7 @@ public class PqMonitorServiceImpl extends ServiceImpl<PqMonitorMapper, PqMonitor
                     if (monitor.getRealtimeResult() == 1) {
                         allResultFlags.add(1);
                     }
-                    if(monitor.getRealtimeResult() == 4){
+                    if (monitor.getRealtimeResult() == 4) {
                         allResultFlags.add(4);
                     }
                 } else if (DataSourceEnum.WAVE_DATA.getValue().equals(resultType)) {
@@ -296,7 +307,7 @@ public class PqMonitorServiceImpl extends ServiceImpl<PqMonitorMapper, PqMonitor
                     if (monitor.getRecordedResult() == 1) {
                         allResultFlags.add(1);
                     }
-                    if(monitor.getRecordedResult() == 4){
+                    if (monitor.getRecordedResult() == 4) {
                         allResultFlags.add(4);
                     }
                 } else {
@@ -307,7 +318,7 @@ public class PqMonitorServiceImpl extends ServiceImpl<PqMonitorMapper, PqMonitor
                     if (monitor.getStatisticsResult() == 1) {
                         allResultFlags.add(1);
                     }
-                    if(monitor.getStatisticsResult() == 4){
+                    if (monitor.getStatisticsResult() == 4) {
                         allResultFlags.add(4);
                     }
                 }
diff --git a/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java b/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java
index 5ecf0fe0..dd175992 100644
--- a/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java
+++ b/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java
@@ -1878,8 +1878,11 @@ public class ResultServiceImpl implements IResultService {
             monitor.setRecordedResult(null);
             monitor.setRecordedNum(null);
         }
+        boolean flag = pqMonitorService.updateById(monitor);
 
-        return pqMonitorService.updateById(monitor);
+        pqDevService.updateResult(split[0], null);
+
+        return flag;
     }
 
     @Override