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 10890aaf7..2ace00a14 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
@@ -794,8 +794,8 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
     @Override
     public List<TimeVO> getReasonTypeTime(StatisticsParam statisticsParam) throws ParseException {
         //获取暂降字典信息
-        DictData dataDto = dicDataFeignClient.getDicDataByCode(DicDataEnum.VOLTAGE_DIP.getCode()).getData();
-        List<TimeVO> list = new ArrayList<>();
+        List<DictData> data = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.EVENT_STATIS.getCode()).getData();
+        List<String> typeList = data.stream().filter(it->it.getCode().equals(DicDataEnum.VOLTAGE_DIP.getCode()) || it.getCode().equals(DicDataEnum.SHORT_INTERRUPTIONS.getCode())).map(DictData::getId).collect(Collectors.toList());        List<TimeVO> list = new ArrayList<>();
         //参数
         StringBuilder builder1 = new StringBuilder();
         StringBuilder builder2 = new StringBuilder();
@@ -826,11 +826,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())
+                        .in(RmpEventDetailPO::getEventType,typeList)
                         .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 -> dataDto.getId().equals(x.getEventType())).count();
+                long count = eventDetailList.stream().filter(x -> typeList.contains(x.getEventType())).count();
                 if (startMonth < 10) {
                     list.add(new TimeVO(null, null, "", "0" + startMonth.toString(), count + "", startYear.toString(), startYear.toString() + "-" + "0" + startMonth.toString()));
                 } else {
@@ -852,11 +852,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())
+                    .in(RmpEventDetailPO::getEventType, typeList)
                     .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 -> dataDto.getId().equals(x.getEventType())).count();
+            long count1 = eventDetailList.stream().filter(x -> typeList.contains(x.getEventType())).count();
             if (startMonth < 10) {
                 list.add(new TimeVO(null, null, "", "0" + startMonth.toString(), count1 + "", startYear.toString(), startYear.toString() + "-" + "0" + startMonth.toString()));
             } else {
@@ -871,12 +871,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())
+                    .in(RmpEventDetailPO::getEventType, typeList)
                     .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 -> dataDto.getId().equals(x.getEventType()))
+            Map<String, List<RmpEventDetailPO>> map = eventDetailList.stream().filter(x -> typeList.contains(x.getEventType()))
                     .peek(t -> t.setFormatTime(t.getStartTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))))
                     .collect(Collectors.groupingBy(RmpEventDetailPO::getFormatTime));
             Set<String> keySet = map.keySet();
@@ -931,11 +931,12 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
         List<ReasonsVO> reasonsVOS = new ArrayList<>();
         List<TypesVO> typesVOS = new ArrayList<>();
         //获取暂降字典信息
-        DictData dataDto = dicDataFeignClient.getDicDataByCode(DicDataEnum.VOLTAGE_DIP.getCode()).getData();
+        List<DictData> dataDic = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.EVENT_STATIS.getCode()).getData();
+        List<String> typeList = dataDic.stream().filter(it->it.getCode().equals(DicDataEnum.VOLTAGE_DIP.getCode()) || it.getCode().equals(DicDataEnum.SHORT_INTERRUPTIONS.getCode())).map(DictData::getId).collect(Collectors.toList());
         //数据暂降查询
         List<RmpEventDetailPO> info = eventDetailService.list(new LambdaQueryWrapper<RmpEventDetailPO>()
                 .eq(RmpEventDetailPO::getMeasurementPointId, statisticsParam.getLineIndex())
-                .eq(StringUtils.isNotBlank(dataDto.getId()), RmpEventDetailPO::getEventType, dataDto.getId())
+                .in( RmpEventDetailPO::getEventType,typeList)
                 .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())))
         );
@@ -952,7 +953,7 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
         //添加detail
         for (RmpEventDetailPO detail : info) {
             EventDetail details = null;
-            if (dataDto.getId().equals(detail.getEventType())) {
+            if (typeList.contains(detail.getEventType())) {
                 for (DictData data : reasonData) {
                     reasonMap.put(data.getName(), 0);
                     if (detail.getAdvanceReason().equals(data.getId())) {
@@ -1326,11 +1327,12 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
 //            }
 //        }
         //获取电压暂降信息
-        DictData data = dicDataFeignClient.getDicDataByCode(DicDataEnum.VOLTAGE_DIP.getCode()).getData();
+        List<DictData> data = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.EVENT_STATIS.getCode()).getData();
+        List<String> typeList = data.stream().filter(it->it.getCode().equals(DicDataEnum.VOLTAGE_DIP.getCode()) || it.getCode().equals(DicDataEnum.SHORT_INTERRUPTIONS.getCode())).map(DictData::getId).collect(Collectors.toList());
         //查询监测点未处理暂态事件
         List<RmpEventDetailPO> eventDetails = eventDetailService.list(new LambdaQueryWrapper<RmpEventDetailPO>()
                 .eq(RmpEventDetailPO::getMeasurementPointId, statisticsParam.getLineIndex())
-                .eq(StrUtil.isNotBlank(data.getId()), RmpEventDetailPO::getEventType, data.getId())
+                .in(RmpEventDetailPO::getEventType,typeList)
                 .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())))
         );
@@ -1353,7 +1355,7 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
             eventDetailNew.setFeatureAmplitude(eventDetail.getFeatureAmplitude());
             //波形路径
             eventDetailNew.setWavePath(eventDetail.getWavePath());
-            if (data.getId().equals(eventDetail.getEventType())) {
+            //if (data.getId().equals(eventDetail.getEventType())) {
                 if (reasonMap.containsKey(eventDetail.getAdvanceReason())) {
                     //暂降原因
                     DictData dictData = reasonMap.get(eventDetail.getAdvanceReason());
@@ -1364,7 +1366,7 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
                     DictData dictData = typeMap.get(eventDetail.getAdvanceType());
                     eventDetailNew.setAdvanceType(dictData.getName());
                 }
-            }
+           // }
 
             result.add(eventDetailNew);
         }
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/SteadyQualifyServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/SteadyQualifyServiceImpl.java
index 4f18303d2..0371247ee 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/SteadyQualifyServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/SteadyQualifyServiceImpl.java
@@ -365,7 +365,7 @@ public class SteadyQualifyServiceImpl implements SteadyQualifyService {
                         steadyQualifyDTO.getIharm24Overtime() +
                         steadyQualifyDTO.getIharm25Overtime())));
                 //间谐波电压含有率
-                steadyQualifyVO.setInterHarmonic(calculateIN(steadyQualifyDTO.getAllTime(), (steadyQualifyDTO.getInuharm1Overtime() +
+                steadyQualifyVO.setInterHarmonic(calculateIN(steadyQualifyDTO.getAllTime()*16, (steadyQualifyDTO.getInuharm1Overtime() +
                         steadyQualifyDTO.getInuharm2Overtime() +
                         steadyQualifyDTO.getInuharm3Overtime() +
                         steadyQualifyDTO.getInuharm4Overtime() +
@@ -497,7 +497,7 @@ public class SteadyQualifyServiceImpl implements SteadyQualifyService {
             return 3.14159;
         } else {
             if (allTime >= overTime) {
-                return NumberUtil.round((1 - (overTime / (allTime * 16.0))) * 100, 2).doubleValue();
+                return NumberUtil.round((1 - ((double) overTime /allTime)) * 100, 2).doubleValue();
             }
             return 0.0;
         }