diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/DevicDataTrendQueryParam.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/DevicDataTrendQueryParam.java
index 44aff8b..8ea0195 100644
--- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/DevicDataTrendQueryParam.java
+++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/DevicDataTrendQueryParam.java
@@ -36,6 +36,8 @@ public class DevicDataTrendQueryParam {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @NotNull(message="结束时间不能为空！")
     private String endTime;
+
+    private String devId;
     @Data
     public static class StatisticalParam{
         private String classId;
diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DeviceDataTrendServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DeviceDataTrendServiceImpl.java
index cf90c6c..6ab0e9d 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DeviceDataTrendServiceImpl.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DeviceDataTrendServiceImpl.java
@@ -57,7 +57,7 @@ public class DeviceDataTrendServiceImpl implements DeviceDataTrendService {
         LineParamDTO lineParamDTO = new LineParamDTO();
         lineParamDTO.setLineId(devicDataTrendQueryParam.getLineId());
         List<CsLedger> data = csLedgerFeignClient.queryLine(lineParamDTO).getData();
-        List<CsEquipmentDeliveryDTO> data1 = equipmentFeignClient.queryDeviceById(Stream.of(data.get(0).getPid()).collect(Collectors.toList())).getData();
+        List<CsEquipmentDeliveryDTO> data1 = equipmentFeignClient.queryDeviceById(Stream.of((data == null || data.isEmpty()) ? devicDataTrendQueryParam.getDevId() : data.get(0).getPid()).collect(Collectors.toList())).getData();
         devicDataTrendQueryParam.getStatisticalParams().forEach(temp->{
             CommonQueryParam commonQueryParam = new CommonQueryParam();
             commonQueryParam.setLineId(devicDataTrendQueryParam.getLineId());