From e05403bfa735a0b1fb27c7dff462e14f2151baab Mon Sep 17 00:00:00 2001
From: hongawen <83944980@qq.com>
Date: Thu, 12 Jun 2025 15:47:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gather/report/service/impl/PqReportServiceImpl.java    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java b/detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java
index 9da87e0c..774cab9a 100644
--- a/detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java
+++ b/detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java
@@ -863,7 +863,12 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
                 prefixCode = scriptCode;
                 if (PowerConstant.TIME.contains(scriptCode)) {
                     // 谐波类，以scriptIndex区分
-                    Map<Integer, List<PqScriptDtlDataVO>> scriptIndexMap = dtlScriptItemList.stream().collect(Collectors.groupingBy(PqScriptDtlDataVO::getScriptIndex));
+                    Map<Integer, List<PqScriptDtlDataVO>> scriptIndexMap = dtlScriptItemList.stream()
+                            .collect(Collectors.groupingBy(
+                                    PqScriptDtlDataVO::getScriptIndex,
+                                    TreeMap::new,
+                                    Collectors.toList()
+                            ));
                     // 谐波类针对是否第一次还要额外做个处理，因为每个测点需要单独表示
                     for (List<PqScriptDtlDataVO> scriptDtlDataItem : scriptIndexMap.values()) {
                         singleTestResult = resultService.getFinalContent(scriptDtlDataItem, devReportParam.getPlanCode(), pqDevVO.getId(), lineNo, tableKeys);