diff --git a/analysis/stat/stat-api/src/main/java/com/njcn/stat/utils/BeanPConverter.java b/analysis/stat/stat-api/src/main/java/com/njcn/stat/utils/BeanPConverter.java
index 8cf47a4..53eadde 100644
--- a/analysis/stat/stat-api/src/main/java/com/njcn/stat/utils/BeanPConverter.java
+++ b/analysis/stat/stat-api/src/main/java/com/njcn/stat/utils/BeanPConverter.java
@@ -503,16 +503,16 @@ public class BeanPConverter {
         if(Objects.nonNull(messageDataPT)){
 
 
-            dataHarmpowerS.setS(messageDataPT.getP());
+            dataHarmpowerS.setS(messageDataPT.getS());
 
 
-            dataHarmpowerS.setSMax(messageDataPT.getMaxP());
+            dataHarmpowerS.setSMax(messageDataPT.getMaxS());
 
 
-            dataHarmpowerS.setSMin(messageDataPT.getMinP());
+            dataHarmpowerS.setSMin(messageDataPT.getMinS());
 
 
-            dataHarmpowerS.setSCp95(messageDataPT.getGp());
+            dataHarmpowerS.setSCp95(messageDataPT.getGs());
 
         }
 
@@ -746,16 +746,16 @@ public class BeanPConverter {
         if(Objects.nonNull(messageDataPT)){
 
 
-            dataHarmpowerQ.setQ(messageDataPT.getP());
+            dataHarmpowerQ.setQ(messageDataPT.getQ());
 
 
-            dataHarmpowerQ.setQMax(messageDataPT.getMaxP());
+            dataHarmpowerQ.setQMax(messageDataPT.getMaxQ());
 
 
-            dataHarmpowerQ.setQMin(messageDataPT.getMinP());
+            dataHarmpowerQ.setQMin(messageDataPT.getMinQ());
 
 
-            dataHarmpowerQ.setQCp95(messageDataPT.getGp());
+            dataHarmpowerQ.setQCp95(messageDataPT.getGq());
 
         }
 
diff --git a/analysis/stat/stat-api/src/main/java/com/njcn/stat/utils/BeanVConverter.java b/analysis/stat/stat-api/src/main/java/com/njcn/stat/utils/BeanVConverter.java
index 756d9ab..b93a1de 100644
--- a/analysis/stat/stat-api/src/main/java/com/njcn/stat/utils/BeanVConverter.java
+++ b/analysis/stat/stat-api/src/main/java/com/njcn/stat/utils/BeanVConverter.java
@@ -68,8 +68,11 @@ public class BeanVConverter {
             dataVRelation.setVuDevMin(messageDataV.getDeltaV());
 
 
-            //谐波电压幅值目前前置不上送，暂时注释掉
-//            dataVRelation.setV1(messageDataV.getV1());
+            //谐波电压幅值目前前置不上送，暂时注释掉.只入库V1
+            dataVRelation.setV1(messageDataV.getV1());
+            dataVRelation.setV1Max(messageDataV.getMaxV1());
+            dataVRelation.setV1Min( messageDataV.getMinV1());
+            dataVRelation.setV1Cp95(messageDataV.getGv1());
 //            dataVRelation.setV2(messageDataV.getV2());
 //            dataVRelation.setV3(messageDataV.getV3());
 //            dataVRelation.setV4(messageDataV.getV4());
@@ -121,7 +124,7 @@ public class BeanVConverter {
 //            dataVRelation.setV50(messageDataV.getV50());
 
 
-//            dataVRelation.setV1Max(messageDataV.getMaxV1());
+
 //            dataVRelation.setV2Max(messageDataV.getMaxV2());
 //            dataVRelation.setV3Max(messageDataV.getMaxV3());
 //            dataVRelation.setV4Max(messageDataV.getMaxV4());
@@ -173,7 +176,7 @@ public class BeanVConverter {
 //            dataVRelation.setV50Max(messageDataV.getMaxV50());
 
 
-//            dataVRelation.setV1Min( messageDataV.getMinV1());
+
 //            dataVRelation.setV2Min( messageDataV.getMinV2());
 //            dataVRelation.setV3Min( messageDataV.getMinV3());
 //            dataVRelation.setV4Min( messageDataV.getMinV4());
@@ -225,7 +228,7 @@ public class BeanVConverter {
 //            dataVRelation.setV50Min( messageDataV.getMinV50());
 
 
-//            dataVRelation.setV1Cp95(messageDataV.getGv1());
+
 //            dataVRelation.setV2Cp95(messageDataV.getGv2());
 //            dataVRelation.setV3Cp95(messageDataV.getGv3());
 //            dataVRelation.setV4Cp95(messageDataV.getGv4());
@@ -324,17 +327,17 @@ public class BeanVConverter {
             dataVRelation.setRmsabCp95(messageDataVa.getGVrmsLvr());
         }
         if(Objects.nonNull(messageDataVb)){
-            dataVRelation.setRmsab(messageDataVb.getVrmsLvr());
-            dataVRelation.setRmsabMax(messageDataVb.getMaxVrmsLvr());
-            dataVRelation.setRmsabMin(messageDataVb.getMinVrmsLvr());
-            dataVRelation.setRmsabCp95(messageDataVb.getGVrmsLvr());
+            dataVRelation.setRmsbc(messageDataVb.getVrmsLvr());
+            dataVRelation.setRmsbcMax(messageDataVb.getMaxVrmsLvr());
+            dataVRelation.setRmsbcMin(messageDataVb.getMinVrmsLvr());
+            dataVRelation.setRmsbcCp95(messageDataVb.getGVrmsLvr());
         }
 
         if(Objects.nonNull(messageDataVc)){
-            dataVRelation.setRmsbc(messageDataVc.getVrmsLvr());
-            dataVRelation.setRmsbcMax(messageDataVc.getMaxVrmsLvr());
-            dataVRelation.setRmsbcMin(messageDataVc.getMinVrmsLvr());
-            dataVRelation.setRmsbcCp95(messageDataVc.getGVrmsLvr());
+            dataVRelation.setRmsca(messageDataVc.getVrmsLvr());
+            dataVRelation.setRmscaMax(messageDataVc.getMaxVrmsLvr());
+            dataVRelation.setRmscaMin(messageDataVc.getMinVrmsLvr());
+            dataVRelation.setRmscaCp95(messageDataVc.getGVrmsLvr());
         }
 
 
@@ -558,7 +561,7 @@ public class BeanVConverter {
     public static DataHarmphasicVDTO messageDataVTODataHarmphasicV(MessageDataV messageDataV){
         DataHarmphasicVDTO dataHarmphasicV = new DataHarmphasicVDTO();
         if (Objects.nonNull(messageDataV)){
-            dataHarmphasicV.setV1(1.00);
+//            dataHarmphasicV.setV1(1.00);
             dataHarmphasicV.setV2(messageDataV.getVa2());
             dataHarmphasicV.setV3(messageDataV.getVa3());
             dataHarmphasicV.setV4(messageDataV.getVa4());
@@ -609,7 +612,7 @@ public class BeanVConverter {
             dataHarmphasicV.setV49(messageDataV.getVa49());
             dataHarmphasicV.setV50(messageDataV.getVa50());
 
-            dataHarmphasicV.setV1Max(1.00);
+//            dataHarmphasicV.setV1Max(1.00);
             dataHarmphasicV.setV2Max(messageDataV.getMaxVa2());
             dataHarmphasicV.setV3Max(messageDataV.getMaxVa3());
             dataHarmphasicV.setV4Max(messageDataV.getMaxVa4());
@@ -660,7 +663,7 @@ public class BeanVConverter {
             dataHarmphasicV.setV49Max(messageDataV.getMaxVa49());
             dataHarmphasicV.setV50Max(messageDataV.getMaxVa50());
 
-            dataHarmphasicV.setV1Min(1.00);
+//            dataHarmphasicV.setV1Min(1.00);
             dataHarmphasicV.setV2Min(messageDataV.getMinVa2());
             dataHarmphasicV.setV3Min(messageDataV.getMinVa3());
             dataHarmphasicV.setV4Min(messageDataV.getMinVa4());
@@ -711,7 +714,7 @@ public class BeanVConverter {
             dataHarmphasicV.setV49Min(messageDataV.getMinVa49());
             dataHarmphasicV.setV50Min(messageDataV.getMinVa50());
 
-            dataHarmphasicV.setV1Cp95(1.00);
+//            dataHarmphasicV.setV1Cp95(1.00);
             dataHarmphasicV.setV2Cp95(messageDataV.getGVa2());
             dataHarmphasicV.setV3Cp95(messageDataV.getGVa3());
             dataHarmphasicV.setV4Cp95(messageDataV.getGVa4());