diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventAnalysisServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventAnalysisServiceImpl.java
index 62a14d099..509d5a63e 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventAnalysisServiceImpl.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventAnalysisServiceImpl.java
@@ -935,7 +935,7 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
     @Override
     public List<TimeVO> getReasonTypeTime(StatisticsParam statisticsParam) throws ParseException {
         //获取暂降字典信息
-        DictData data = dicDataFeignClient.getDicDataByCode(DicDataEnum.VOLTAGE_DIP.getCode()).getData();
+        DictData dataDto = dicDataFeignClient.getDicDataByCode(DicDataEnum.VOLTAGE_DIP.getCode()).getData();
         List<TimeVO> list = new ArrayList<>();
         //参数
         StringBuilder builder1 = new StringBuilder();
@@ -967,10 +967,11 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
 //                long count = eventDetailList.stream().filter(x -> x.getWaveType() == 1).count();
                 List<RmpEventDetailPO> eventDetailList = eventDetailService.list(new LambdaQueryWrapper<RmpEventDetailPO>()
                         .eq(RmpEventDetailPO::getMeasurementPointId, statisticsParam.getLineIndex())
+                        .eq(StringUtils.isNotBlank(dataDto.getId()),RmpEventDetailPO::getEventType, dataDto.getId())
                         .ge(StringUtils.isNotBlank(statisticsParam.getStartTime()), RmpEventDetailPO::getStartTime, DateUtil.beginOfDay(DateUtil.parse(statisticsParam.getStartTime())))
                         .le(StringUtils.isNotBlank(statisticsParam.getEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(statisticsParam.getEndTime())))
                 );
-                long count = eventDetailList.stream().filter(x -> data.getId().equals(x.getEventType())).count();
+                long count = eventDetailList.stream().filter(x -> dataDto.getId().equals(x.getEventType())).count();
                 if (startMonth < 10) {
                     list.add(new TimeVO(null, null, "", "0" + startMonth.toString(), count + "", startYear.toString(), startYear.toString() + "-" + "0" + startMonth.toString()));
                 } else {
@@ -992,10 +993,11 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
 //            long count1 = eventDetailList.stream().filter(x -> x.getWaveType() == 1).count();
             List<RmpEventDetailPO> eventDetailList = eventDetailService.list(new LambdaQueryWrapper<RmpEventDetailPO>()
                     .eq(RmpEventDetailPO::getMeasurementPointId, statisticsParam.getLineIndex())
+                    .eq(StringUtils.isNotBlank(dataDto.getId()),RmpEventDetailPO::getEventType, dataDto.getId())
                     .ge(StringUtils.isNotBlank(statisticsParam.getStartTime()), RmpEventDetailPO::getStartTime, DateUtil.beginOfDay(DateUtil.parse(statisticsParam.getStartTime())))
                     .le(StringUtils.isNotBlank(statisticsParam.getEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(statisticsParam.getEndTime())))
             );
-            long count1 = eventDetailList.stream().filter(x -> data.getId().equals(x.getEventType())).count();
+            long count1 = eventDetailList.stream().filter(x -> dataDto.getId().equals(x.getEventType())).count();
             if (startMonth < 10) {
                 list.add(new TimeVO(null, null, "", "0" + startMonth.toString(), count1 + "", startYear.toString(), startYear.toString() + "-" + "0" + startMonth.toString()));
             } else {
@@ -1010,11 +1012,12 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
 
             List<RmpEventDetailPO> eventDetailList = eventDetailService.list(new LambdaQueryWrapper<RmpEventDetailPO>()
                     .eq(RmpEventDetailPO::getMeasurementPointId, statisticsParam.getLineIndex())
+                    .eq(StringUtils.isNotBlank(dataDto.getId()),RmpEventDetailPO::getEventType, dataDto.getId())
                     .ge(StringUtils.isNotBlank(statisticsParam.getStartTime()), RmpEventDetailPO::getStartTime, DateUtil.beginOfDay(DateUtil.parse(statisticsParam.getStartTime())))
                     .le(StringUtils.isNotBlank(statisticsParam.getEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(statisticsParam.getEndTime())))
             );
 
-            Map<String, List<RmpEventDetailPO>> map = eventDetailList.stream().filter(x -> data.getId().equals(x.getEventType()))
+            Map<String, List<RmpEventDetailPO>> map = eventDetailList.stream().filter(x -> dataDto.getId().equals(x.getEventType()))
                     .peek(t ->t.setFormatTime(t.getStartTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))))
                     .collect(Collectors.groupingBy(RmpEventDetailPO::getFormatTime));
             Set<String> keySet = map.keySet();
@@ -1077,7 +1080,7 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
         //数据暂降查询
         List<RmpEventDetailPO> info = eventDetailService.list(new LambdaQueryWrapper<RmpEventDetailPO>()
                 .eq(RmpEventDetailPO::getMeasurementPointId, statisticsParam.getLineIndex())
-                .eq(StringUtils.isNotBlank(dataDto.getId()),RmpEventDetailPO::getMeasurementPointId, dataDto.getId())
+                .eq(StringUtils.isNotBlank(dataDto.getId()),RmpEventDetailPO::getEventType, dataDto.getId())
                 .ge(StringUtils.isNotBlank(statisticsParam.getStartTime()), RmpEventDetailPO::getStartTime, DateUtil.beginOfDay(DateUtil.parse(statisticsParam.getStartTime())))
                 .le(StringUtils.isNotBlank(statisticsParam.getEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(statisticsParam.getEndTime())))
         );