From f592f2b5800b587fa311c9f1f4371996da90df7a Mon Sep 17 00:00:00 2001
From: chendaofei <857448963@qq.com>
Date: Mon, 5 Jan 2026 10:45:26 +0800
Subject: [PATCH] =?UTF-8?q?1.=E7=9B=91=E6=B5=8B=E7=82=B9=E7=A8=B3=E6=80=81?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8Acp95=E5=80=BC=E9=80=BB=E8=BE=91=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ExportModelController.java     |   7 +-
 .../harmonic/mapper/mapping/ReportMapper.xml  | 526 +-----------------
 2 files changed, 18 insertions(+), 515 deletions(-)

diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ExportModelController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ExportModelController.java
index 2d2152574..0be3f69c4 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ExportModelController.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ExportModelController.java
@@ -195,18 +195,15 @@ public class ExportModelController extends BaseController {
         param.setB(day == 0);
 
         //限值
-        OverLimitInfo overLimitData = reportService.getOverLimitData(param);
+        //OverLimitInfo overLimitData = reportService.getOverLimitData(param);
         Overlimit overLimit;
         if (type == 0) {
             overLimit = lineFeignClient.getOverLimitData(param.getLineId()).getData();
         } else {
             overLimit = monitorClient.getOverLimitData(param.getLineId()).getData();
         }
-        param.setCount(overLimitData.getCount());
-        overLimitData.setOverLimitRate(Arrays.asList(overLimit));
 
-
-        if (0 == overLimitData.getOverLimitRate().size()) {
+        if (Objects.isNull(overLimit)) {
             return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, "dataFail", methodDescribe);
         }
 
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/ReportMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/ReportMapper.xml
index 805a3ba5b..70e72264d 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/ReportMapper.xml
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/ReportMapper.xml
@@ -7,22 +7,7 @@
         AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue,
         MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue,
         MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue,
-        MAX( CASE WHEN rankSum = #{param.count} THEN rms END ) AS cp95Value
-        FROM
-        (
-        SELECT
-        phasic_type,
-        value_type,
-        rms,
-        rankSum
-        FROM
-        (
-        SELECT
-        phasic_type,
-        value_type,
-        rms,
-        @rankSum := IF( @CI := phasic_type, @rankSum + 1, 1 ) AS rankSum,
-        @CI := phasic_type
+        MAX( CASE WHEN value_type = 'CP95' THEN rms END ) AS cp95Value
         FROM
         r_stat_data_i_d
         <where>
@@ -38,20 +23,6 @@
                 and line_id = #{param.lineId}
             </if>
         </where>
-        ORDER BY
-        phasic_type,
-        (
-        CASE
-        WHEN value_type = 'CP95' THEN 1
-        WHEN value_type = 'MAX' THEN 2
-        WHEN value_type = 'MIN' THEN 3
-        WHEN value_type = 'AVG' THEN 4
-        ELSE 5
-        END
-        ),
-        rms DESC
-        ) AS t1
-        ) a
         GROUP BY
         phasic_type;
     </select>
@@ -61,22 +32,7 @@
         AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue,
         MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue,
         MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue,
-        MAX( CASE WHEN rankSum = #{param.count} THEN rms END ) AS cp95Value
-        FROM
-        (
-        SELECT
-        phasic_type,
-        value_type,
-        rms,
-        rankSum
-        FROM
-        (
-        SELECT
-        phasic_type,
-        value_type,
-        rms,
-        @rankSum := IF( @CI = phasic_type, @rankSum + 1, 1 ) AS rankSum,
-        @CI := phasic_type
+        MAX( CASE WHEN value_type = 'CP95' THEN rms END ) AS cp95Value
         FROM
         r_stat_data_v_d
         <where>
@@ -92,20 +48,6 @@
                 and line_id = #{param.lineId}
             </if>
         </where>
-        ORDER BY
-        phasic_type,
-        (
-        CASE
-        WHEN value_type = 'CP95' THEN 1
-        WHEN value_type = 'MAX' THEN 2
-        WHEN value_type = 'MIN' THEN 3
-        WHEN value_type = 'AVG' THEN 4
-        ELSE 5
-        END
-        ),
-        rms DESC
-        ) AS t1
-        ) a
         GROUP BY
         phasic_type
     </select>
@@ -175,22 +117,7 @@
         AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue,
         MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue,
         MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue,
-        MAX( CASE WHEN rankSum = #{param.count} THEN rms END ) AS cp95Value
-        FROM
-        (
-        SELECT
-        phasic_type,
-        value_type,
-        rms,
-        rankSum
-        FROM
-        (
-        SELECT
-        phasic_type,
-        value_type,
-        rms_lvr as rms,
-        @rankSum := IF( @CI = phasic_type, @rankSum + 1, 1 ) AS rankSum,
-        @CI := phasic_type
+        MAX( CASE WHEN value_type = 'CP95' THEN rms END ) AS cp95Value
         FROM
         r_stat_data_v_d
         <where>
@@ -206,20 +133,6 @@
                 and line_id = #{param.lineId}
             </if>
         </where>
-        ORDER BY
-        phasic_type,
-        (
-        CASE
-        WHEN value_type = 'CP95' THEN 1
-        WHEN value_type = 'MAX' THEN 2
-        WHEN value_type = 'MIN' THEN 3
-        WHEN value_type = 'AVG' THEN 4
-        ELSE 5
-        END
-        ),
-        rms_lvr DESC
-        ) AS t1
-        ) a
         GROUP BY
         phasic_type
     </select>
@@ -229,24 +142,7 @@
         AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue,
         MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue,
         MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue,
-        MAX( CASE WHEN rankSum = #{param.count} THEN rms END ) AS cp95Value
-        FROM
-        (
-        SELECT
-        phasic_type,
-        value_type,
-        rms,
-        rankSum
-        FROM
-        (
-        SELECT
-        phasic_type,
-        value_type,
-        p as rms,
-        @rankSum :=
-        IF
-        ( @CI = phasic_type, @rankSum + 1, 1 ) AS rankSum,
-        @CI := phasic_type
+        MAX( CASE WHEN value_type = 'CP95' THEN rms END ) AS cp95Value
         FROM
         r_stat_data_harmpower_p_d
         <where>
@@ -262,23 +158,6 @@
                 and line_id = #{param.lineId}
             </if>
         </where>
-        ORDER BY
-        phasic_type,
-        (
-        CASE
-        WHEN value_type = 'CP95' THEN
-        1
-        WHEN value_type = 'MAX' THEN
-        2
-        WHEN value_type = 'MIN' THEN
-        3
-        WHEN value_type = 'AVG' THEN
-        4 ELSE 5
-        END
-        ),
-        p DESC
-        ) AS t1
-        ) a
         GROUP BY
         phasic_type
     </select>
@@ -288,24 +167,7 @@
         AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue,
         MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue,
         MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue,
-        MAX( CASE WHEN rankSum = #{param.count} THEN rms END ) AS cp95Value
-        FROM
-        (
-        SELECT
-        phasic_type,
-        value_type,
-        rms,
-        rankSum
-        FROM
-        (
-        SELECT
-        phasic_type,
-        value_type,
-        pf as rms,
-        @rankSum :=
-        IF
-        ( @CI = phasic_type, @rankSum + 1, 1 ) AS rankSum,
-        @CI := phasic_type
+        MAX( CASE WHEN value_type = 'CP95' THEN rms END ) AS cp95Value
         FROM
         r_stat_data_harmpower_p_d
         <where>
@@ -321,23 +183,6 @@
                 and line_id = #{param.lineId}
             </if>
         </where>
-        ORDER BY
-        phasic_type,
-        (
-        CASE
-        WHEN value_type = 'CP95' THEN
-        1
-        WHEN value_type = 'MAX' THEN
-        2
-        WHEN value_type = 'MIN' THEN
-        3
-        WHEN value_type = 'AVG' THEN
-        4 ELSE 5
-        END
-        ),
-        pf DESC
-        ) AS t1
-        ) a
         GROUP BY
         phasic_type
     </select>
@@ -347,24 +192,7 @@
         AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue,
         MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue,
         MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue,
-        MAX( CASE WHEN rankSum = #{param.count} THEN rms END ) AS cp95Value
-        FROM
-        (
-        SELECT
-        phasic_type,
-        value_type,
-        rms,
-        rankSum
-        FROM
-        (
-        SELECT
-        phasic_type,
-        value_type,
-        q as rms,
-        @rankSum :=
-        IF
-        ( @CI = phasic_type, @rankSum + 1, 1 ) AS rankSum,
-        @CI := phasic_type
+        MAX( CASE WHEN value_type = 'CP95' THEN rms END ) AS cp95Value
         FROM
         r_stat_data_harmpower_q_d
         <where>
@@ -380,23 +208,6 @@
                 and line_id = #{param.lineId}
             </if>
         </where>
-        ORDER BY
-        phasic_type,
-        (
-        CASE
-        WHEN value_type = 'CP95' THEN
-        1
-        WHEN value_type = 'MAX' THEN
-        2
-        WHEN value_type = 'MIN' THEN
-        3
-        WHEN value_type = 'AVG' THEN
-        4 ELSE 5
-        END
-        ),
-        q DESC
-        ) AS t1
-        ) a
         GROUP BY
         phasic_type
     </select>
@@ -406,24 +217,7 @@
         AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue,
         MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue,
         MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue,
-        MAX( CASE WHEN rankSum = #{param.count} THEN rms END ) AS cp95Value
-        FROM
-        (
-        SELECT
-        phasic_type,
-        value_type,
-        rms,
-        rankSum
-        FROM
-        (
-        SELECT
-        phasic_type,
-        value_type,
-        s as rms,
-        @rankSum :=
-        IF
-        ( @CI = phasic_type, @rankSum + 1, 1 ) AS rankSum,
-        @CI := phasic_type
+        MAX( CASE WHEN value_type = 'CP95' THEN rms END ) AS cp95Value
         FROM
         r_stat_data_harmpower_s_d
         <where>
@@ -439,23 +233,6 @@
                 and line_id = #{param.lineId}
             </if>
         </where>
-        ORDER BY
-        phasic_type,
-        (
-        CASE
-        WHEN value_type = 'CP95' THEN
-        1
-        WHEN value_type = 'MAX' THEN
-        2
-        WHEN value_type = 'MIN' THEN
-        3
-        WHEN value_type = 'AVG' THEN
-        4 ELSE 5
-        END
-        ),
-        s DESC
-        ) AS t1
-        ) a
         GROUP BY
         phasic_type
     </select>
@@ -465,24 +242,7 @@
         AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue,
         MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue,
         MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue,
-        MAX( CASE WHEN rankSum = #{param.count} THEN rms END ) AS cp95Value
-        FROM
-        (
-        SELECT
-        phasic_type,
-        value_type,
-        rms,
-        rankSum
-        FROM
-        (
-        SELECT
-        phasic_type,
-        value_type,
-        plt as rms,
-        @rankSum :=
-        IF
-        ( @CI = phasic_type, @rankSum + 1, 1 ) AS rankSum,
-        @CI := phasic_type
+        MAX( CASE WHEN value_type = 'CP95' THEN rms END ) AS cp95Value
         FROM
         r_stat_data_flicker_d
         <where>
@@ -498,23 +258,6 @@
                 and line_id = #{param.lineId}
             </if>
         </where>
-        ORDER BY
-        phasic_type,
-        (
-        CASE
-        WHEN value_type = 'CP95' THEN
-        1
-        WHEN value_type = 'MAX' THEN
-        2
-        WHEN value_type = 'MIN' THEN
-        3
-        WHEN value_type = 'AVG' THEN
-        4 ELSE 5
-        END
-        ),
-        plt DESC
-        ) AS t1
-        ) a
         GROUP BY
         phasic_type
     </select>
@@ -524,24 +267,7 @@
         AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue,
         MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue,
         MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue,
-        MAX( CASE WHEN rankSum = #{param.count} THEN rms END ) AS cp95Value
-        FROM
-        (
-        SELECT
-        phasic_type,
-        value_type,
-        rms,
-        rankSum
-        FROM
-        (
-        SELECT
-        phasic_type,
-        value_type,
-        pst as rms,
-        @rankSum :=
-        IF
-        ( @CI = phasic_type, @rankSum + 1, 1 ) AS rankSum,
-        @CI := phasic_type
+        MAX( CASE WHEN value_type = 'CP95' THEN rms END ) AS cp95Value
         FROM
         r_stat_data_flicker_d
         <where>
@@ -557,23 +283,6 @@
                 and line_id = #{param.lineId}
             </if>
         </where>
-        ORDER BY
-        phasic_type,
-        (
-        CASE
-        WHEN value_type = 'CP95' THEN
-        1
-        WHEN value_type = 'MAX' THEN
-        2
-        WHEN value_type = 'MIN' THEN
-        3
-        WHEN value_type = 'AVG' THEN
-        4 ELSE 5
-        END
-        ),
-        pst DESC
-        ) AS t1
-        ) a
         GROUP BY
         phasic_type
     </select>
@@ -583,22 +292,7 @@
         AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue,
         MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue,
         MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue,
-        MAX( CASE WHEN rankSum = #{param.count} THEN rms END ) AS cp95Value
-        FROM
-        (
-        SELECT
-        phasic_type,
-        value_type,
-        rms,
-        rankSum
-        FROM
-        (
-        SELECT
-        phasic_type,
-        value_type,
-        vu_dev as rms,
-        @rankSum := IF( @CI := phasic_type, @rankSum + 1, 1 ) AS rankSum,
-        @CI := phasic_type
+        MAX( CASE WHEN value_type = 'CP95' THEN rms END ) AS cp95Value
         FROM
         r_stat_data_v_d
         <where>
@@ -614,20 +308,6 @@
                 and line_id = #{param.lineId}
             </if>
         </where>
-        ORDER BY
-        phasic_type,
-        (
-        CASE
-        WHEN value_type = 'CP95' THEN 1
-        WHEN value_type = 'MAX' THEN 2
-        WHEN value_type = 'MIN' THEN 3
-        WHEN value_type = 'AVG' THEN 4
-        ELSE 5
-        END
-        ),
-        vu_dev DESC
-        ) AS t1
-        ) a
         GROUP BY
         phasic_type;
     </select>
@@ -637,22 +317,7 @@
         AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue,
         MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue,
         MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue,
-        MAX( CASE WHEN rankSum = #{param.count} THEN rms END ) AS cp95Value
-        FROM
-        (
-        SELECT
-        phasic_type,
-        value_type,
-        rms,
-        rankSum
-        FROM
-        (
-        SELECT
-        phasic_type,
-        value_type,
-        vl_dev as rms,
-        @rankSum := IF( @CI := phasic_type, @rankSum + 1, 1 ) AS rankSum,
-        @CI := phasic_type
+        MAX( CASE WHEN value_type = 'CP95' THEN rms END ) AS cp95Value
         FROM
         r_stat_data_v_d
         <where>
@@ -668,20 +333,6 @@
                 and line_id = #{param.lineId}
             </if>
         </where>
-        ORDER BY
-        phasic_type,
-        (
-        CASE
-        WHEN value_type = 'CP95' THEN 1
-        WHEN value_type = 'MAX' THEN 2
-        WHEN value_type = 'MIN' THEN 3
-        WHEN value_type = 'AVG' THEN 4
-        ELSE 5
-        END
-        ),
-        vl_dev DESC
-        ) AS t1
-        ) a
         GROUP BY
         phasic_type;
     </select>
@@ -691,22 +342,7 @@
         AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue,
         MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue,
         MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue,
-        MAX( CASE WHEN rankSum = #{param.count} THEN rms END ) AS cp95Value
-        FROM
-        (
-        SELECT
-        phasic_type,
-        value_type,
-         rms,
-        rankSum
-        FROM
-        (
-        SELECT
-        phasic_type,
-        value_type,
-        v_thd as rms,
-        @rankSum := IF( @CI := phasic_type, @rankSum + 1, 1 ) AS rankSum,
-        @CI := phasic_type
+        MAX( CASE WHEN value_type = 'CP95' THEN rms END ) AS cp95Value
         FROM
         r_stat_data_v_d
         <where>
@@ -722,20 +358,6 @@
                 and line_id = #{param.lineId}
             </if>
         </where>
-        ORDER BY
-        phasic_type,
-        (
-        CASE
-        WHEN value_type = 'CP95' THEN 1
-        WHEN value_type = 'MAX' THEN 2
-        WHEN value_type = 'MIN' THEN 3
-        WHEN value_type = 'AVG' THEN 4
-        ELSE 5
-        END
-        ),
-        v_thd DESC
-        ) AS t1
-        ) a
         GROUP BY
         phasic_type;
     </select>
@@ -745,22 +367,7 @@
         AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue,
         MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue,
         MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue,
-        MAX( CASE WHEN rankSum = #{param.count} THEN rms END ) AS cp95Value
-        FROM
-        (
-        SELECT
-        phasic_type,
-        value_type,
-         rms,
-        rankSum
-        FROM
-        (
-        SELECT
-        phasic_type,
-        value_type,
-        i_thd as rms,
-        @rankSum := IF( @CI := phasic_type, @rankSum + 1, 1 ) AS rankSum,
-        @CI := phasic_type
+        MAX( CASE WHEN value_type = 'CP95' THEN rms END ) AS cp95Value
         FROM
         r_stat_data_i_d
         <where>
@@ -776,20 +383,6 @@
                 and line_id = #{param.lineId}
             </if>
         </where>
-        ORDER BY
-        phasic_type,
-        (
-        CASE
-        WHEN value_type = 'CP95' THEN 1
-        WHEN value_type = 'MAX' THEN 2
-        WHEN value_type = 'MIN' THEN 3
-        WHEN value_type = 'AVG' THEN 4
-        ELSE 5
-        END
-        ),
-        i_thd DESC
-        ) AS t1
-        ) a
         GROUP BY
         phasic_type;
     </select>
@@ -799,22 +392,7 @@
         AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue,
         MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue,
         MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue,
-        MAX( CASE WHEN rankSum = #{param.count} THEN rms END ) AS cp95Value
-        FROM
-        (
-        SELECT
-        phasic_type,
-        value_type,
-        rms,
-        rankSum
-        FROM
-        (
-        SELECT
-        phasic_type,
-        value_type,
-        freq as rms,
-        @rankSum := IF( @CI := phasic_type, @rankSum + 1, 1 ) AS rankSum,
-        @CI := phasic_type
+        MAX( CASE WHEN value_type = 'CP95' THEN rms END ) AS cp95Value
         FROM
         r_stat_data_v_d
         <where>
@@ -830,20 +408,6 @@
                 and line_id = #{param.lineId}
             </if>
         </where>
-        ORDER BY
-        phasic_type,
-        (
-        CASE
-        WHEN value_type = 'CP95' THEN 1
-        WHEN value_type = 'MAX' THEN 2
-        WHEN value_type = 'MIN' THEN 3
-        WHEN value_type = 'AVG' THEN 4
-        ELSE 5
-        END
-        ),
-        freq DESC
-        ) AS t1
-        ) a
         GROUP BY
         phasic_type;
     </select>
@@ -853,22 +417,7 @@
         AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue,
         MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue,
         MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue,
-        MAX( CASE WHEN rankSum = #{param.count} THEN rms END ) AS cp95Value
-        FROM
-        (
-        SELECT
-        phasic_type,
-        value_type,
-        rms,
-        rankSum
-        FROM
-        (
-        SELECT
-        phasic_type,
-        value_type,
-        freq_dev as rms,
-        @rankSum := IF( @CI := phasic_type, @rankSum + 1, 1 ) AS rankSum,
-        @CI := phasic_type
+        MAX( CASE WHEN value_type = 'CP95' THEN rms END ) AS cp95Value
         FROM
         r_stat_data_v_d
         <where>
@@ -884,20 +433,6 @@
                 and line_id = #{param.lineId}
             </if>
         </where>
-        ORDER BY
-        phasic_type,
-        (
-        CASE
-        WHEN value_type = 'CP95' THEN 1
-        WHEN value_type = 'MAX' THEN 2
-        WHEN value_type = 'MIN' THEN 3
-        WHEN value_type = 'AVG' THEN 4
-        ELSE 5
-        END
-        ),
-        freq_dev DESC
-        ) AS t1
-        ) a
         GROUP BY
         phasic_type;
     </select>
@@ -907,22 +442,7 @@
         AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue,
         MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue,
         MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue,
-        MAX( CASE WHEN rankSum = #{param.count} THEN rms END ) AS cp95Value
-        FROM
-        (
-        SELECT
-        phasic_type,
-        value_type,
-        rms,
-        rankSum
-        FROM
-        (
-        SELECT
-        phasic_type,
-        value_type,
-        i_neg as rms,
-        @rankSum := IF( @CI := phasic_type, @rankSum + 1, 1 ) AS rankSum,
-        @CI := phasic_type
+        MAX( CASE WHEN value_type = 'CP95' THEN rms END ) AS cp95Value
         FROM
         r_stat_data_i_d
         <where>
@@ -938,20 +458,6 @@
                 and line_id = #{param.lineId}
             </if>
         </where>
-        ORDER BY
-        phasic_type,
-        (
-        CASE
-        WHEN value_type = 'CP95' THEN 1
-        WHEN value_type = 'MAX' THEN 2
-        WHEN value_type = 'MIN' THEN 3
-        WHEN value_type = 'AVG' THEN 4
-        ELSE 5
-        END
-        ),
-        rms DESC
-        ) AS t1
-        ) a
         GROUP BY
         phasic_type;
     </select>