From 3f12758d1bb6cc9f510b8f50a3f6ee97551244c3 Mon Sep 17 00:00:00 2001
From: caozehui <2427765068@qq.com>
Date: Fri, 12 Sep 2025 16:29:05 +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

---
 .../gather/result/pojo/vo/FormContentVO.java  |  5 -----
 .../service/impl/ResultServiceImpl.java       | 19 ++++---------------
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/detection/src/main/java/com/njcn/gather/result/pojo/vo/FormContentVO.java b/detection/src/main/java/com/njcn/gather/result/pojo/vo/FormContentVO.java
index c01081af..25c5f3f5 100644
--- a/detection/src/main/java/com/njcn/gather/result/pojo/vo/FormContentVO.java
+++ b/detection/src/main/java/com/njcn/gather/result/pojo/vo/FormContentVO.java
@@ -27,11 +27,6 @@ public class FormContentVO {
      */
     private Map<String, List<Integer>> chnMap;
 
-    /**
-     * 选中的第几次
-     */
-    private Integer checkNum;
-
     /**
      * 有多少次波形录制
      */
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 9c76bf75..958024e0 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
@@ -1569,8 +1569,10 @@ public class ResultServiceImpl implements IResultService {
         List<String> adTypeList = childDictTreeList.stream().map(DictTree::getId).collect(Collectors.toList());
         List<ContrastBaseResult> allResultList = new ArrayList<>();
 
-        List<ContrastNonHarmonicResult> contrastNonHarmonicResults = contrastNonHarmonicService.listAllResultData(String.valueOf(plan.getCode()), null, null, true, queryParam.getDeviceId(), adTypeList);
-        List<ContrastHarmonicResult> contrastHarmonicResults = contrastHarmonicService.listAllResultData(String.valueOf(plan.getCode()), null, null, true, queryParam.getDeviceId(), adTypeList);
+        List<ContrastNonHarmonicResult> contrastNonHarmonicResults = contrastNonHarmonicService.listAllResultData(String.valueOf(plan.getCode()), null, null, false, queryParam.getDeviceId(), adTypeList);
+        contrastNonHarmonicResults.addAll(contrastNonHarmonicService.listAllResultData(String.valueOf(plan.getCode()), null, null, true, queryParam.getDeviceId(), adTypeList));
+        List<ContrastHarmonicResult> contrastHarmonicResults = contrastHarmonicService.listAllResultData(String.valueOf(plan.getCode()), null, null, false, queryParam.getDeviceId(), adTypeList);
+        contrastHarmonicResults.addAll(contrastHarmonicService.listAllResultData(String.valueOf(plan.getCode()), null, null, true, queryParam.getDeviceId(), adTypeList));
         allResultList.addAll(contrastHarmonicResults);
         allResultList.addAll(contrastNonHarmonicResults);
 
@@ -1583,19 +1585,6 @@ public class ResultServiceImpl implements IResultService {
             chnMap.put(split[1], numList);
         });
 
-        if (ObjectUtil.isNull(queryParam.getNum())) {
-            if (StrUtil.isNotBlank(queryParam.getChnNum())) {
-                List<Integer> integers = chnMap.get(queryParam.getChnNum());
-                formContentVO.setCheckNum(integers.get(integers.size() - 1));
-            } else {
-                List<String> keyList = chnMap.keySet().stream().collect(Collectors.toList());
-                List<Integer> integers = chnMap.get(keyList.get(0));
-                formContentVO.setCheckNum(integers.get(integers.size() - 1));
-            }
-        } else {
-            formContentVO.setCheckNum(queryParam.getNum());
-        }
-
         AdPlanTestConfig adPlanTestConfig = adPlanTestConfigService.getByPlanId(queryParam.getPlanId());
         formContentVO.setWaveNumTotal(adPlanTestConfig.getWaveRecord());