diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/EachModuleVO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/EachModuleVO.java
index 9d55a67..2f5ea22 100644
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/EachModuleVO.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/EachModuleVO.java
@@ -21,16 +21,16 @@ public class EachModuleVO implements Serializable {
     private String moduleState;
 
     @ApiModelProperty("模块运行状态数据")
-    List<harmonicVo> dataList;
+    List<HarmonicVo> dataList;
 
-    @ApiModelProperty("电压数据")
-    List<dataVo> vList;
+    @ApiModelProperty("负载电流数据")
+    List<DataVo> loadList;
 
-    @ApiModelProperty("电流数据")
-    List<dataVo> iList;
+    @ApiModelProperty("模块输出电流")
+    List<DataVo> modOutList;
 
     @Data
-    public static class harmonicVo implements Serializable {
+    public static class HarmonicVo implements Serializable {
 
         @ApiModelProperty("稳态数据时间")
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -50,12 +50,15 @@ public class EachModuleVO implements Serializable {
     }
 
     @Data
-    public static class dataVo implements Serializable {
+    public static class DataVo implements Serializable {
 
         @ApiModelProperty("稳态数据时间")
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private LocalDateTime time;
 
+        @ApiModelProperty("相别")
+        private String phasicType;
+
         @ApiModelProperty("数据")
         private Double data;
     }
diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DataServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DataServiceImpl.java
index e24f381..a127a80 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DataServiceImpl.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DataServiceImpl.java
@@ -243,14 +243,17 @@ public class DataServiceImpl implements IDataService {
                 EachModuleVO moduleVO = new EachModuleVO();
                 moduleVO.setModuleName("模块"+i);
 
-                List<EachModuleVO.harmonicVo> list1 = new ArrayList<>();
+                List<EachModuleVO.HarmonicVo> list1 = new ArrayList<>();
                 commonQueryParam.setClDid(Integer.toString(i));
 
-                //获取模块数据
+                List<EachModuleVO.DataVo> list2 = new ArrayList<>();
+                List<EachModuleVO.DataVo> list3 = new ArrayList<>();
+
+                //获取模块状态数据
                 List<StatisticalDataDTO> dto = commonService.getEachModule(commonQueryParam);
                 if (CollectionUtil.isNotEmpty(dto)) {
                     dto.forEach(item->{
-                        EachModuleVO.harmonicVo vo = new EachModuleVO.harmonicVo();
+                        EachModuleVO.HarmonicVo vo = new EachModuleVO.HarmonicVo();
                         vo.setTime(LocalDateTime.ofInstant(item.getTime().minus(8, ChronoUnit.HOURS), ZoneId.systemDefault()));
                         vo.setStateDesc(channelState(item.getValue()));
                         vo.setDataType(0);
@@ -260,6 +263,26 @@ public class DataServiceImpl implements IDataService {
                     moduleVO.setModuleState("离线");
                 }
 
+                //获取模块电流数据
+                List<StatisticalDataDTO> dto2 = commonService.getModuleData(commonQueryParam);
+                if (CollectionUtil.isNotEmpty(dto2)) {
+                    dto2.forEach(item->{
+
+                        EachModuleVO.DataVo vo1 = new EachModuleVO.DataVo();
+                        vo1.setTime(LocalDateTime.ofInstant(item.getTime().minus(8, ChronoUnit.HOURS), ZoneId.systemDefault()));
+                        vo1.setPhasicType(item.getPhaseType());
+                        vo1.setData(item.getValue());
+
+                        EachModuleVO.DataVo vo2 = new EachModuleVO.DataVo();
+                        vo2.setTime(LocalDateTime.ofInstant(item.getTime().minus(8, ChronoUnit.HOURS), ZoneId.systemDefault()));
+                        vo2.setPhasicType(item.getPhaseType());
+                        vo2.setData(item.getAvgValue());
+
+                        list2.add(vo1);
+                        list3.add(vo2);
+                    });
+                }
+
                 //获取模块事件
                 LambdaQueryWrapper<CsEventPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
                 lambdaQueryWrapper.eq(CsEventPO::getLineId, param.getLineId())
@@ -271,7 +294,7 @@ public class DataServiceImpl implements IDataService {
                 if (CollectionUtil.isNotEmpty(eventList)) {
                     eventList.forEach(item->{
                         EleEpdPqd epdPqd = epdFeignClient.findByName(item.getTag()).getData();
-                        EachModuleVO.harmonicVo vo = new EachModuleVO.harmonicVo();
+                        EachModuleVO.HarmonicVo vo = new EachModuleVO.HarmonicVo();
                         vo.setTime(item.getStartTime());
                         vo.setStateDesc(channelState2(item.getTag()));
                         vo.setEventCode(item.getTag());
@@ -285,17 +308,19 @@ public class DataServiceImpl implements IDataService {
                     });
                 }
                 if (CollectionUtil.isNotEmpty(list1)) {
-                    List<EachModuleVO.harmonicVo> dataList = list1.stream()
-                            .sorted(Comparator.comparing(EachModuleVO.harmonicVo::getTime))
+                    List<EachModuleVO.HarmonicVo> dataList = list1.stream()
+                            .sorted(Comparator.comparing(EachModuleVO.HarmonicVo::getTime))
                             .collect(Collectors.toList());
                     moduleVO.setDataList(dataList);
-                    EachModuleVO.harmonicVo last = dataList.get(dataList.size() - 1);
+                    EachModuleVO.HarmonicVo last = dataList.get(dataList.size() - 1);
                     if (Objects.equals(last.getDataType(),0)) {
                         moduleVO.setModuleState(last.getStateDesc());
                     } else if (Objects.equals(last.getDataType(),1)) {
                         moduleVO.setModuleState(Objects.equals(last.getStateDesc(),"Alm_Apf_ModDisConnect") ? "离线" : "运行");
                     }
                 }
+                moduleVO.setModOutList(list2);
+                moduleVO.setLoadList(list3);
                 result.add(moduleVO);
             }
         }