diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java
index efaa216..ef634cc 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java
@@ -121,7 +121,7 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
             "负载无功功率", "负载视在功率", "有功功率", "无功功率",
             "视在功率", "基波有功功率", "基波无功功率",
             "基波视在功率", "三相总有功功率", "三相总无功功率",
-            "三相总视在功率"
+            "三相总视在功率","相电压总有效值","线电压总有效值","相电压基波有效值","线电压基波有效值","电压正序分量"
     ));
 
 
@@ -179,13 +179,13 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
                         }else {
                             re = DataChangeUtil.secondaryToPrimary(eleEpdPqd.getPrimaryFormula(), statisticalDataDTO.getValue(), csLinePO.getPtRatio(), csLinePO.getCtRatio());
                         }
-                        if (changePower(vo.getAnotherName())) {
+                        if (changePower(vo.getAnotherName()) && Objects.equals(dataLevel,"Primary")) {
                             vo.setDataValue(Double.valueOf(df.format(BigDecimal.valueOf(re / 1000).setScale(2, RoundingMode.HALF_UP).doubleValue())));
                         } else {
                             vo.setDataValue(Double.valueOf(df.format(BigDecimal.valueOf(re).setScale(2, RoundingMode.HALF_UP).doubleValue())));
                         }
                     } else {
-                        if (changePower(vo.getAnotherName())) {
+                        if (changePower(vo.getAnotherName()) && Objects.equals(dataLevel,"Primary")) {
                             vo.setDataValue(Double.valueOf(df.format(BigDecimal.valueOf(statisticalDataDTO.getValue()/1000).setScale(2, RoundingMode.HALF_UP).doubleValue())));
                         } else {
                             vo.setDataValue(Double.valueOf(df.format(BigDecimal.valueOf(statisticalDataDTO.getValue()).setScale(2, RoundingMode.HALF_UP).doubleValue())));
@@ -770,8 +770,6 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
 
     //单位处理
     public void getUnit(List<EnergyTemplateVO> energyTemplates, List<EleEpdPqd> eleEpdPqds, List<DataGroupTemplateVO> dataGroupTemplates, String type) {
-        List<String> pList =  Arrays.asList("电网有功功率", "电网无功功率", "电网视在功率","负载有功功率","负载无功功率","负载视在功率"
-                ,"有功功率","无功功率","视在功率","基波有功功率","基波无功功率","基波视在功率","三相总有功功率","三相总无功功率","三相总视在功率");
         // 使用Map来存储EleEpdPqd的ID和Unit，以便快速查找
         Map<String, String> unitMap = new HashMap<>();
         for (EleEpdPqd item : eleEpdPqds) {
@@ -796,7 +794,7 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
         for (DataGroupTemplateVO dataGroupTemplate : dataGroupTemplates) {
             EnergyTemplateVO energyTemplate = energyTemplateMap.get(dataGroupTemplate.getId());
             if (energyTemplate != null && energyTemplate.getUnit() != null) {
-                if (changePower(dataGroupTemplate.getName())) {
+                if (changePower(dataGroupTemplate.getName()) && Objects.equals("Primary",type)) {
                     dataGroupTemplate.setName(dataGroupTemplate.getName() + "(k" + energyTemplate.getUnit() + ")");
                 } else {
                     dataGroupTemplate.setName(dataGroupTemplate.getName() + "(" + energyTemplate.getUnit() + ")");