diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/OracleResultServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/OracleResultServiceImpl.java
index 5a5c428ee..26ec75b00 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/OracleResultServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/OracleResultServiceImpl.java
@@ -778,24 +778,24 @@ public class OracleResultServiceImpl implements OracleResultService {
                 break;
             case 56:
                 //三相总有功功率
-                harmonicHistoryData=HistoryDataMapper.getDataHarmpowerP_t(historyParam);
-                break;
-            case 57:
-                //三相总无功功率
                 if(type==0) {
-                harmonicHistoryData=HistoryDataMapper.getDataHarmpowerQ_t(historyParam);
+                    harmonicHistoryData=HistoryDataMapper.getDataHarmpowerP_t(historyParam);
                 }else{
                     harmonicHistoryData =ztHarmonicHistoryP(historyParam,3);
                 }
                 break;
-            case 58:
-                //三相总视在功率
+            case 57:
+                //三相总无功功率
                 if(type==0) {
-                    harmonicHistoryData=HistoryDataMapper.getDataHarmpowerS_t(historyParam);
+                    harmonicHistoryData=HistoryDataMapper.getDataHarmpowerQ_t(historyParam);
                 }else{
                     harmonicHistoryData =ztHarmonicHistoryP(historyParam,4);
                 }
                 break;
+            case 58:
+                //三相总视在功率
+                harmonicHistoryData=HistoryDataMapper.getDataHarmpowerS_t(historyParam);
+                break;
             case 59:
                 //视在功率因数
                 if(type==0) {