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 002e533..f553ddc 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
@@ -108,9 +108,10 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
                 EnergyTemplateVO vo = new EnergyTemplateVO();
                 BeanUtils.copyProperties(item,vo);
                 EleEpdPqd eleEpdPqd = epdFeignClient.selectById(item.getDataId()).getData();
-                vo.setClassId(eleEpdPqd.getClassId());
+                String tableName = dicDataFeignClient.getDicDataById(eleEpdPqd.getClassId()).getData().getCode();
+                vo.setClassId(tableName);
                 vo.setUnit(eleEpdPqd.getUnit());
-                StatisticalDataDTO statisticalDataDTO = commonService.getLineRtData(lineId,eleEpdPqd.getClassId(),item.getName(),item.getPhase(),item.getStatMethod(),clDid);
+                StatisticalDataDTO statisticalDataDTO = commonService.getLineRtData(lineId,tableName,item.getName(),item.getPhase(),item.getStatMethod(),clDid);
                 if (!Objects.isNull(statisticalDataDTO)){
                     vo.setTime(statisticalDataDTO.getTime());
                     vo.setDataValue(BigDecimal.valueOf(statisticalDataDTO.getValue()).setScale(4, RoundingMode.UP).doubleValue());
@@ -160,14 +161,14 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
             }
             //获取当前组的所有指标项
             List<EnergyTemplateVO> list = csDataArrayMapper.getArrayByGroup(group);
-
             for (EnergyTemplateVO item : list) {
                 EnergyTemplateVO vo = new EnergyTemplateVO();
                 BeanUtils.copyProperties(item,vo);
                 EleEpdPqd eleEpdPqd = epdFeignClient.selectById(item.getDataId()).getData();
-                vo.setClassId(eleEpdPqd.getClassId());
+                String tableName = dicDataFeignClient.getDicDataById(eleEpdPqd.getClassId()).getData().getCode();
+                vo.setClassId(tableName);
                 vo.setUnit(eleEpdPqd.getUnit());
-                StatisticalDataDTO statisticalDataDTO = commonService.getLineHistoryData(energyBaseParam.getLineId(),eleEpdPqd.getClassId(),item.getName(),energyBaseParam.getStartTime(),energyBaseParam.getEndTime(),clDid);
+                StatisticalDataDTO statisticalDataDTO = commonService.getLineHistoryData(energyBaseParam.getLineId(),tableName,item.getName(),energyBaseParam.getStartTime(),energyBaseParam.getEndTime(),clDid);
                 if (!Objects.isNull(statisticalDataDTO)){
                     vo.setMaxValue(BigDecimal.valueOf(statisticalDataDTO.getMaxValue()).setScale(4, RoundingMode.UP).doubleValue());
                     vo.setMinValue(BigDecimal.valueOf(statisticalDataDTO.getMinValue()).setScale(4, RoundingMode.UP).doubleValue());