diff --git a/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/PatternRegex.java b/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/PatternRegex.java
index 53dfce64b..c4b6a6224 100644
--- a/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/PatternRegex.java
+++ b/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/PatternRegex.java
@@ -75,9 +75,9 @@ public interface PatternRegex {
     String ROLE_REGEX = "^[a-zA-Z][a-zA-Z0-9]{2,50}$";
 
     /**
-     * 部门名称由汉字组成，长度为0-20
+     * 部门名称由汉字组成，长度为0-32 （前端统一32了这边改下长度）
      */
-    String DEPT_NAME_REGEX = "^[\\u4e00-\\u9fa5]{1,20}$";
+    String DEPT_NAME_REGEX = "^[\\u4e00-\\u9fa5]{1,32}$";
 
     /**
      * 字典名称包括中文、数字、字母、罗马数字、括号以及点号
diff --git a/pqs-common/common-web/src/main/java/com/njcn/web/constant/ValidMessage.java b/pqs-common/common-web/src/main/java/com/njcn/web/constant/ValidMessage.java
index 65f811f8c..2df600d08 100644
--- a/pqs-common/common-web/src/main/java/com/njcn/web/constant/ValidMessage.java
+++ b/pqs-common/common-web/src/main/java/com/njcn/web/constant/ValidMessage.java
@@ -19,7 +19,7 @@ public interface ValidMessage {
 
     String NAME_NOT_BLANK = "名称不能为空，请检查name参数";
 
-    String NAME_FORMAT_ERROR = "名称格式错误，存在特殊符号或超过20字符，请检查name参数";
+    String NAME_FORMAT_ERROR = "名称格式错误，存在特殊符号或超过32字符，请检查name参数";
 
     String INDUSTRY_NOT_BLANK = "行业不能为空，请检查industry参数";
     String INDUSTRY_FORMAT_ERROR = "行业格式错误，请检查industry参数";
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RunManageServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RunManageServiceImpl.java
index 696771e3c..676e1036e 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RunManageServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RunManageServiceImpl.java
@@ -86,7 +86,7 @@ public class RunManageServiceImpl implements RunManageService {
             lineIndexes = generalDeviceDTOList.stream().flatMap(list -> list.getLineIndexes().stream()).collect(Collectors.toList());
         }
         if (!CollectionUtils.isEmpty(lineIndexes)) {
-            resultList = deviceMapper.getRunManageList(lineIndexes, runManageParam.getComFlag(),runManageParam.getRunFlag(), Objects.isNull(runManageParam.getSearchValue())?null:runManageParam.getSearchValue());
+            resultList = deviceMapper.getRunManageList(lineIndexes, runManageParam.getComFlag(),Objects.isNull(runManageParam.getRunFlag())?new ArrayList<>():runManageParam.getRunFlag(), Objects.isNull(runManageParam.getSearchValue())?null:runManageParam.getSearchValue());
             if(CollUtil.isNotEmpty(resultList)){
                 List<String> objIds = resultList.stream().map(RunManageVO::getObjId).collect(Collectors.toList());
                 Map<String,NewUserReportVO> runManageVOMap = userLedgerFeignClient.getUserReportByIds(objIds).getData().stream().collect(Collectors.toMap(NewUserReportVO::getId,Function.identity()));
diff --git a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/LineMapper.xml b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/LineMapper.xml
index 02a79adac..b3333cc02 100644
--- a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/LineMapper.xml
+++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/LineMapper.xml
@@ -562,7 +562,7 @@
         detail.Short_Capacity,
         detail.Standard_Capacity,
         detail.Deal_Capacity,
-        detail.Business_Type,
+        detail.Business_Type businessType,
         detail.Calssification_Grade,
         detail.Superiors_Substation,
         detail.Hang_Line,
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/LargeScreenMapper.xml b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/LargeScreenMapper.xml
index c21cdd918..b138f6ac5 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/LargeScreenMapper.xml
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/LargeScreenMapper.xml
@@ -5,8 +5,10 @@
     <select id="selectDownCount" resultType="java.lang.Integer">
         select
         count(ed.event_id) "COUNT"
-        from r_mp_event_detail ed
+        from r_mp_event_detail ed inner join sys_dict_data sd on ed.event_type= sd.id
         where
+        sd.code in ('Voltage_Dip','Short_Interruptions')
+        and
         ed.measurement_point_id in
         <foreach collection="lineIds" item="item" open="(" close=")" separator=",">
             #{item}
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaAnalysisServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaAnalysisServiceImpl.java
index e0b9fad7b..80e40e387 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaAnalysisServiceImpl.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaAnalysisServiceImpl.java
@@ -31,6 +31,7 @@ import org.springframework.stereotype.Service;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 
 /**
@@ -51,11 +52,12 @@ public class AreaAnalysisServiceImpl implements AreaAnalysisService {
     private final EventDetailService eventDetailService;
     @Override
     public AreaAnalysisVO getEventReason(DeviceInfoParam.BusinessParam deviceInfoParam) {
-        //根据单体系统这里只要不为录波的都统计
-        //获取暂降字典信息
-        DictData recordingWaveData = dicDataFeignClient.getDicDataByCode(DicDataEnum.RECORDING_WAVE.getCode()).getData();
 
-        if(ObjectUtil.isNull(recordingWaveData)){
+        //获取暂降字典信息
+        DictData voltageData = dicDataFeignClient.getDicDataByCode(DicDataEnum.VOLTAGE_DIP.getCode()).getData();
+        DictData shortInterruptionsData = dicDataFeignClient.getDicDataByCode(DicDataEnum.SHORT_INTERRUPTIONS.getCode()).getData();
+
+        if(ObjectUtil.isNull(voltageData)||ObjectUtil.isNull(shortInterruptionsData)){
             throw new BusinessException(DeviceResponseEnum.DIC_GET_EMPTY);
         }
         AreaAnalysisVO areaAnalysisVO = new AreaAnalysisVO();
@@ -70,7 +72,9 @@ public class AreaAnalysisServiceImpl implements AreaAnalysisService {
         List<RmpEventDetailPO> info = eventDetailService.list(new QueryWrapper<RmpEventDetailPO>()
                 .select("advance_reason,advance_type,count(event_id) as count")
                 .in("measurement_point_id", lineIds)
-                .ne("event_type", recordingWaveData.getId())
+                .in("event_type", Stream.of(voltageData.getId(),shortInterruptionsData.getId()).collect(Collectors.toList()))
+
+//                .eq("event_type", voltageData.getId())
                 .in("advance_reason", dicReasonList.stream().map(DictData::getId).collect(Collectors.toList()))
                 .in("advance_type", dicTypeList.stream().map(DictData::getId).collect(Collectors.toList()))
                 .ge(StrUtil.isNotBlank(deviceInfoParam.getSearchBeginTime()),"start_time" ,DateUtil.beginOfDay(DateUtil.parse(deviceInfoParam.getSearchBeginTime())))
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaInfoServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaInfoServiceImpl.java
index b4eba0e81..b7ed470a0 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaInfoServiceImpl.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaInfoServiceImpl.java
@@ -22,6 +22,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -149,7 +150,7 @@ public class AreaInfoServiceImpl implements AreaInfoService {
                 //监测点id
                 eventDetailNew.setLineId(eventDetail.getMeasurementPointId());
                 //特征幅值 需要转成百分比*100
-                eventDetailNew.setFeatureAmplitude(eventDetail.getFeatureAmplitude()*100);
+                eventDetailNew.setFeatureAmplitude(roundHalfUp(eventDetail.getFeatureAmplitude()*100));
                 //持续时间
                 eventDetailNew.setDuration(eventDetail.getDuration());
 
@@ -164,7 +165,14 @@ public class AreaInfoServiceImpl implements AreaInfoService {
         }
         return resList;
     }
-
+    private Double roundHalfUp(double num) {
+        if (num == 3.14159) {
+            return num;
+        }
+        BigDecimal b = new BigDecimal(num);
+        //保留2位小数
+        return com.njcn.harmonic.utils.PubUtils.dataLimits(b.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+    }
     @Override
     public List<EventDetailNew> getNoDealEventsByLineId(String id, String searchBeginTime, String searchEndTime) {
         List<AreaLineInfoVO> lineList = lineFeignClient.getBaseLineAreaInfo(Stream.of(id).collect(Collectors.toList())).getData();
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaStatisticalServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaStatisticalServiceImpl.java
index faf6703ce..8116626ba 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaStatisticalServiceImpl.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaStatisticalServiceImpl.java
@@ -5,8 +5,11 @@ import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.device.biz.enums.DeviceResponseEnum;
 import com.njcn.device.pq.api.GeneralDeviceInfoClient;
 import com.njcn.device.pq.api.LineFeignClient;
 import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
@@ -66,7 +69,11 @@ public class AreaStatisticalServiceImpl implements AreaStatisticalService {
     public AreaStatisticalVO getAreaCalculation(DeviceInfoParam.BusinessParam deviceInfoParam) {
         //获取录波字典信息
         DictData data = dicDataFeignClient.getDicDataByCode(DicDataEnum.VOLTAGE_DIP.getCode()).getData();
+        DictData shortInterruptionsData = dicDataFeignClient.getDicDataByCode(DicDataEnum.SHORT_INTERRUPTIONS.getCode()).getData();
 
+        if(ObjectUtil.isNull(data)||ObjectUtil.isNull(shortInterruptionsData)){
+            throw new BusinessException(DeviceResponseEnum.DIC_GET_EMPTY);
+        }
         // 获取指定部门下的监测点集合
         List<GeneralDeviceDTO> generalDeviceDTOList = generalDeviceInfoClient.getPracticalRunDeviceInfo(deviceInfoParam).getData();
         if (CollUtil.isEmpty(generalDeviceDTOList)) {
@@ -80,7 +87,8 @@ public class AreaStatisticalServiceImpl implements AreaStatisticalService {
         List<RmpEventDetailPO> info = eventDetailService.list(new LambdaQueryWrapper<RmpEventDetailPO>()
                 .in(RmpEventDetailPO::getMeasurementPointId, lineIds)
                 //todo 是否缺少录波
-                .eq(RmpEventDetailPO::getEventType, data.getId())
+                .in(RmpEventDetailPO::getEventType, Stream.of(data.getId(),shortInterruptionsData.getId()).collect(Collectors.toList()))
+
                 .ge(StrUtil.isNotBlank(deviceInfoParam.getSearchBeginTime()), RmpEventDetailPO::getStartTime,DateUtil.beginOfDay(DateUtil.parse(deviceInfoParam.getSearchBeginTime())))
                 .le(StrUtil.isNotBlank(deviceInfoParam.getSearchEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(deviceInfoParam.getSearchEndTime())))
         );
@@ -105,7 +113,11 @@ public class AreaStatisticalServiceImpl implements AreaStatisticalService {
         List<NodeVO> nodeVOS=new ArrayList<>();
         //获取录波字典信息
         DictData data = dicDataFeignClient.getDicDataByCode(DicDataEnum.VOLTAGE_DIP.getCode()).getData();
+        DictData shortInterruptionsData = dicDataFeignClient.getDicDataByCode(DicDataEnum.SHORT_INTERRUPTIONS.getCode()).getData();
 
+        if(ObjectUtil.isNull(data)||ObjectUtil.isNull(shortInterruptionsData)){
+            throw new BusinessException(DeviceResponseEnum.DIC_GET_EMPTY);
+        }
         // 获取指定部门下的监测点集合
         List<GeneralDeviceDTO> generalDeviceDTOList = generalDeviceInfoClient.getPracticalRunDeviceInfo(deviceInfoParam).getData();
         if (CollUtil.isEmpty(generalDeviceDTOList)) {
@@ -119,7 +131,7 @@ public class AreaStatisticalServiceImpl implements AreaStatisticalService {
         List<RmpEventDetailPO> info = eventDetailService.list(new LambdaQueryWrapper<RmpEventDetailPO>()
                 .in(RmpEventDetailPO::getMeasurementPointId, lineIds)
                 //todo 是否缺少录波
-                .eq(RmpEventDetailPO::getEventType, data.getId())
+                .in(RmpEventDetailPO::getEventType, Stream.of(data.getId(),shortInterruptionsData.getId()).collect(Collectors.toList()))
                 .ge(StrUtil.isNotBlank(deviceInfoParam.getSearchBeginTime()), RmpEventDetailPO::getStartTime,DateUtil.beginOfDay(DateUtil.parse(deviceInfoParam.getSearchBeginTime())))
                 .le(StrUtil.isNotBlank(deviceInfoParam.getSearchEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(deviceInfoParam.getSearchEndTime())))
         );
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java
index 2bf06c9ce..7e983d17f 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java
@@ -76,6 +76,7 @@ import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.List;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 
@@ -123,7 +124,7 @@ public class ReportServiceImpl implements ReportService {
     private final DrawPicUtil drawPicUtil;
     private final FileStorageUtil fileStorageUtil;
 
-    public List<EventDetail> getED(DeviceInfoParam.BusinessParam businessParam, String id) {
+    public List<EventDetail> getED(DeviceInfoParam.BusinessParam businessParam, List<String> ids) {
         List<EventDetail> info = new ArrayList<>();
         List<GeneralDeviceDTO> deviceDTOList = generalDeviceInfoClient.getPracticalAllDeviceInfo(businessParam).getData();
         List<String> lineIds = deviceDTOList.stream().flatMap(dto -> dto.getLineIndexes().stream()).collect(Collectors.toList());
@@ -131,7 +132,7 @@ public class ReportServiceImpl implements ReportService {
             //数据暂降查询
             List<RmpEventDetailPO> eventDetails = eventDetailService.list(new LambdaQueryWrapper<RmpEventDetailPO>()
                     .in(RmpEventDetailPO::getMeasurementPointId, lineIds)
-                    .eq(RmpEventDetailPO::getEventType, id)
+                    .in(RmpEventDetailPO::getEventType, ids)
                     .ge(StrUtil.isNotBlank(businessParam.getSearchBeginTime()), RmpEventDetailPO::getStartTime, DateUtil.beginOfDay(DateUtil.parse(businessParam.getSearchBeginTime())))
                     .le(StrUtil.isNotBlank(businessParam.getSearchEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(businessParam.getSearchEndTime())))
             );
@@ -326,11 +327,13 @@ public class ReportServiceImpl implements ReportService {
     public List<ReasonsVO> getReason(DeviceInfoParam.BusinessParam businessParam) {
         //获取暂降字典信息
         DictData dictData = dicDataFeignClient.getDicDataByCode(DicDataEnum.VOLTAGE_DIP.getCode()).getData();
-        if (ObjectUtil.isNull(dictData)) {
+        DictData shortInterruptionsData = dicDataFeignClient.getDicDataByCode(DicDataEnum.SHORT_INTERRUPTIONS.getCode()).getData();
+
+        if(ObjectUtil.isNull(dictData)||ObjectUtil.isNull(shortInterruptionsData)){
             throw new BusinessException(DeviceResponseEnum.DIC_GET_EMPTY);
         }
         List<ReasonsVO> result = new ArrayList<>();
-        List<EventDetail> info = getED(businessParam, dictData.getId());
+        List<EventDetail> info = getED(businessParam,Stream.of(dictData.getId(),shortInterruptionsData.getId()).collect(Collectors.toList()) );
         //获取字典表
         HttpResult<List<DictData>> reason = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.EVENT_REASON.getName());
         List<DictData> data = reason.getData();
@@ -339,15 +342,17 @@ public class ReportServiceImpl implements ReportService {
         for (DictData datum : data) {
             count.put(datum.getName(), 0);
         }
+        //过滤掉原因的是空的
+        info = info.stream().filter(temp->Objects.nonNull(temp.getAdvanceReason())).collect(Collectors.toList());
         //替值
         for (EventDetail eventDetail : info) {
-            if (dictData.getId().equals(eventDetail.getEventType())) {
+//            if (dictData.getId().equals(eventDetail.getEventType())) {
                 for (DictData datum : data) {
                     if (datum.getId().equals(eventDetail.getAdvanceReason())) {
                         eventDetail.setAdvanceReason(datum.getName());
                     }
                 }
-            }
+//            }
         }
         //计数
         Set<String> keySet = count.keySet();
@@ -384,7 +389,9 @@ public class ReportServiceImpl implements ReportService {
     public Page<DetailVO> getContinueTime(WaveTypeParam waveTypeParam) {
         //获取暂降字典信息
         DictData voltageData = dicDataFeignClient.getDicDataByCode(DicDataEnum.VOLTAGE_DIP.getCode()).getData();
-        if (ObjectUtil.isNull(voltageData)) {
+        DictData shortInterruptionsData = dicDataFeignClient.getDicDataByCode(DicDataEnum.SHORT_INTERRUPTIONS.getCode()).getData();
+
+        if(ObjectUtil.isNull(voltageData)||ObjectUtil.isNull(shortInterruptionsData)){
             throw new BusinessException(DeviceResponseEnum.DIC_GET_EMPTY);
         }
         List<String> lineIds = new ArrayList<>();
@@ -429,7 +436,7 @@ public class ReportServiceImpl implements ReportService {
         if (waveTypeParam.getType() != 3) {
             pageInfo = eventDetailService.page(new Page<>(waveTypeParam.getPageNum(), waveTypeParam.getPageSize()), new LambdaQueryWrapper<RmpEventDetailPO>()
                     .in(RmpEventDetailPO::getMeasurementPointId, lineIds)
-                    .eq(StrUtil.isNotBlank(voltageData.getId()), RmpEventDetailPO::getEventType, voltageData.getId())
+                    .in(RmpEventDetailPO::getEventType,Stream.of(voltageData.getId(),shortInterruptionsData.getId()).collect(Collectors.toList()))
                     .ge(StringUtils.isNotBlank(waveTypeParam.getSearchBeginTime()), RmpEventDetailPO::getStartTime, DateUtil.beginOfDay(DateUtil.parse(waveTypeParam.getSearchBeginTime())))
                     .le(StringUtils.isNotBlank(waveTypeParam.getSearchEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(waveTypeParam.getSearchEndTime())))
                     .orderByDesc(RmpEventDetailPO::getStartTime)
@@ -2155,6 +2162,7 @@ public class ReportServiceImpl implements ReportService {
             throw new BusinessException(EventResponseEnum.NOT_FOUND);
         }
         List<EventDetailNew> eventDetailList = getEventDetailListInfo(areaReportParam, lineIds, areaReportParam.getWaveType());
+        List<EventDetail> eventDetails = BeanUtil.copyToList(eventDetailList, EventDetail.class);
         List<GeneralDeviceDTO> voltageParamList = generalDeviceInfoClient.getPracticalAllDeviceInfo(areaParam).getData();
 
 
@@ -2802,1465 +2810,1513 @@ public class ReportServiceImpl implements ReportService {
         }
 
         //3.密度图
+//        if (areaReportParam.isDensityTable() || areaReportParam.isDensityChart()) {
+//
+//            //暂降密度图形
+//            AreaTableParam areaTableParam = new AreaTableParam();
+//
+//            //创建结果集合
+//            List<EventDetailNew> info = eventDetailList;
+//
+//            //将sql结果集放入,共用一个sql,减少查询时间
+//            AreaTableParam areaTableParam1 = new AreaTableParam();
+//            areaTableParam1.setInfo(info);
+//
+//
+//            List<IEC28VO> iEC28VOResult = IEC28Area(areaTableParam1);
+//            List<IEC411VO> iEC411VOResult = IEC411Area(areaTableParam1);
+//            List<DISDIPVO> dISDIPVOResult = eventDisdipArea(areaTableParam1);
+//
+//
+//            //IEC411 <1% 总共集合
+//            List<IEC411VO> lessOneIEC411 = new ArrayList<>();
+//            //IEC411 1~40% 总共集合
+//            List<IEC411VO> lessFortyIEC411 = new ArrayList<>();
+//            //IEC411 40~70% 总共集合
+//            List<IEC411VO> lessSeventyIEC411 = new ArrayList<>();
+//
+//
+//            //IEC28 <1% 总共集合
+//            List<IEC28VO> lessOneIEC28 = new ArrayList<>();
+//            //IEC411 <10 总共集合
+//            List<IEC28VO> lessTenIEC28 = new ArrayList<>();
+//            //IEC411 <20 总共集合
+//            List<IEC28VO> lessTwentyIEC28 = new ArrayList<>();
+//            //IEC411 <30 总共集合
+//            List<IEC28VO> lessThirtyIEC28 = new ArrayList<>();
+//            //IEC411 <40 总共集合
+//            List<IEC28VO> lessFortyIEC28 = new ArrayList<>();
+//            //IEC411 <50 总共集合
+//            List<IEC28VO> lessFiftyIEC28 = new ArrayList<>();
+//            //IEC411 <60 总共集合
+//            List<IEC28VO> lessSixtyIEC28 = new ArrayList<>();
+//            //IEC411 <70 总共集合
+//            List<IEC28VO> lessSeventyIEC28 = new ArrayList<>();
+//            //IEC411 <80 总共集合
+//            List<IEC28VO> lessEightyIEC28 = new ArrayList<>();
+//            //IEC411 <90 总共集合
+//            List<IEC28VO> lessNinetyIEC28 = new ArrayList<>();
+//            //IEC411 <120 总共集合
+//            List<IEC28VO> lessHundredTwentyIEC28 = new ArrayList<>();
+//            //IEC411 <130 总共集合
+//            List<IEC28VO> lessHundredThirtyIEC28 = new ArrayList<>();
+//            //IEC411 <140 总共集合
+//            List<IEC28VO> lessHundredFortyIEC28 = new ArrayList<>();
+//            //IEC411 <150 总共集合
+//            List<IEC28VO> lessHundredFiftyIEC28 = new ArrayList<>();
+//            //IEC411 <160 总共集合
+//            List<IEC28VO> lessHundredSixtyIEC28 = new ArrayList<>();
+//            //IEC411 <170 总共集合
+//            List<IEC28VO> lessHundredSeventyIEC28 = new ArrayList<>();
+//            //IEC411 <180 总共集合
+//            List<IEC28VO> lessHundredEightyIEC28 = new ArrayList<>();
+//
+//
+//            //DISDIP = 10%
+//            List<DISDIPVO> equalTenDISDIP = new ArrayList<>();
+//            //DISDIP = 40%
+//            List<DISDIPVO> equalFortyDISDIP = new ArrayList<>();
+//            //DISDIP = 70%
+//            List<DISDIPVO> equalSeventyDISDIP = new ArrayList<>();
+//            //DISDIP = 85%
+//            List<DISDIPVO> equalEightyFiveDISDIP = new ArrayList<>();
+//            //DISDIP = 90%
+//            List<DISDIPVO> equalNinetyDISDIP = new ArrayList<>();
+//
+//
+//            //遍历将集合按名称分开
+//            for (int i1 = 0; i1 < iEC411VOResult.size(); i1++) {
+//                if ("<1%".equals(iEC411VOResult.get(i1).getName())) {
+//                    //放入集合
+//                    lessOneIEC411.add(iEC411VOResult.get(i1));
+//                } else if ("1~40%".equals(iEC411VOResult.get(i1).getName())) {
+//                    //放入集合
+//                    lessFortyIEC411.add(iEC411VOResult.get(i1));
+//                } else {
+//                    //放入集合
+//                    lessSeventyIEC411.add(iEC411VOResult.get(i1));
+//                }
+//            }
+//
+//
+//            //遍历将集合按名称分开
+//            for (int i1 = 0; i1 < iEC28VOResult.size(); i1++) {
+//                if ("1>U>=0".equals(iEC28VOResult.get(i1).getName())) {
+//                    //放入集合
+//                    lessOneIEC28.add(iEC28VOResult.get(i1));
+//                } else if ("10>U>=1".equals(iEC28VOResult.get(i1).getName())) {
+//                    //放入集合
+//                    lessTenIEC28.add(iEC28VOResult.get(i1));
+//                } else if ("20>U>=10".equals(iEC28VOResult.get(i1).getName())) {
+//                    //放入集合
+//                    lessTwentyIEC28.add(iEC28VOResult.get(i1));
+//                } else if ("30>U>=20".equals(iEC28VOResult.get(i1).getName())) {
+//                    //放入集合
+//                    lessThirtyIEC28.add(iEC28VOResult.get(i1));
+//                } else if ("40>U>=30".equals(iEC28VOResult.get(i1).getName())) {
+//                    //放入集合
+//                    lessFortyIEC28.add(iEC28VOResult.get(i1));
+//                } else if ("50>U>=40".equals(iEC28VOResult.get(i1).getName())) {
+//                    //放入集合
+//                    lessFiftyIEC28.add(iEC28VOResult.get(i1));
+//                } else if ("60>U>=50".equals(iEC28VOResult.get(i1).getName())) {
+//                    //放入集合
+//                    lessSixtyIEC28.add(iEC28VOResult.get(i1));
+//                } else if ("70>U>=60".equals(iEC28VOResult.get(i1).getName())) {
+//                    //放入集合
+//                    lessSeventyIEC28.add(iEC28VOResult.get(i1));
+//                } else if ("80>U>=70".equals(iEC28VOResult.get(i1).getName())) {
+//                    //放入集合
+//                    lessEightyIEC28.add(iEC28VOResult.get(i1));
+//                } else if ("90>U>=80".equals(iEC28VOResult.get(i1).getName())) {
+//                    //放入集合
+//                    lessNinetyIEC28.add(iEC28VOResult.get(i1));
+//                } else if ("120>U>=110".equals(iEC28VOResult.get(i1).getName())) {
+//                    //放入集合
+//                    lessHundredTwentyIEC28.add(iEC28VOResult.get(i1));
+//                } else if ("130>U>=120".equals(iEC28VOResult.get(i1).getName())) {
+//                    //放入集合
+//                    lessHundredThirtyIEC28.add(iEC28VOResult.get(i1));
+//                } else if ("140>U>=130".equals(iEC28VOResult.get(i1).getName())) {
+//                    //放入集合
+//                    lessHundredFortyIEC28.add(iEC28VOResult.get(i1));
+//                } else if ("150>U>=140".equals(iEC28VOResult.get(i1).getName())) {
+//                    //放入集合
+//                    lessHundredFiftyIEC28.add(iEC28VOResult.get(i1));
+//                } else if ("160>U>=150".equals(iEC28VOResult.get(i1).getName())) {
+//                    //放入集合
+//                    lessHundredSixtyIEC28.add(iEC28VOResult.get(i1));
+//                } else if ("170>U>=160".equals(iEC28VOResult.get(i1).getName())) {
+//                    //放入集合
+//                    lessHundredSeventyIEC28.add(iEC28VOResult.get(i1));
+//                } else {
+//                    //放入集合
+//                    lessHundredEightyIEC28.add(iEC28VOResult.get(i1));
+//
+//                }
+//            }
+//
+//            //遍历将集合按名称分开
+//            for (int i1 = 0; i1 < dISDIPVOResult.size(); i1++) {
+//                if ("10%".equals(dISDIPVOResult.get(i1).getName())) {
+//                    //放入集合
+//                    equalTenDISDIP.add(dISDIPVOResult.get(i1));
+//                } else if ("40%".equals(dISDIPVOResult.get(i1).getName())) {
+//                    //放入集合
+//                    equalFortyDISDIP.add(dISDIPVOResult.get(i1));
+//                } else if ("70%".equals(dISDIPVOResult.get(i1).getName())) {
+//                    //放入集合
+//                    equalSeventyDISDIP.add(dISDIPVOResult.get(i1));
+//                } else if ("85%".equals(dISDIPVOResult.get(i1).getName())) {
+//                    //放入集合
+//                    equalEightyFiveDISDIP.add(dISDIPVOResult.get(i1));
+//                } else {
+//                    //放入集合
+//                    equalNinetyDISDIP.add(dISDIPVOResult.get(i1));
+//                }
+//            }
+//
+//
+//            //遍历集合中的参数
+//            IEC411CountParam iec411LessOne = new IEC411CountParam();
+//
+//            for (IEC411VO iec411VO : lessOneIEC411) {
+//                //获取当前剩余电压名称,不为空就进行添加
+//                if (Objects.isNull(iec411LessOne.getName())) {
+//                    iec411LessOne.setName(iec411VO.getName());
+//                }
+//
+//                //如果参数不等于0对对象中的参数进行++
+//                if (!"0".equals(iec411VO.getTenTwentyMs())) {
+//                    int tenToTwenty = iec411LessOne.getTenToTwenty();
+//                    iec411LessOne.setTenToTwenty(tenToTwenty++);
+//                }
+//                if (!"0".equals(iec411VO.getTwentyOneHundredMs())) {
+//                    int twentyToHundred = iec411LessOne.getTwentyToHundred();
+//                    iec411LessOne.setTenToTwenty(twentyToHundred++);
+//                }
+//                if (!"0".equals(iec411VO.getZeroPiontOneTwoS())) {
+//                    int zeroOneToZeroTwo = iec411LessOne.getZeroOneToZeroTwo();
+//                    iec411LessOne.setTenToTwenty(zeroOneToZeroTwo++);
+//                }
+//                if (!"0".equals(iec411VO.getZeroPiontTwoFiveS())) {
+//                    int zeroTwoToZeroFive = iec411LessOne.getZeroTwoToZeroFive();
+//                    iec411LessOne.setTenToTwenty(zeroTwoToZeroFive++);
+//                }
+//                if (!"0".equals(iec411VO.getZeroPiontFive1S())) {
+//                    int zeroFiveToOne = iec411LessOne.getZeroFiveToOne();
+//                    iec411LessOne.setTenToTwenty(zeroFiveToOne++);
+//                }
+//                if (!"0".equals(iec411VO.getGreater1S())) {
+//                    int lessOne = iec411LessOne.getLessOne();
+//                    iec411LessOne.setTenToTwenty(lessOne++);
+//                }
+//            }
+//
+//            //遍历集合中的参数
+//            IEC411CountParam iec411LessForty = new IEC411CountParam();
+//
+//            for (IEC411VO iec411VO : lessFortyIEC411) {
+//                //获取当前剩余电压名称,不为空就进行添加
+//                if (Objects.isNull(iec411LessForty.getName())) {
+//                    iec411LessForty.setName(iec411VO.getName());
+//                }
+//
+//                //如果参数不等于0对对象中的参数进行++
+//                if (!"0".equals(iec411VO.getTenTwentyMs())) {
+//                    int tenToTwenty = iec411LessForty.getTenToTwenty();
+//                    iec411LessForty.setTenToTwenty(tenToTwenty++);
+//                }
+//                if (!"0".equals(iec411VO.getTwentyOneHundredMs())) {
+//                    int twentyToHundred = iec411LessForty.getTwentyToHundred();
+//                    iec411LessForty.setTenToTwenty(twentyToHundred++);
+//                }
+//                if (!"0".equals(iec411VO.getZeroPiontOneTwoS())) {
+//                    int zeroOneToZeroTwo = iec411LessForty.getZeroOneToZeroTwo();
+//                    iec411LessForty.setTenToTwenty(zeroOneToZeroTwo++);
+//                }
+//                if (!"0".equals(iec411VO.getZeroPiontTwoFiveS())) {
+//                    int zeroTwoToZeroFive = iec411LessForty.getZeroTwoToZeroFive();
+//                    iec411LessForty.setTenToTwenty(zeroTwoToZeroFive++);
+//                }
+//                if (!"0".equals(iec411VO.getZeroPiontFive1S())) {
+//                    int zeroFiveToOne = iec411LessForty.getZeroFiveToOne();
+//                    iec411LessForty.setTenToTwenty(zeroFiveToOne++);
+//                }
+//                if (!"0".equals(iec411VO.getGreater1S())) {
+//                    int lessOne = iec411LessForty.getLessOne();
+//                    iec411LessForty.setTenToTwenty(lessOne++);
+//                }
+//            }
+//
+//            //遍历集合中的参数
+//            IEC411CountParam iec411LessSeventy = new IEC411CountParam();
+//
+//            for (IEC411VO iec411VO : lessSeventyIEC411) {
+//                //获取当前剩余电压名称,不为空就进行添加
+//                if (Objects.isNull(iec411LessSeventy.getName())) {
+//                    iec411LessSeventy.setName(iec411VO.getName());
+//                }
+//
+//                //如果参数不等于0对对象中的参数进行++
+//                if (!"0".equals(iec411VO.getTenTwentyMs())) {
+//                    int tenToTwenty = iec411LessSeventy.getTenToTwenty();
+//                    iec411LessSeventy.setTenToTwenty(tenToTwenty++);
+//                }
+//                if (!"0".equals(iec411VO.getTwentyOneHundredMs())) {
+//                    int twentyToHundred = iec411LessSeventy.getTwentyToHundred();
+//                    iec411LessSeventy.setTenToTwenty(twentyToHundred++);
+//                }
+//                if (!"0".equals(iec411VO.getZeroPiontOneTwoS())) {
+//                    int zeroOneToZeroTwo = iec411LessSeventy.getZeroOneToZeroTwo();
+//                    iec411LessSeventy.setTenToTwenty(zeroOneToZeroTwo++);
+//                }
+//                if (!"0".equals(iec411VO.getZeroPiontTwoFiveS())) {
+//                    int zeroTwoToZeroFive = iec411LessSeventy.getZeroTwoToZeroFive();
+//                    iec411LessSeventy.setTenToTwenty(zeroTwoToZeroFive++);
+//                }
+//                if (!"0".equals(iec411VO.getZeroPiontFive1S())) {
+//                    int zeroFiveToOne = iec411LessSeventy.getZeroFiveToOne();
+//                    iec411LessSeventy.setTenToTwenty(zeroFiveToOne++);
+//                }
+//                if (!"0".equals(iec411VO.getGreater1S())) {
+//                    int lessOne = iec411LessSeventy.getLessOne();
+//                    iec411LessSeventy.setTenToTwenty(lessOne++);
+//                }
+//            }
+//
+//            /**
+//             * ================第一张表结束======================
+//             */
+//
+//            DISDIPCountParam disdipEqualTen = new DISDIPCountParam();
+//
+//            for (DISDIPVO disdipvo : equalTenDISDIP) {
+//                //获取当前剩余电压名称,不为空就进行添加
+//                if (Objects.isNull(disdipEqualTen.getName())) {
+//                    disdipEqualTen.setName(disdipvo.getName());
+//                }
+//
+//                //如果参数不等于0对对象中的参数进行++
+//                if (!"0".equals(disdipvo.getTwentyMs())) {
+//                    int twenty = disdipEqualTen.getTwenty();
+//                    disdipEqualTen.setTwenty(twenty++);
+//                }
+//                if (!"0".equals(disdipvo.getOneHundredMs())) {
+//                    int oneHundredMS = disdipEqualTen.getOneHundredMS();
+//                    disdipEqualTen.setOneHundredMS(oneHundredMS++);
+//                }
+//                if (!"0".equals(disdipvo.getFiveHundredMs())) {
+//                    int fiveHundredMS = disdipEqualTen.getFiveHundredMS();
+//                    disdipEqualTen.setOneHundredMS(fiveHundredMS++);
+//                }
+//                if (!"0".equals(disdipvo.getOneS())) {
+//                    int one = disdipEqualTen.getOne();
+//                    disdipEqualTen.setOne(one++);
+//                }
+//                if (!"0".equals(disdipvo.getThreeS())) {
+//                    int three = disdipEqualTen.getThree();
+//                    disdipEqualTen.setOne(three++);
+//                }
+//                if (!"0".equals(disdipvo.getTwentyS())) {
+//                    int twenty = disdipEqualTen.getTwenty();
+//                    disdipEqualTen.setTwenty(twenty++);
+//                }
+//                if (!"0".equals(disdipvo.getSixtyS())) {
+//                    int sixty = disdipEqualTen.getSixty();
+//                    disdipEqualTen.setSixty(sixty++);
+//                }
+//                if (!"0".equals(disdipvo.getOneEightyS())) {
+//                    int oneHundredAndEighty = disdipEqualTen.getOneHundredAndEighty();
+//                    disdipEqualTen.setOneHundredAndEighty(oneHundredAndEighty++);
+//                }
+//            }
+//
+//            DISDIPCountParam disdipEqualForty = new DISDIPCountParam();
+//
+//            for (DISDIPVO disdipvo : equalFortyDISDIP) {
+//                //获取当前剩余电压名称,不为空就进行添加
+//                if (Objects.isNull(disdipEqualForty.getName())) {
+//                    disdipEqualForty.setName(disdipvo.getName());
+//                }
+//
+//                //如果参数不等于0对对象中的参数进行++
+//                if (!"0".equals(disdipvo.getTwentyMs())) {
+//                    int twenty = disdipEqualForty.getTwenty();
+//                    disdipEqualForty.setTwenty(twenty++);
+//                }
+//                if (!"0".equals(disdipvo.getOneHundredMs())) {
+//                    int oneHundredMS = disdipEqualForty.getOneHundredMS();
+//                    disdipEqualForty.setOneHundredMS(oneHundredMS++);
+//                }
+//                if (!"0".equals(disdipvo.getFiveHundredMs())) {
+//                    int fiveHundredMS = disdipEqualForty.getFiveHundredMS();
+//                    disdipEqualForty.setOneHundredMS(fiveHundredMS++);
+//                }
+//                if (!"0".equals(disdipvo.getOneS())) {
+//                    int one = disdipEqualForty.getOne();
+//                    disdipEqualForty.setOne(one++);
+//                }
+//                if (!"0".equals(disdipvo.getThreeS())) {
+//                    int three = disdipEqualForty.getThree();
+//                    disdipEqualForty.setOne(three++);
+//                }
+//                if (!"0".equals(disdipvo.getTwentyS())) {
+//                    int twenty = disdipEqualForty.getTwenty();
+//                    disdipEqualForty.setTwenty(twenty++);
+//                }
+//                if (!"0".equals(disdipvo.getSixtyS())) {
+//                    int sixty = disdipEqualForty.getSixty();
+//                    disdipEqualForty.setSixty(sixty++);
+//                }
+//                if (!"0".equals(disdipvo.getOneEightyS())) {
+//                    int oneHundredAndEighty = disdipEqualForty.getOneHundredAndEighty();
+//                    disdipEqualForty.setOneHundredAndEighty(oneHundredAndEighty++);
+//                }
+//            }
+//
+//            DISDIPCountParam disdipEqualSeventy = new DISDIPCountParam();
+//
+//            for (DISDIPVO disdipvo : equalSeventyDISDIP) {
+//                //获取当前剩余电压名称,不为空就进行添加
+//                if (Objects.isNull(disdipEqualSeventy.getName())) {
+//                    disdipEqualSeventy.setName(disdipvo.getName());
+//                }
+//
+//                //如果参数不等于0对对象中的参数进行++
+//                if (!"0".equals(disdipvo.getTwentyMs())) {
+//                    int twenty = disdipEqualSeventy.getTwenty();
+//                    disdipEqualSeventy.setTwenty(twenty++);
+//                }
+//                if (!"0".equals(disdipvo.getOneHundredMs())) {
+//                    int oneHundredMS = disdipEqualSeventy.getOneHundredMS();
+//                    disdipEqualSeventy.setOneHundredMS(oneHundredMS++);
+//                }
+//                if (!"0".equals(disdipvo.getFiveHundredMs())) {
+//                    int fiveHundredMS = disdipEqualSeventy.getFiveHundredMS();
+//                    disdipEqualSeventy.setOneHundredMS(fiveHundredMS++);
+//                }
+//                if (!"0".equals(disdipvo.getOneS())) {
+//                    int one = disdipEqualSeventy.getOne();
+//                    disdipEqualSeventy.setOne(one++);
+//                }
+//                if (!"0".equals(disdipvo.getThreeS())) {
+//                    int three = disdipEqualSeventy.getThree();
+//                    disdipEqualSeventy.setOne(three++);
+//                }
+//                if (!"0".equals(disdipvo.getTwentyS())) {
+//                    int twenty = disdipEqualSeventy.getTwenty();
+//                    disdipEqualSeventy.setTwenty(twenty++);
+//                }
+//                if (!"0".equals(disdipvo.getSixtyS())) {
+//                    int sixty = disdipEqualSeventy.getSixty();
+//                    disdipEqualSeventy.setSixty(sixty++);
+//                }
+//                if (!"0".equals(disdipvo.getOneEightyS())) {
+//                    int oneHundredAndEighty = disdipEqualSeventy.getOneHundredAndEighty();
+//                    disdipEqualSeventy.setOneHundredAndEighty(oneHundredAndEighty++);
+//                }
+//            }
+//
+//            DISDIPCountParam disdipEqualEighty = new DISDIPCountParam();
+//
+//            for (DISDIPVO disdipvo : equalEightyFiveDISDIP) {
+//                //获取当前剩余电压名称,不为空就进行添加
+//                if (Objects.isNull(disdipEqualEighty.getName())) {
+//                    disdipEqualEighty.setName(disdipvo.getName());
+//                }
+//
+//                //如果参数不等于0对对象中的参数进行++
+//                if (!"0".equals(disdipvo.getTwentyMs())) {
+//                    int twenty = disdipEqualEighty.getTwenty();
+//                    disdipEqualEighty.setTwenty(twenty++);
+//                }
+//                if (!"0".equals(disdipvo.getOneHundredMs())) {
+//                    int oneHundredMS = disdipEqualEighty.getOneHundredMS();
+//                    disdipEqualEighty.setOneHundredMS(oneHundredMS++);
+//                }
+//                if (!"0".equals(disdipvo.getFiveHundredMs())) {
+//                    int fiveHundredMS = disdipEqualEighty.getFiveHundredMS();
+//                    disdipEqualEighty.setOneHundredMS(fiveHundredMS++);
+//                }
+//                if (!"0".equals(disdipvo.getOneS())) {
+//                    int one = disdipEqualEighty.getOne();
+//                    disdipEqualEighty.setOne(one++);
+//                }
+//                if (!"0".equals(disdipvo.getThreeS())) {
+//                    int three = disdipEqualEighty.getThree();
+//                    disdipEqualEighty.setOne(three++);
+//                }
+//                if (!"0".equals(disdipvo.getTwentyS())) {
+//                    int twenty = disdipEqualEighty.getTwenty();
+//                    disdipEqualEighty.setTwenty(twenty++);
+//                }
+//                if (!"0".equals(disdipvo.getSixtyS())) {
+//                    int sixty = disdipEqualEighty.getSixty();
+//                    disdipEqualEighty.setSixty(sixty++);
+//                }
+//                if (!"0".equals(disdipvo.getOneEightyS())) {
+//                    int oneHundredAndEighty = disdipEqualEighty.getOneHundredAndEighty();
+//                    disdipEqualEighty.setOneHundredAndEighty(oneHundredAndEighty++);
+//                }
+//            }
+//            DISDIPCountParam disdipEqualNinety = new DISDIPCountParam();
+//
+//            for (DISDIPVO disdipvo : equalNinetyDISDIP) {
+//                //获取当前剩余电压名称,不为空就进行添加
+//                if (Objects.isNull(disdipEqualNinety.getName())) {
+//                    disdipEqualNinety.setName(disdipvo.getName());
+//                }
+//
+//                //如果参数不等于0对对象中的参数进行++
+//                if (!"0".equals(disdipvo.getTwentyMs())) {
+//                    int twenty = disdipEqualNinety.getTwenty();
+//                    disdipEqualNinety.setTwenty(twenty++);
+//                }
+//                if (!"0".equals(disdipvo.getOneHundredMs())) {
+//                    int oneHundredMS = disdipEqualNinety.getOneHundredMS();
+//                    disdipEqualNinety.setOneHundredMS(oneHundredMS++);
+//                }
+//                if (!"0".equals(disdipvo.getFiveHundredMs())) {
+//                    int fiveHundredMS = disdipEqualNinety.getFiveHundredMS();
+//                    disdipEqualNinety.setOneHundredMS(fiveHundredMS++);
+//                }
+//                if (!"0".equals(disdipvo.getOneS())) {
+//                    int one = disdipEqualNinety.getOne();
+//                    disdipEqualNinety.setOne(one++);
+//                }
+//                if (!"0".equals(disdipvo.getThreeS())) {
+//                    int three = disdipEqualNinety.getThree();
+//                    disdipEqualNinety.setOne(three++);
+//                }
+//                if (!"0".equals(disdipvo.getTwentyS())) {
+//                    int twenty = disdipEqualNinety.getTwenty();
+//                    disdipEqualNinety.setTwenty(twenty++);
+//                }
+//                if (!"0".equals(disdipvo.getSixtyS())) {
+//                    int sixty = disdipEqualNinety.getSixty();
+//                    disdipEqualNinety.setSixty(sixty++);
+//                }
+//                if (!"0".equals(disdipvo.getOneEightyS())) {
+//                    int oneHundredAndEighty = disdipEqualNinety.getOneHundredAndEighty();
+//                    disdipEqualNinety.setOneHundredAndEighty(oneHundredAndEighty++);
+//                }
+//            }
+//
+//            /**
+//             * ======================第二张表结束==============================
+//             */
+//
+//            //创建计数对象
+//            IEC28CountParam iec28CountLessOne = new IEC28CountParam();
+//
+//            for (IEC28VO iec28VO : lessOneIEC28) {
+//                //获取当前剩余电压名称,不为空就进行添加
+//                if (Objects.isNull(iec28CountLessOne.getName())) {
+//                    iec28CountLessOne.setName(iec28VO.getName());
+//                }
+//                //如果参数不等于0对对象中的参数进行++
+//                if (!"0".equals(iec28VO.getQ())) {
+//                    int zeroZeroTwoToZeroOne = iec28CountLessOne.getZeroZeroTwoToZeroOne();
+//                    iec28CountLessOne.setZeroZeroTwoToZeroOne(zeroZeroTwoToZeroOne++);
+//                }
+//                if (!"0".equals(iec28VO.getW())) {
+//                    int zeroOneToZeroTwentyFive = iec28CountLessOne.getZeroOneToZeroTwentyFive();
+//                    iec28CountLessOne.setZeroOneToZeroTwentyFive(zeroOneToZeroTwentyFive++);
+//                }
+//                if (!"0".equals(iec28VO.getE())) {
+//                    int zeroTwentyFiveToZeroFive = iec28CountLessOne.getZeroTwentyFiveToZeroFive();
+//                    iec28CountLessOne.setZeroTwentyFiveToZeroFive(zeroTwentyFiveToZeroFive++);
+//                }
+//                if (!"0".equals(iec28VO.getR())) {
+//                    int zeroFiveToOne = iec28CountLessOne.getZeroFiveToOne();
+//                    iec28CountLessOne.setZeroFiveToOne(zeroFiveToOne++);
+//                }
+//                if (!"0".equals(iec28VO.getT())) {
+//                    int oneToThree = iec28CountLessOne.getOneToThree();
+//                    iec28CountLessOne.setOneToThree(oneToThree++);
+//                }
+//                if (!"0".equals(iec28VO.getY())) {
+//                    int threeToTwenty = iec28CountLessOne.getThreeToTwenty();
+//                    iec28CountLessOne.setThreeToTwenty(threeToTwenty++);
+//                }
+//                if (!"0".equals(iec28VO.getU())) {
+//                    int twentyToSixty = iec28CountLessOne.getTwentyToSixty();
+//                    iec28CountLessOne.setTwentyToSixty(twentyToSixty++);
+//                }
+//                if (!"0".equals(iec28VO.getI())) {
+//                    int sixtyToOneHundredAndEighty = iec28CountLessOne.getSixtyToOneHundredAndEighty();
+//                    iec28CountLessOne.setSixtyToOneHundredAndEighty(sixtyToOneHundredAndEighty++);
+//                }
+//            }
+//
+//
+//            //创建计数对象
+//            IEC28CountParam iec28CountLessTen = new IEC28CountParam();
+//
+//            for (IEC28VO iec28VO : lessTenIEC28) {
+//                //获取当前剩余电压名称,不为空就进行添加
+//                if (Objects.isNull(iec28CountLessTen.getName())) {
+//                    iec28CountLessTen.setName(iec28VO.getName());
+//                }
+//                //如果参数不等于0对对象中的参数进行++
+//                if (!"0".equals(iec28VO.getQ())) {
+//                    int zeroZeroTwoToZeroOne = iec28CountLessTen.getZeroZeroTwoToZeroOne();
+//                    iec28CountLessTen.setZeroZeroTwoToZeroOne(zeroZeroTwoToZeroOne++);
+//                }
+//                if (!"0".equals(iec28VO.getW())) {
+//                    int zeroOneToZeroTwentyFive = iec28CountLessTen.getZeroOneToZeroTwentyFive();
+//                    iec28CountLessTen.setZeroOneToZeroTwentyFive(zeroOneToZeroTwentyFive++);
+//                }
+//                if (!"0".equals(iec28VO.getE())) {
+//                    int zeroTwentyFiveToZeroFive = iec28CountLessTen.getZeroTwentyFiveToZeroFive();
+//                    iec28CountLessTen.setZeroTwentyFiveToZeroFive(zeroTwentyFiveToZeroFive++);
+//                }
+//                if (!"0".equals(iec28VO.getR())) {
+//                    int zeroFiveToOne = iec28CountLessTen.getZeroFiveToOne();
+//                    iec28CountLessTen.setZeroFiveToOne(zeroFiveToOne++);
+//                }
+//                if (!"0".equals(iec28VO.getT())) {
+//                    int oneToThree = iec28CountLessTen.getOneToThree();
+//                    iec28CountLessTen.setOneToThree(oneToThree++);
+//                }
+//                if (!"0".equals(iec28VO.getY())) {
+//                    int threeToTwenty = iec28CountLessTen.getThreeToTwenty();
+//                    iec28CountLessTen.setThreeToTwenty(threeToTwenty++);
+//                }
+//                if (!"0".equals(iec28VO.getU())) {
+//                    int twentyToSixty = iec28CountLessTen.getTwentyToSixty();
+//                    iec28CountLessTen.setTwentyToSixty(twentyToSixty++);
+//                }
+//                if (!"0".equals(iec28VO.getI())) {
+//                    int sixtyToOneHundredAndEighty = iec28CountLessTen.getSixtyToOneHundredAndEighty();
+//                    iec28CountLessTen.setSixtyToOneHundredAndEighty(sixtyToOneHundredAndEighty++);
+//                }
+//            }
+//
+//
+//            //创建计数对象
+//            IEC28CountParam iec28CountLessTwenty = new IEC28CountParam();
+//
+//            for (IEC28VO iec28VO : lessTwentyIEC28) {
+//                //获取当前剩余电压名称,不为空就进行添加
+//                if (Objects.isNull(iec28CountLessTwenty.getName())) {
+//                    iec28CountLessTwenty.setName(iec28VO.getName());
+//                }
+//                //如果参数不等于0对对象中的参数进行++
+//                if (!"0".equals(iec28VO.getQ())) {
+//                    int zeroZeroTwoToZeroOne = iec28CountLessTwenty.getZeroZeroTwoToZeroOne();
+//                    iec28CountLessTwenty.setZeroZeroTwoToZeroOne(zeroZeroTwoToZeroOne++);
+//                }
+//                if (!"0".equals(iec28VO.getW())) {
+//                    int zeroOneToZeroTwentyFive = iec28CountLessTwenty.getZeroOneToZeroTwentyFive();
+//                    iec28CountLessTwenty.setZeroOneToZeroTwentyFive(zeroOneToZeroTwentyFive++);
+//                }
+//                if (!"0".equals(iec28VO.getE())) {
+//                    int zeroTwentyFiveToZeroFive = iec28CountLessTwenty.getZeroTwentyFiveToZeroFive();
+//                    iec28CountLessTwenty.setZeroTwentyFiveToZeroFive(zeroTwentyFiveToZeroFive++);
+//                }
+//                if (!"0".equals(iec28VO.getR())) {
+//                    int zeroFiveToOne = iec28CountLessTwenty.getZeroFiveToOne();
+//                    iec28CountLessTwenty.setZeroFiveToOne(zeroFiveToOne++);
+//                }
+//                if (!"0".equals(iec28VO.getT())) {
+//                    int oneToThree = iec28CountLessTwenty.getOneToThree();
+//                    iec28CountLessTwenty.setOneToThree(oneToThree++);
+//                }
+//                if (!"0".equals(iec28VO.getY())) {
+//                    int threeToTwenty = iec28CountLessTwenty.getThreeToTwenty();
+//                    iec28CountLessTwenty.setThreeToTwenty(threeToTwenty++);
+//                }
+//                if (!"0".equals(iec28VO.getU())) {
+//                    int twentyToSixty = iec28CountLessTwenty.getTwentyToSixty();
+//                    iec28CountLessTwenty.setTwentyToSixty(twentyToSixty++);
+//                }
+//                if (!"0".equals(iec28VO.getI())) {
+//                    int sixtyToOneHundredAndEighty = iec28CountLessTwenty.getSixtyToOneHundredAndEighty();
+//                    iec28CountLessTwenty.setSixtyToOneHundredAndEighty(sixtyToOneHundredAndEighty++);
+//                }
+//            }
+//
+//
+//            //创建计数对象
+//            IEC28CountParam iec28CountLessThirty = new IEC28CountParam();
+//
+//            for (IEC28VO iec28VO : lessThirtyIEC28) {
+//                //获取当前剩余电压名称,不为空就进行添加
+//                if (Objects.isNull(iec28CountLessThirty.getName())) {
+//                    iec28CountLessThirty.setName(iec28VO.getName());
+//                }
+//                //如果参数不等于0对对象中的参数进行++
+//                if (!"0".equals(iec28VO.getQ())) {
+//                    int zeroZeroTwoToZeroOne = iec28CountLessThirty.getZeroZeroTwoToZeroOne();
+//                    iec28CountLessThirty.setZeroZeroTwoToZeroOne(zeroZeroTwoToZeroOne++);
+//                }
+//                if (!"0".equals(iec28VO.getW())) {
+//                    int zeroOneToZeroTwentyFive = iec28CountLessThirty.getZeroOneToZeroTwentyFive();
+//                    iec28CountLessThirty.setZeroOneToZeroTwentyFive(zeroOneToZeroTwentyFive++);
+//                }
+//                if (!"0".equals(iec28VO.getE())) {
+//                    int zeroTwentyFiveToZeroFive = iec28CountLessThirty.getZeroTwentyFiveToZeroFive();
+//                    iec28CountLessThirty.setZeroTwentyFiveToZeroFive(zeroTwentyFiveToZeroFive++);
+//                }
+//                if (!"0".equals(iec28VO.getR())) {
+//                    int zeroFiveToOne = iec28CountLessThirty.getZeroFiveToOne();
+//                    iec28CountLessThirty.setZeroFiveToOne(zeroFiveToOne++);
+//                }
+//                if (!"0".equals(iec28VO.getT())) {
+//                    int oneToThree = iec28CountLessThirty.getOneToThree();
+//                    iec28CountLessThirty.setOneToThree(oneToThree++);
+//                }
+//                if (!"0".equals(iec28VO.getY())) {
+//                    int threeToTwenty = iec28CountLessThirty.getThreeToTwenty();
+//                    iec28CountLessThirty.setThreeToTwenty(threeToTwenty++);
+//                }
+//                if (!"0".equals(iec28VO.getU())) {
+//                    int twentyToSixty = iec28CountLessThirty.getTwentyToSixty();
+//                    iec28CountLessThirty.setTwentyToSixty(twentyToSixty++);
+//                }
+//                if (!"0".equals(iec28VO.getI())) {
+//                    int sixtyToOneHundredAndEighty = iec28CountLessThirty.getSixtyToOneHundredAndEighty();
+//                    iec28CountLessThirty.setSixtyToOneHundredAndEighty(sixtyToOneHundredAndEighty++);
+//                }
+//            }
+//
+//
+//            //创建计数对象
+//            IEC28CountParam iec28CountLessForty = new IEC28CountParam();
+//
+//            for (IEC28VO iec28VO : lessFortyIEC28) {
+//                //获取当前剩余电压名称,不为空就进行添加
+//                if (Objects.isNull(iec28CountLessForty.getName())) {
+//                    iec28CountLessForty.setName(iec28VO.getName());
+//                }
+//                //如果参数不等于0对对象中的参数进行++
+//                if (!"0".equals(iec28VO.getQ())) {
+//                    int zeroZeroTwoToZeroOne = iec28CountLessForty.getZeroZeroTwoToZeroOne();
+//                    iec28CountLessForty.setZeroZeroTwoToZeroOne(zeroZeroTwoToZeroOne++);
+//                }
+//                if (!"0".equals(iec28VO.getW())) {
+//                    int zeroOneToZeroTwentyFive = iec28CountLessForty.getZeroOneToZeroTwentyFive();
+//                    iec28CountLessForty.setZeroOneToZeroTwentyFive(zeroOneToZeroTwentyFive++);
+//                }
+//                if (!"0".equals(iec28VO.getE())) {
+//                    int zeroTwentyFiveToZeroFive = iec28CountLessForty.getZeroTwentyFiveToZeroFive();
+//                    iec28CountLessForty.setZeroTwentyFiveToZeroFive(zeroTwentyFiveToZeroFive++);
+//                }
+//                if (!"0".equals(iec28VO.getR())) {
+//                    int zeroFiveToOne = iec28CountLessForty.getZeroFiveToOne();
+//                    iec28CountLessForty.setZeroFiveToOne(zeroFiveToOne++);
+//                }
+//                if (!"0".equals(iec28VO.getT())) {
+//                    int oneToThree = iec28CountLessForty.getOneToThree();
+//                    iec28CountLessForty.setOneToThree(oneToThree++);
+//                }
+//                if (!"0".equals(iec28VO.getY())) {
+//                    int threeToTwenty = iec28CountLessForty.getThreeToTwenty();
+//                    iec28CountLessForty.setThreeToTwenty(threeToTwenty++);
+//                }
+//                if (!"0".equals(iec28VO.getU())) {
+//                    int twentyToSixty = iec28CountLessForty.getTwentyToSixty();
+//                    iec28CountLessForty.setTwentyToSixty(twentyToSixty++);
+//                }
+//                if (!"0".equals(iec28VO.getI())) {
+//                    int sixtyToOneHundredAndEighty = iec28CountLessForty.getSixtyToOneHundredAndEighty();
+//                    iec28CountLessForty.setSixtyToOneHundredAndEighty(sixtyToOneHundredAndEighty++);
+//                }
+//            }
+//
+//
+//            //创建计数对象
+//            IEC28CountParam iec28CountLessFifty = new IEC28CountParam();
+//
+//            for (IEC28VO iec28VO : lessFiftyIEC28) {
+//                //获取当前剩余电压名称,不为空就进行添加
+//                if (Objects.isNull(iec28CountLessFifty.getName())) {
+//                    iec28CountLessFifty.setName(iec28VO.getName());
+//                }
+//                //如果参数不等于0对对象中的参数进行++
+//                if (!"0".equals(iec28VO.getQ())) {
+//                    int zeroZeroTwoToZeroOne = iec28CountLessFifty.getZeroZeroTwoToZeroOne();
+//                    iec28CountLessFifty.setZeroZeroTwoToZeroOne(zeroZeroTwoToZeroOne++);
+//                }
+//                if (!"0".equals(iec28VO.getW())) {
+//                    int zeroOneToZeroTwentyFive = iec28CountLessFifty.getZeroOneToZeroTwentyFive();
+//                    iec28CountLessFifty.setZeroOneToZeroTwentyFive(zeroOneToZeroTwentyFive++);
+//                }
+//                if (!"0".equals(iec28VO.getE())) {
+//                    int zeroTwentyFiveToZeroFive = iec28CountLessFifty.getZeroTwentyFiveToZeroFive();
+//                    iec28CountLessFifty.setZeroTwentyFiveToZeroFive(zeroTwentyFiveToZeroFive++);
+//                }
+//                if (!"0".equals(iec28VO.getR())) {
+//                    int zeroFiveToOne = iec28CountLessFifty.getZeroFiveToOne();
+//                    iec28CountLessFifty.setZeroFiveToOne(zeroFiveToOne++);
+//                }
+//                if (!"0".equals(iec28VO.getT())) {
+//                    int oneToThree = iec28CountLessFifty.getOneToThree();
+//                    iec28CountLessFifty.setOneToThree(oneToThree++);
+//                }
+//                if (!"0".equals(iec28VO.getY())) {
+//                    int threeToTwenty = iec28CountLessFifty.getThreeToTwenty();
+//                    iec28CountLessFifty.setThreeToTwenty(threeToTwenty++);
+//                }
+//                if (!"0".equals(iec28VO.getU())) {
+//                    int twentyToSixty = iec28CountLessFifty.getTwentyToSixty();
+//                    iec28CountLessFifty.setTwentyToSixty(twentyToSixty++);
+//                }
+//                if (!"0".equals(iec28VO.getI())) {
+//                    int sixtyToOneHundredAndEighty = iec28CountLessFifty.getSixtyToOneHundredAndEighty();
+//                    iec28CountLessFifty.setSixtyToOneHundredAndEighty(sixtyToOneHundredAndEighty++);
+//                }
+//            }
+//
+//
+//            //创建计数对象
+//            IEC28CountParam iec28CountLessSixty = new IEC28CountParam();
+//
+//            for (IEC28VO iec28VO : lessSixtyIEC28) {
+//                //获取当前剩余电压名称,不为空就进行添加
+//                if (Objects.isNull(iec28CountLessSixty.getName())) {
+//                    iec28CountLessSixty.setName(iec28VO.getName());
+//                }
+//                //如果参数不等于0对对象中的参数进行++
+//                if (!"0".equals(iec28VO.getQ())) {
+//                    int zeroZeroTwoToZeroOne = iec28CountLessSixty.getZeroZeroTwoToZeroOne();
+//                    iec28CountLessSixty.setZeroZeroTwoToZeroOne(zeroZeroTwoToZeroOne++);
+//                }
+//                if (!"0".equals(iec28VO.getW())) {
+//                    int zeroOneToZeroTwentyFive = iec28CountLessSixty.getZeroOneToZeroTwentyFive();
+//                    iec28CountLessSixty.setZeroOneToZeroTwentyFive(zeroOneToZeroTwentyFive++);
+//                }
+//                if (!"0".equals(iec28VO.getE())) {
+//                    int zeroTwentyFiveToZeroFive = iec28CountLessSixty.getZeroTwentyFiveToZeroFive();
+//                    iec28CountLessSixty.setZeroTwentyFiveToZeroFive(zeroTwentyFiveToZeroFive++);
+//                }
+//                if (!"0".equals(iec28VO.getR())) {
+//                    int zeroFiveToOne = iec28CountLessSixty.getZeroFiveToOne();
+//                    iec28CountLessSixty.setZeroFiveToOne(zeroFiveToOne++);
+//                }
+//                if (!"0".equals(iec28VO.getT())) {
+//                    int oneToThree = iec28CountLessSixty.getOneToThree();
+//                    iec28CountLessSixty.setOneToThree(oneToThree++);
+//                }
+//                if (!"0".equals(iec28VO.getY())) {
+//                    int threeToTwenty = iec28CountLessSixty.getThreeToTwenty();
+//                    iec28CountLessSixty.setThreeToTwenty(threeToTwenty++);
+//                }
+//                if (!"0".equals(iec28VO.getU())) {
+//                    int twentyToSixty = iec28CountLessSixty.getTwentyToSixty();
+//                    iec28CountLessSixty.setTwentyToSixty(twentyToSixty++);
+//                }
+//                if (!"0".equals(iec28VO.getI())) {
+//                    int sixtyToOneHundredAndEighty = iec28CountLessSixty.getSixtyToOneHundredAndEighty();
+//                    iec28CountLessSixty.setSixtyToOneHundredAndEighty(sixtyToOneHundredAndEighty++);
+//                }
+//            }
+//
+//
+//            //创建计数对象
+//            IEC28CountParam iec28CountLessSeventy = new IEC28CountParam();
+//
+//            for (IEC28VO iec28VO : lessSeventyIEC28) {
+//                //获取当前剩余电压名称,不为空就进行添加
+//                if (Objects.isNull(iec28CountLessSeventy.getName())) {
+//                    iec28CountLessSeventy.setName(iec28VO.getName());
+//                }
+//                //如果参数不等于0对对象中的参数进行++
+//                if (!"0".equals(iec28VO.getQ())) {
+//                    int zeroZeroTwoToZeroOne = iec28CountLessSeventy.getZeroZeroTwoToZeroOne();
+//                    iec28CountLessSeventy.setZeroZeroTwoToZeroOne(zeroZeroTwoToZeroOne++);
+//                }
+//                if (!"0".equals(iec28VO.getW())) {
+//                    int zeroOneToZeroTwentyFive = iec28CountLessSeventy.getZeroOneToZeroTwentyFive();
+//                    iec28CountLessSeventy.setZeroOneToZeroTwentyFive(zeroOneToZeroTwentyFive++);
+//                }
+//                if (!"0".equals(iec28VO.getE())) {
+//                    int zeroTwentyFiveToZeroFive = iec28CountLessSeventy.getZeroTwentyFiveToZeroFive();
+//                    iec28CountLessSeventy.setZeroTwentyFiveToZeroFive(zeroTwentyFiveToZeroFive++);
+//                }
+//                if (!"0".equals(iec28VO.getR())) {
+//                    int zeroFiveToOne = iec28CountLessSeventy.getZeroFiveToOne();
+//                    iec28CountLessSeventy.setZeroFiveToOne(zeroFiveToOne++);
+//                }
+//                if (!"0".equals(iec28VO.getT())) {
+//                    int oneToThree = iec28CountLessSeventy.getOneToThree();
+//                    iec28CountLessSeventy.setOneToThree(oneToThree++);
+//                }
+//                if (!"0".equals(iec28VO.getY())) {
+//                    int threeToTwenty = iec28CountLessSeventy.getThreeToTwenty();
+//                    iec28CountLessSeventy.setThreeToTwenty(threeToTwenty++);
+//                }
+//                if (!"0".equals(iec28VO.getU())) {
+//                    int twentyToSixty = iec28CountLessSeventy.getTwentyToSixty();
+//                    iec28CountLessSeventy.setTwentyToSixty(twentyToSixty++);
+//                }
+//                if (!"0".equals(iec28VO.getI())) {
+//                    int sixtyToOneHundredAndEighty = iec28CountLessSeventy.getSixtyToOneHundredAndEighty();
+//                    iec28CountLessSeventy.setSixtyToOneHundredAndEighty(sixtyToOneHundredAndEighty++);
+//                }
+//            }
+//
+//
+//            //创建计数对象
+//            IEC28CountParam iec28CountLessEighty = new IEC28CountParam();
+//
+//            for (IEC28VO iec28VO : lessEightyIEC28) {
+//                //获取当前剩余电压名称,不为空就进行添加
+//                if (Objects.isNull(iec28CountLessEighty.getName())) {
+//                    iec28CountLessEighty.setName(iec28VO.getName());
+//                }
+//                //如果参数不等于0对对象中的参数进行++
+//                if (!"0".equals(iec28VO.getQ())) {
+//                    int zeroZeroTwoToZeroOne = iec28CountLessEighty.getZeroZeroTwoToZeroOne();
+//                    iec28CountLessEighty.setZeroZeroTwoToZeroOne(zeroZeroTwoToZeroOne++);
+//                }
+//                if (!"0".equals(iec28VO.getW())) {
+//                    int zeroOneToZeroTwentyFive = iec28CountLessEighty.getZeroOneToZeroTwentyFive();
+//                    iec28CountLessEighty.setZeroOneToZeroTwentyFive(zeroOneToZeroTwentyFive++);
+//                }
+//                if (!"0".equals(iec28VO.getE())) {
+//                    int zeroTwentyFiveToZeroFive = iec28CountLessEighty.getZeroTwentyFiveToZeroFive();
+//                    iec28CountLessEighty.setZeroTwentyFiveToZeroFive(zeroTwentyFiveToZeroFive++);
+//                }
+//                if (!"0".equals(iec28VO.getR())) {
+//                    int zeroFiveToOne = iec28CountLessEighty.getZeroFiveToOne();
+//                    iec28CountLessEighty.setZeroFiveToOne(zeroFiveToOne++);
+//                }
+//                if (!"0".equals(iec28VO.getT())) {
+//                    int oneToThree = iec28CountLessEighty.getOneToThree();
+//                    iec28CountLessEighty.setOneToThree(oneToThree++);
+//                }
+//                if (!"0".equals(iec28VO.getY())) {
+//                    int threeToTwenty = iec28CountLessEighty.getThreeToTwenty();
+//                    iec28CountLessEighty.setThreeToTwenty(threeToTwenty++);
+//                }
+//                if (!"0".equals(iec28VO.getU())) {
+//                    int twentyToSixty = iec28CountLessEighty.getTwentyToSixty();
+//                    iec28CountLessEighty.setTwentyToSixty(twentyToSixty++);
+//                }
+//                if (!"0".equals(iec28VO.getI())) {
+//                    int sixtyToOneHundredAndEighty = iec28CountLessEighty.getSixtyToOneHundredAndEighty();
+//                    iec28CountLessEighty.setSixtyToOneHundredAndEighty(sixtyToOneHundredAndEighty++);
+//                }
+//            }
+//
+//            //创建计数对象
+//            IEC28CountParam iec28CountLessNinety = new IEC28CountParam();
+//
+//            for (IEC28VO iec28VO : lessNinetyIEC28) {
+//                //获取当前剩余电压名称,不为空就进行添加
+//                if (Objects.isNull(iec28CountLessNinety.getName())) {
+//                    iec28CountLessNinety.setName(iec28VO.getName());
+//                }
+//                //如果参数不等于0对对象中的参数进行++
+//                if (!"0".equals(iec28VO.getQ())) {
+//                    int zeroZeroTwoToZeroOne = iec28CountLessNinety.getZeroZeroTwoToZeroOne();
+//                    iec28CountLessNinety.setZeroZeroTwoToZeroOne(zeroZeroTwoToZeroOne++);
+//                }
+//                if (!"0".equals(iec28VO.getW())) {
+//                    int zeroOneToZeroTwentyFive = iec28CountLessNinety.getZeroOneToZeroTwentyFive();
+//                    iec28CountLessNinety.setZeroOneToZeroTwentyFive(zeroOneToZeroTwentyFive++);
+//                }
+//                if (!"0".equals(iec28VO.getE())) {
+//                    int zeroTwentyFiveToZeroFive = iec28CountLessNinety.getZeroTwentyFiveToZeroFive();
+//                    iec28CountLessNinety.setZeroTwentyFiveToZeroFive(zeroTwentyFiveToZeroFive++);
+//                }
+//                if (!"0".equals(iec28VO.getR())) {
+//                    int zeroFiveToOne = iec28CountLessNinety.getZeroFiveToOne();
+//                    iec28CountLessNinety.setZeroFiveToOne(zeroFiveToOne++);
+//                }
+//                if (!"0".equals(iec28VO.getT())) {
+//                    int oneToThree = iec28CountLessNinety.getOneToThree();
+//                    iec28CountLessNinety.setOneToThree(oneToThree++);
+//                }
+//                if (!"0".equals(iec28VO.getY())) {
+//                    int threeToTwenty = iec28CountLessNinety.getThreeToTwenty();
+//                    iec28CountLessNinety.setThreeToTwenty(threeToTwenty++);
+//                }
+//                if (!"0".equals(iec28VO.getU())) {
+//                    int twentyToSixty = iec28CountLessNinety.getTwentyToSixty();
+//                    iec28CountLessNinety.setTwentyToSixty(twentyToSixty++);
+//                }
+//                if (!"0".equals(iec28VO.getI())) {
+//                    int sixtyToOneHundredAndEighty = iec28CountLessNinety.getSixtyToOneHundredAndEighty();
+//                    iec28CountLessNinety.setSixtyToOneHundredAndEighty(sixtyToOneHundredAndEighty++);
+//                }
+//            }
+//
+//            //创建计数对象
+//            IEC28CountParam iec28CountLessHundredTwenty = new IEC28CountParam();
+//
+//            for (IEC28VO iec28VO : lessHundredTwentyIEC28) {
+//                //获取当前剩余电压名称,不为空就进行添加
+//                if (Objects.isNull(iec28CountLessHundredTwenty.getName())) {
+//                    iec28CountLessHundredTwenty.setName(iec28VO.getName());
+//                }
+//                //如果参数不等于0对对象中的参数进行++
+//                if (!"0".equals(iec28VO.getQ())) {
+//                    int zeroZeroTwoToZeroOne = iec28CountLessHundredTwenty.getZeroZeroTwoToZeroOne();
+//                    iec28CountLessHundredTwenty.setZeroZeroTwoToZeroOne(zeroZeroTwoToZeroOne++);
+//                }
+//                if (!"0".equals(iec28VO.getW())) {
+//                    int zeroOneToZeroTwentyFive = iec28CountLessHundredTwenty.getZeroOneToZeroTwentyFive();
+//                    iec28CountLessHundredTwenty.setZeroOneToZeroTwentyFive(zeroOneToZeroTwentyFive++);
+//                }
+//                if (!"0".equals(iec28VO.getE())) {
+//                    int zeroTwentyFiveToZeroFive = iec28CountLessHundredTwenty.getZeroTwentyFiveToZeroFive();
+//                    iec28CountLessHundredTwenty.setZeroTwentyFiveToZeroFive(zeroTwentyFiveToZeroFive++);
+//                }
+//                if (!"0".equals(iec28VO.getR())) {
+//                    int zeroFiveToOne = iec28CountLessHundredTwenty.getZeroFiveToOne();
+//                    iec28CountLessHundredTwenty.setZeroFiveToOne(zeroFiveToOne++);
+//                }
+//                if (!"0".equals(iec28VO.getT())) {
+//                    int oneToThree = iec28CountLessHundredTwenty.getOneToThree();
+//                    iec28CountLessHundredTwenty.setOneToThree(oneToThree++);
+//                }
+//                if (!"0".equals(iec28VO.getY())) {
+//                    int threeToTwenty = iec28CountLessHundredTwenty.getThreeToTwenty();
+//                    iec28CountLessHundredTwenty.setThreeToTwenty(threeToTwenty++);
+//                }
+//                if (!"0".equals(iec28VO.getU())) {
+//                    int twentyToSixty = iec28CountLessHundredTwenty.getTwentyToSixty();
+//                    iec28CountLessHundredTwenty.setTwentyToSixty(twentyToSixty++);
+//                }
+//                if (!"0".equals(iec28VO.getI())) {
+//                    int sixtyToOneHundredAndEighty = iec28CountLessHundredTwenty.getSixtyToOneHundredAndEighty();
+//                    iec28CountLessHundredTwenty.setSixtyToOneHundredAndEighty(sixtyToOneHundredAndEighty++);
+//                }
+//            }
+//
+//
+//            //创建计数对象
+//            IEC28CountParam iec28CountLessHundredThirty = new IEC28CountParam();
+//
+//            for (IEC28VO iec28VO : lessHundredThirtyIEC28) {
+//                //获取当前剩余电压名称,不为空就进行添加
+//                if (Objects.isNull(iec28CountLessHundredThirty.getName())) {
+//                    iec28CountLessHundredThirty.setName(iec28VO.getName());
+//                }
+//                //如果参数不等于0对对象中的参数进行++
+//                if (!"0".equals(iec28VO.getQ())) {
+//                    int zeroZeroTwoToZeroOne = iec28CountLessHundredThirty.getZeroZeroTwoToZeroOne();
+//                    iec28CountLessHundredThirty.setZeroZeroTwoToZeroOne(zeroZeroTwoToZeroOne++);
+//                }
+//                if (!"0".equals(iec28VO.getW())) {
+//                    int zeroOneToZeroTwentyFive = iec28CountLessHundredThirty.getZeroOneToZeroTwentyFive();
+//                    iec28CountLessHundredThirty.setZeroOneToZeroTwentyFive(zeroOneToZeroTwentyFive++);
+//                }
+//                if (!"0".equals(iec28VO.getE())) {
+//                    int zeroTwentyFiveToZeroFive = iec28CountLessHundredThirty.getZeroTwentyFiveToZeroFive();
+//                    iec28CountLessHundredThirty.setZeroTwentyFiveToZeroFive(zeroTwentyFiveToZeroFive++);
+//                }
+//                if (!"0".equals(iec28VO.getR())) {
+//                    int zeroFiveToOne = iec28CountLessHundredThirty.getZeroFiveToOne();
+//                    iec28CountLessHundredThirty.setZeroFiveToOne(zeroFiveToOne++);
+//                }
+//                if (!"0".equals(iec28VO.getT())) {
+//                    int oneToThree = iec28CountLessHundredThirty.getOneToThree();
+//                    iec28CountLessHundredThirty.setOneToThree(oneToThree++);
+//                }
+//                if (!"0".equals(iec28VO.getY())) {
+//                    int threeToTwenty = iec28CountLessHundredThirty.getThreeToTwenty();
+//                    iec28CountLessHundredThirty.setThreeToTwenty(threeToTwenty++);
+//                }
+//                if (!"0".equals(iec28VO.getU())) {
+//                    int twentyToSixty = iec28CountLessHundredThirty.getTwentyToSixty();
+//                    iec28CountLessHundredThirty.setTwentyToSixty(twentyToSixty++);
+//                }
+//                if (!"0".equals(iec28VO.getI())) {
+//                    int sixtyToOneHundredAndEighty = iec28CountLessHundredThirty.getSixtyToOneHundredAndEighty();
+//                    iec28CountLessHundredThirty.setSixtyToOneHundredAndEighty(sixtyToOneHundredAndEighty++);
+//                }
+//            }
+//
+//            //创建计数对象
+//            IEC28CountParam iec28CountLessHundredForty = new IEC28CountParam();
+//
+//            for (IEC28VO iec28VO : lessHundredFortyIEC28) {
+//                //获取当前剩余电压名称,不为空就进行添加
+//                if (Objects.isNull(iec28CountLessHundredForty.getName())) {
+//                    iec28CountLessHundredForty.setName(iec28VO.getName());
+//                }
+//                //如果参数不等于0对对象中的参数进行++
+//                if (!"0".equals(iec28VO.getQ())) {
+//                    int zeroZeroTwoToZeroOne = iec28CountLessHundredForty.getZeroZeroTwoToZeroOne();
+//                    iec28CountLessHundredForty.setZeroZeroTwoToZeroOne(zeroZeroTwoToZeroOne++);
+//                }
+//                if (!"0".equals(iec28VO.getW())) {
+//                    int zeroOneToZeroTwentyFive = iec28CountLessHundredForty.getZeroOneToZeroTwentyFive();
+//                    iec28CountLessHundredForty.setZeroOneToZeroTwentyFive(zeroOneToZeroTwentyFive++);
+//                }
+//                if (!"0".equals(iec28VO.getE())) {
+//                    int zeroTwentyFiveToZeroFive = iec28CountLessHundredForty.getZeroTwentyFiveToZeroFive();
+//                    iec28CountLessHundredForty.setZeroTwentyFiveToZeroFive(zeroTwentyFiveToZeroFive++);
+//                }
+//                if (!"0".equals(iec28VO.getR())) {
+//                    int zeroFiveToOne = iec28CountLessHundredForty.getZeroFiveToOne();
+//                    iec28CountLessHundredForty.setZeroFiveToOne(zeroFiveToOne++);
+//                }
+//                if (!"0".equals(iec28VO.getT())) {
+//                    int oneToThree = iec28CountLessHundredForty.getOneToThree();
+//                    iec28CountLessHundredForty.setOneToThree(oneToThree++);
+//                }
+//                if (!"0".equals(iec28VO.getY())) {
+//                    int threeToTwenty = iec28CountLessHundredForty.getThreeToTwenty();
+//                    iec28CountLessHundredForty.setThreeToTwenty(threeToTwenty++);
+//                }
+//                if (!"0".equals(iec28VO.getU())) {
+//                    int twentyToSixty = iec28CountLessHundredForty.getTwentyToSixty();
+//                    iec28CountLessHundredForty.setTwentyToSixty(twentyToSixty++);
+//                }
+//                if (!"0".equals(iec28VO.getI())) {
+//                    int sixtyToOneHundredAndEighty = iec28CountLessHundredForty.getSixtyToOneHundredAndEighty();
+//                    iec28CountLessHundredForty.setSixtyToOneHundredAndEighty(sixtyToOneHundredAndEighty++);
+//                }
+//            }
+//
+//
+//            //创建计数对象
+//            IEC28CountParam iec28CountLessHundredFifty = new IEC28CountParam();
+//
+//            for (IEC28VO iec28VO : lessHundredFiftyIEC28) {
+//                //获取当前剩余电压名称,不为空就进行添加
+//                if (Objects.isNull(iec28CountLessHundredFifty.getName())) {
+//                    iec28CountLessHundredFifty.setName(iec28VO.getName());
+//                }
+//                //如果参数不等于0对对象中的参数进行++
+//                if (!"0".equals(iec28VO.getQ())) {
+//                    int zeroZeroTwoToZeroOne = iec28CountLessHundredFifty.getZeroZeroTwoToZeroOne();
+//                    iec28CountLessHundredFifty.setZeroZeroTwoToZeroOne(zeroZeroTwoToZeroOne++);
+//                }
+//                if (!"0".equals(iec28VO.getW())) {
+//                    int zeroOneToZeroTwentyFive = iec28CountLessHundredFifty.getZeroOneToZeroTwentyFive();
+//                    iec28CountLessHundredFifty.setZeroOneToZeroTwentyFive(zeroOneToZeroTwentyFive++);
+//                }
+//                if (!"0".equals(iec28VO.getE())) {
+//                    int zeroTwentyFiveToZeroFive = iec28CountLessHundredFifty.getZeroTwentyFiveToZeroFive();
+//                    iec28CountLessHundredFifty.setZeroTwentyFiveToZeroFive(zeroTwentyFiveToZeroFive++);
+//                }
+//                if (!"0".equals(iec28VO.getR())) {
+//                    int zeroFiveToOne = iec28CountLessHundredFifty.getZeroFiveToOne();
+//                    iec28CountLessHundredFifty.setZeroFiveToOne(zeroFiveToOne++);
+//                }
+//                if (!"0".equals(iec28VO.getT())) {
+//                    int oneToThree = iec28CountLessHundredFifty.getOneToThree();
+//                    iec28CountLessHundredFifty.setOneToThree(oneToThree++);
+//                }
+//                if (!"0".equals(iec28VO.getY())) {
+//                    int threeToTwenty = iec28CountLessHundredFifty.getThreeToTwenty();
+//                    iec28CountLessHundredFifty.setThreeToTwenty(threeToTwenty++);
+//                }
+//                if (!"0".equals(iec28VO.getU())) {
+//                    int twentyToSixty = iec28CountLessHundredFifty.getTwentyToSixty();
+//                    iec28CountLessHundredFifty.setTwentyToSixty(twentyToSixty++);
+//                }
+//                if (!"0".equals(iec28VO.getI())) {
+//                    int sixtyToOneHundredAndEighty = iec28CountLessHundredFifty.getSixtyToOneHundredAndEighty();
+//                    iec28CountLessHundredFifty.setSixtyToOneHundredAndEighty(sixtyToOneHundredAndEighty++);
+//                }
+//            }
+//
+//
+//            //创建计数对象
+//            IEC28CountParam iec28CountLessHundredSixty = new IEC28CountParam();
+//
+//            for (IEC28VO iec28VO : lessHundredSixtyIEC28) {
+//                //获取当前剩余电压名称,不为空就进行添加
+//                if (Objects.isNull(iec28CountLessHundredSixty.getName())) {
+//                    iec28CountLessHundredSixty.setName(iec28VO.getName());
+//                }
+//                //如果参数不等于0对对象中的参数进行++
+//                if (!"0".equals(iec28VO.getQ())) {
+//                    int zeroZeroTwoToZeroOne = iec28CountLessHundredSixty.getZeroZeroTwoToZeroOne();
+//                    iec28CountLessHundredSixty.setZeroZeroTwoToZeroOne(zeroZeroTwoToZeroOne++);
+//                }
+//                if (!"0".equals(iec28VO.getW())) {
+//                    int zeroOneToZeroTwentyFive = iec28CountLessHundredSixty.getZeroOneToZeroTwentyFive();
+//                    iec28CountLessHundredSixty.setZeroOneToZeroTwentyFive(zeroOneToZeroTwentyFive++);
+//                }
+//                if (!"0".equals(iec28VO.getE())) {
+//                    int zeroTwentyFiveToZeroFive = iec28CountLessHundredSixty.getZeroTwentyFiveToZeroFive();
+//                    iec28CountLessHundredSixty.setZeroTwentyFiveToZeroFive(zeroTwentyFiveToZeroFive++);
+//                }
+//                if (!"0".equals(iec28VO.getR())) {
+//                    int zeroFiveToOne = iec28CountLessHundredSixty.getZeroFiveToOne();
+//                    iec28CountLessHundredSixty.setZeroFiveToOne(zeroFiveToOne++);
+//                }
+//                if (!"0".equals(iec28VO.getT())) {
+//                    int oneToThree = iec28CountLessHundredSixty.getOneToThree();
+//                    iec28CountLessHundredSixty.setOneToThree(oneToThree++);
+//                }
+//                if (!"0".equals(iec28VO.getY())) {
+//                    int threeToTwenty = iec28CountLessHundredSixty.getThreeToTwenty();
+//                    iec28CountLessHundredSixty.setThreeToTwenty(threeToTwenty++);
+//                }
+//                if (!"0".equals(iec28VO.getU())) {
+//                    int twentyToSixty = iec28CountLessHundredSixty.getTwentyToSixty();
+//                    iec28CountLessHundredSixty.setTwentyToSixty(twentyToSixty++);
+//                }
+//                if (!"0".equals(iec28VO.getI())) {
+//                    int sixtyToOneHundredAndEighty = iec28CountLessHundredSixty.getSixtyToOneHundredAndEighty();
+//                    iec28CountLessHundredSixty.setSixtyToOneHundredAndEighty(sixtyToOneHundredAndEighty++);
+//                }
+//            }
+//
+//
+//            //创建计数对象
+//            IEC28CountParam iec28CountLessHundredSeventy = new IEC28CountParam();
+//
+//            for (IEC28VO iec28VO : lessHundredSeventyIEC28) {
+//                //获取当前剩余电压名称,不为空就进行添加
+//                if (Objects.isNull(iec28CountLessHundredSeventy.getName())) {
+//                    iec28CountLessHundredSeventy.setName(iec28VO.getName());
+//                }
+//                //如果参数不等于0对对象中的参数进行++
+//                if (!"0".equals(iec28VO.getQ())) {
+//                    int zeroZeroTwoToZeroOne = iec28CountLessHundredSeventy.getZeroZeroTwoToZeroOne();
+//                    iec28CountLessHundredSeventy.setZeroZeroTwoToZeroOne(zeroZeroTwoToZeroOne++);
+//                }
+//                if (!"0".equals(iec28VO.getW())) {
+//                    int zeroOneToZeroTwentyFive = iec28CountLessHundredSeventy.getZeroOneToZeroTwentyFive();
+//                    iec28CountLessHundredSeventy.setZeroOneToZeroTwentyFive(zeroOneToZeroTwentyFive++);
+//                }
+//                if (!"0".equals(iec28VO.getE())) {
+//                    int zeroTwentyFiveToZeroFive = iec28CountLessHundredSeventy.getZeroTwentyFiveToZeroFive();
+//                    iec28CountLessHundredSeventy.setZeroTwentyFiveToZeroFive(zeroTwentyFiveToZeroFive++);
+//                }
+//                if (!"0".equals(iec28VO.getR())) {
+//                    int zeroFiveToOne = iec28CountLessHundredSeventy.getZeroFiveToOne();
+//                    iec28CountLessHundredSeventy.setZeroFiveToOne(zeroFiveToOne++);
+//                }
+//                if (!"0".equals(iec28VO.getT())) {
+//                    int oneToThree = iec28CountLessHundredSeventy.getOneToThree();
+//                    iec28CountLessHundredSeventy.setOneToThree(oneToThree++);
+//                }
+//                if (!"0".equals(iec28VO.getY())) {
+//                    int threeToTwenty = iec28CountLessHundredSeventy.getThreeToTwenty();
+//                    iec28CountLessHundredSeventy.setThreeToTwenty(threeToTwenty++);
+//                }
+//                if (!"0".equals(iec28VO.getU())) {
+//                    int twentyToSixty = iec28CountLessHundredSeventy.getTwentyToSixty();
+//                    iec28CountLessHundredSeventy.setTwentyToSixty(twentyToSixty++);
+//                }
+//                if (!"0".equals(iec28VO.getI())) {
+//                    int sixtyToOneHundredAndEighty = iec28CountLessHundredSeventy.getSixtyToOneHundredAndEighty();
+//                    iec28CountLessHundredSeventy.setSixtyToOneHundredAndEighty(sixtyToOneHundredAndEighty++);
+//                }
+//            }
+//
+//
+//            //创建计数对象
+//            IEC28CountParam iec28CountLessHundredEighty = new IEC28CountParam();
+//
+//            for (IEC28VO iec28VO : lessHundredEightyIEC28) {
+//                //获取当前剩余电压名称,不为空就进行添加
+//                if (Objects.isNull(iec28CountLessHundredEighty.getName())) {
+//                    iec28CountLessHundredEighty.setName(iec28VO.getName());
+//                }
+//                //如果参数不等于0对对象中的参数进行++
+//                if (!"0".equals(iec28VO.getQ())) {
+//                    int zeroZeroTwoToZeroOne = iec28CountLessHundredEighty.getZeroZeroTwoToZeroOne();
+//                    iec28CountLessHundredEighty.setZeroZeroTwoToZeroOne(zeroZeroTwoToZeroOne++);
+//                }
+//                if (!"0".equals(iec28VO.getW())) {
+//                    int zeroOneToZeroTwentyFive = iec28CountLessHundredEighty.getZeroOneToZeroTwentyFive();
+//                    iec28CountLessHundredEighty.setZeroOneToZeroTwentyFive(zeroOneToZeroTwentyFive++);
+//                }
+//                if (!"0".equals(iec28VO.getE())) {
+//                    int zeroTwentyFiveToZeroFive = iec28CountLessHundredEighty.getZeroTwentyFiveToZeroFive();
+//                    iec28CountLessHundredEighty.setZeroTwentyFiveToZeroFive(zeroTwentyFiveToZeroFive++);
+//                }
+//                if (!"0".equals(iec28VO.getR())) {
+//                    int zeroFiveToOne = iec28CountLessHundredEighty.getZeroFiveToOne();
+//                    iec28CountLessHundredEighty.setZeroFiveToOne(zeroFiveToOne++);
+//                }
+//                if (!"0".equals(iec28VO.getT())) {
+//                    int oneToThree = iec28CountLessHundredEighty.getOneToThree();
+//                    iec28CountLessHundredEighty.setOneToThree(oneToThree++);
+//                }
+//                if (!"0".equals(iec28VO.getY())) {
+//                    int threeToTwenty = iec28CountLessHundredEighty.getThreeToTwenty();
+//                    iec28CountLessHundredEighty.setThreeToTwenty(threeToTwenty++);
+//                }
+//                if (!"0".equals(iec28VO.getU())) {
+//                    int twentyToSixty = iec28CountLessHundredEighty.getTwentyToSixty();
+//                    iec28CountLessHundredEighty.setTwentyToSixty(twentyToSixty++);
+//                }
+//                if (!"0".equals(iec28VO.getI())) {
+//                    int sixtyToOneHundredAndEighty = iec28CountLessHundredEighty.getSixtyToOneHundredAndEighty();
+//                    iec28CountLessHundredEighty.setSixtyToOneHundredAndEighty(sixtyToOneHundredAndEighty++);
+//                }
+//            }
+//
+//            /**
+//             * =========================第三张表结束===============================
+//             */
+//
+//
+//            //汇总放入集合
+//            List<IEC411CountParam> iec411Result = new ArrayList<>();
+//            iec411Result.add(iec411LessOne);
+//            iec411Result.add(iec411LessForty);
+//            iec411Result.add(iec411LessSeventy);
+//
+//            List<DISDIPCountParam> disdipResult = new ArrayList<>();
+//            disdipResult.add(disdipEqualTen);
+//            disdipResult.add(disdipEqualForty);
+//            disdipResult.add(disdipEqualSeventy);
+//            disdipResult.add(disdipEqualEighty);
+//            disdipResult.add(disdipEqualNinety);
+//
+//            List<IEC28CountParam> iec28Result = new ArrayList<>();
+//            iec28Result.add(iec28CountLessOne);
+//            iec28Result.add(iec28CountLessTen);
+//            iec28Result.add(iec28CountLessTwenty);
+//            iec28Result.add(iec28CountLessThirty);
+//            iec28Result.add(iec28CountLessForty);
+//            iec28Result.add(iec28CountLessFifty);
+//            iec28Result.add(iec28CountLessSixty);
+//            iec28Result.add(iec28CountLessSeventy);
+//            iec28Result.add(iec28CountLessEighty);
+//            iec28Result.add(iec28CountLessNinety);
+//            iec28Result.add(iec28CountLessHundredTwenty);
+//            iec28Result.add(iec28CountLessHundredThirty);
+//            iec28Result.add(iec28CountLessHundredForty);
+//            iec28Result.add(iec28CountLessHundredFifty);
+//            iec28Result.add(iec28CountLessHundredSixty);
+//            iec28Result.add(iec28CountLessHundredSeventy);
+//            iec28Result.add(iec28CountLessHundredEighty);
+//
+//
+//            Map<String, Integer> resultMap = new HashMap<>();
+//
+//            for (int i = 0; i < iec28Result.size(); i++) {
+//
+//                resultMap.put(iec28Result.get(i).getName(), iec28Result.get(i).getSixtyToOneHundredAndEighty());
+//                resultMap.put(iec28Result.get(i).getName(), iec28Result.get(i).getOneToThree());
+//                resultMap.put(iec28Result.get(i).getName(), iec28Result.get(i).getZeroFiveToOne());
+//                resultMap.put(iec28Result.get(i).getName(), iec28Result.get(i).getZeroOneToZeroTwentyFive());
+//                resultMap.put(iec28Result.get(i).getName(), iec28Result.get(i).getZeroTwentyFiveToZeroFive());
+//                resultMap.put(iec28Result.get(i).getName(), iec28Result.get(i).getThreeToTwenty());
+//                resultMap.put(iec28Result.get(i).getName(), iec28Result.get(i).getTwentyToSixty());
+//                resultMap.put(iec28Result.get(i).getName(), iec28Result.get(i).getZeroZeroTwoToZeroOne());
+//            }
+//
+//            //todo 还要对集合中哪个次数最多挑出第一位
+//            Map<String, Integer> linkMap = getSort(resultMap);
+//
+//            //存放结果的集合
+//            List<String> resultList = new ArrayList<String>();
+//
+//            for (String s : linkMap.keySet()) {
+//                resultList.add(s);
+//                resultList.add(linkMap.get(s).toString());
+//            }
+//
+//            //最多暂降事件名称
+//            for (int i = 0; i < iec28Result.size(); i++) {
+//                if (iec28Result.get(i).getName().equals(resultList.get(0))) {
+//                    if (resultList.get(1).equals(String.valueOf(iec28Result.get(i).getZeroZeroTwoToZeroOne()))) {
+//                        resultList.add("0.02~0.1");
+//                        break;
+//                    } else if (resultList.get(1).equals(String.valueOf(iec28Result.get(i).getZeroOneToZeroTwentyFive()))) {
+//                        resultList.add("0.1~0.25");
+//                        break;
+//                    } else if (resultList.get(1).equals(String.valueOf(iec28Result.get(i).getZeroTwentyFiveToZeroFive()))) {
+//                        resultList.add("0.25~0.5");
+//                        break;
+//                    } else if (resultList.get(1).equals(String.valueOf(iec28Result.get(i).getZeroFiveToOne()))) {
+//                        resultList.add("0.5~1");
+//                        break;
+//                    } else if (resultList.get(1).equals(String.valueOf(iec28Result.get(i).getOneToThree()))) {
+//                        resultList.add("1~3");
+//                        break;
+//                    } else if (resultList.get(1).equals(String.valueOf(iec28Result.get(i).getThreeToTwenty()))) {
+//                        resultList.add("3~20");
+//                        break;
+//                    } else if (resultList.get(1).equals(String.valueOf(iec28Result.get(i).getTwentyToSixty()))) {
+//                        resultList.add("20~60");
+//                        break;
+//                    } else if (resultList.get(1).equals(String.valueOf(iec28Result.get(i).getSixtyToOneHundredAndEighty()))) {
+//                        resultList.add("60~180");
+//                        break;
+//                    }
+//                }
+//            }
+//            //System.out.println(resultList);
+//
+//
+//            //3.1密度密度表格
+//            if (areaReportParam.isDensityTable()) {
+//                //创建表题计数
+//                int twoCount = 1;
+//
+//                //同步给暂降密度图
+//                oneCount4 = oneCount;
+//
+//                createTitle(doc, "4." + oneCount + " " + typeName + "密度", "标题 2", 200, 11);
+//
+//                p = doc.createParagraph();// 新建一个段落
+//                p.setAlignment(ParagraphAlignment.BOTH);
+//                XWPFRun r12 = p.createRun();//创建段落文本
+//                r12.setText("  " + typeName + "密度统计可以从幅值和持续时间两个维度直接地反映" + typeName + "事件发生情况，主要反应事件的发生次数，" +
+//                        "中国电网在所选择的分析时间内" + typeName + "事件主要集中在幅值为" + resultList.get(0) + "，持续时间为" + resultList.get(2) + "[根据 IEC 61000-2-8:(公共电网电压" + typeName + "测量统计)算出" + typeName + "事件发生最多的区间],具体见表（图）：");
+//                r12.setFontSize(11);//字体大小
+//
+//
+//                createTitle(doc, "4." + oneCount + "." + twoCount + " DISDIP表格:国际发配电联盟(UNIPEDE)", "标题 3", 400, 11);
+//
+//                //第一张表
+//                XWPFTable monitorInfo = createTable(doc);
+//                XWPFParagraph monitorInfoExcelParagraph = WordUtils.getCenterParagraph(doc);
+//
+//                // 表格第一行
+//                insertRow(doc, monitorInfo, monitorInfoExcelParagraph, true, "剩余电压", "20ms", "100ms", "500ms", "1s", "3s", "20s", "60s", "180s");
+//
+//
+//                //塞入数据
+//                for (int i = 0; i < disdipResult.size(); i++) {
+//                    insertRow(doc, monitorInfo, monitorInfoExcelParagraph, false, disdipResult.get(i).getName(), String.valueOf(disdipResult.get(i).getTwentyMS()),
+//                            String.valueOf(disdipResult.get(i).getOneHundredMS()), String.valueOf(disdipResult.get(i).getFiveHundredMS()), String.valueOf(disdipResult.get(i).getOne()), String.valueOf(disdipResult.get(i).getThree()),
+//                            String.valueOf(disdipResult.get(i).getTwenty()), String.valueOf(disdipResult.get(i).getSixty()), String.valueOf(disdipResult.get(i).getOneHundredAndEighty()));
+//                }
+//
+//                twoCount++;
+//
+//
+//                createTitle(doc, "4." + oneCount + "." + twoCount + " IEC 61000-4-11:(用电终端的电压" + typeName + "抗度)", "标题 3", 400, 11);
+//
+//                //第二张表
+//                XWPFTable monitorInfo1 = createTable(doc);
+//                XWPFParagraph monitorInfoExcelParagraph1 = WordUtils.getCenterParagraph(doc);
+//
+//                // 表格第一行
+//                insertRow(doc, monitorInfo1, monitorInfoExcelParagraph1, true, "剩余电压", "10~20ms", "20~100ms", "0.1~0.2s", "0.2~0.5s", "0.5~1s", ">1s");
+//
+//
+//                //塞入数据
+//                for (int i = 0; i < iec411Result.size(); i++) {
+//                    insertRow(doc, monitorInfo1, monitorInfoExcelParagraph1, false, iec411Result.get(i).getName(), String.valueOf(iec411Result.get(i).getTenToTwenty()), String.valueOf(iec411Result.get(i).getTwentyToHundred()),
+//                            String.valueOf(iec411Result.get(i).getZeroOneToZeroTwo()), String.valueOf(iec411Result.get(i).getZeroTwoToZeroFive()), String.valueOf(iec411Result.get(i).getZeroFiveToOne()), String.valueOf(iec411Result.get(i).getLessOne()));
+//                }
+//
+//                twoCount++;
+//
+//
+//                createTitle(doc, "4." + oneCount + "." + twoCount + " IEC 61000-2-8:(公共电网电压" + typeName + "测量统计)", "标题 3", 400, 11);
+//
+//                //第二张表
+//                XWPFTable monitorInfo2 = createTable(doc);
+//                XWPFParagraph monitorInfoExcelParagraph2 = WordUtils.getCenterParagraph(doc);
+//
+//                // 表格第一行
+//                insertRow(doc, monitorInfo2, monitorInfoExcelParagraph2, true, "剩余电压", "0.02~0.1s", "0.1~0.25s", "0.25~0.5s", "0.5~1s", "1~3s", "3~20s", "20~60s", "60~180s");
+//
+//
+//                //塞入数据
+//                for (int i = 0; i < iec28Result.size(); i++) {
+//                    insertRow(doc, monitorInfo2, monitorInfoExcelParagraph2, false, iec28Result.get(i).getName(), String.valueOf(iec28Result.get(i).getZeroZeroTwoToZeroOne()), String.valueOf(iec28Result.get(i).getZeroOneToZeroTwentyFive()),
+//                            String.valueOf(iec28Result.get(i).getZeroTwentyFiveToZeroFive()), String.valueOf(iec28Result.get(i).getZeroFiveToOne()), String.valueOf(iec28Result.get(i).getOneToThree()), String.valueOf(iec28Result.get(i).getThreeToTwenty()),
+//                            String.valueOf(iec28Result.get(i).getTwentyToSixty()), String.valueOf(iec28Result.get(i).getSixtyToOneHundredAndEighty()));
+//                }
+//
+//                //同步给暂降密度表格
+//                twoCount1 = twoCount;
+//                //序号计数进行++
+//                oneCount++;
+//            }
+//
+//            //3.2暂降密度图表
+//            if (areaReportParam.isDensityChart()) {
+//
+//                //如果暂降幅值被勾选,就不需要进行写段落
+//                if (areaReportParam.isDensityTable()) {
+//                    twoCount1++;
+//
+//                    //如果幅值图存在与幅值的序号保持同步
+//                    createTitle(doc, "4." + oneCount4 + "." + twoCount1 + " " + typeName + "密度图", "标题 3", 400, 11);
+//
+//                    //代码
+//                    List<EventDetail> eventDetails = BeanUtil.copyToList(info, EventDetail.class);
+//                    Integer[][] eventDensityData = eventReportService.getCoords(eventDetails);
+//                    String str = drawPicUtil.drawEventDensity(eventDensityData);
+//                    createPic(doc, str, "" + typeName + "密度图形");
+//                } else {
+//                    int twoCount = 1;
+//                    createTitle(doc, "4." + oneCount + " " + typeName + "密度", "标题 2", 200, 11);
+//
+//                    p = doc.createParagraph();// 新建一个段落
+//                    p.setAlignment(ParagraphAlignment.BOTH);
+//                    XWPFRun r12 = p.createRun();//创建段落文本
+//                    r12.setText("  " + typeName + "密度统计可以从幅值和持续时间两个维度直接地反映" + typeName + "事件发生情况，主要反应事件的发生次数，" +
+//                            "中国电网在所选择的分析时间内" + typeName + "事件主要集中在幅值为" + resultList.get(0) + "，持续时间为" + resultList.get(2) + "[根据 IEC 61000-2-8:(公共电网电压" + typeName + "测量统计)算出" + typeName + "事件发生最多的区间],具体见表（图）：");
+//                    r12.setFontSize(11);//字体大小
+//
+//
+//                    createTitle(doc, "4." + oneCount + "." + twoCount + " " + typeName + "密度图", "标题 3", 400, 11);
+//
+//
+//                    //代码
+//                    List<EventDetail> eventDetails = BeanUtil.copyToList(info, EventDetail.class);
+//                    Integer[][] eventDensityData = eventReportService.getCoords(eventDetails);
+//                    String str = drawPicUtil.drawEventDensity(eventDensityData);
+//                    createPic(doc, str, "" + typeName + "密度图形");
+//
+//                    //序号计数进行++
+//                    oneCount++;
+//                }
+//            }
+//        }
+        //密度图代码有问题
+//3.暂降密度
         if (areaReportParam.isDensityTable() || areaReportParam.isDensityChart()) {
-
-            //暂降密度图形
-            AreaTableParam areaTableParam = new AreaTableParam();
-
-            //创建结果集合
-            List<EventDetailNew> info = eventDetailList;
-
-            //将sql结果集放入,共用一个sql,减少查询时间
-            AreaTableParam areaTableParam1 = new AreaTableParam();
-            areaTableParam1.setInfo(info);
-
-
-            List<IEC28VO> iEC28VOResult = IEC28Area(areaTableParam1);
-            List<IEC411VO> iEC411VOResult = IEC411Area(areaTableParam1);
-            List<DISDIPVO> dISDIPVOResult = eventDisdipArea(areaTableParam1);
-
-
-            //IEC411 <1% 总共集合
-            List<IEC411VO> lessOneIEC411 = new ArrayList<>();
-            //IEC411 1~40% 总共集合
-            List<IEC411VO> lessFortyIEC411 = new ArrayList<>();
-            //IEC411 40~70% 总共集合
-            List<IEC411VO> lessSeventyIEC411 = new ArrayList<>();
-
-
-            //IEC28 <1% 总共集合
-            List<IEC28VO> lessOneIEC28 = new ArrayList<>();
-            //IEC411 <10 总共集合
-            List<IEC28VO> lessTenIEC28 = new ArrayList<>();
-            //IEC411 <20 总共集合
-            List<IEC28VO> lessTwentyIEC28 = new ArrayList<>();
-            //IEC411 <30 总共集合
-            List<IEC28VO> lessThirtyIEC28 = new ArrayList<>();
-            //IEC411 <40 总共集合
-            List<IEC28VO> lessFortyIEC28 = new ArrayList<>();
-            //IEC411 <50 总共集合
-            List<IEC28VO> lessFiftyIEC28 = new ArrayList<>();
-            //IEC411 <60 总共集合
-            List<IEC28VO> lessSixtyIEC28 = new ArrayList<>();
-            //IEC411 <70 总共集合
-            List<IEC28VO> lessSeventyIEC28 = new ArrayList<>();
-            //IEC411 <80 总共集合
-            List<IEC28VO> lessEightyIEC28 = new ArrayList<>();
-            //IEC411 <90 总共集合
-            List<IEC28VO> lessNinetyIEC28 = new ArrayList<>();
-            //IEC411 <120 总共集合
-            List<IEC28VO> lessHundredTwentyIEC28 = new ArrayList<>();
-            //IEC411 <130 总共集合
-            List<IEC28VO> lessHundredThirtyIEC28 = new ArrayList<>();
-            //IEC411 <140 总共集合
-            List<IEC28VO> lessHundredFortyIEC28 = new ArrayList<>();
-            //IEC411 <150 总共集合
-            List<IEC28VO> lessHundredFiftyIEC28 = new ArrayList<>();
-            //IEC411 <160 总共集合
-            List<IEC28VO> lessHundredSixtyIEC28 = new ArrayList<>();
-            //IEC411 <170 总共集合
-            List<IEC28VO> lessHundredSeventyIEC28 = new ArrayList<>();
-            //IEC411 <180 总共集合
-            List<IEC28VO> lessHundredEightyIEC28 = new ArrayList<>();
-
-
-            //DISDIP = 10%
-            List<DISDIPVO> equalTenDISDIP = new ArrayList<>();
-            //DISDIP = 40%
-            List<DISDIPVO> equalFortyDISDIP = new ArrayList<>();
-            //DISDIP = 70%
-            List<DISDIPVO> equalSeventyDISDIP = new ArrayList<>();
-            //DISDIP = 85%
-            List<DISDIPVO> equalEightyFiveDISDIP = new ArrayList<>();
-            //DISDIP = 90%
-            List<DISDIPVO> equalNinetyDISDIP = new ArrayList<>();
-
-
-            //遍历将集合按名称分开
-            for (int i1 = 0; i1 < iEC411VOResult.size(); i1++) {
-                if ("<1%".equals(iEC411VOResult.get(i1).getName())) {
-                    //放入集合
-                    lessOneIEC411.add(iEC411VOResult.get(i1));
-                } else if ("1~40%".equals(iEC411VOResult.get(i1).getName())) {
-                    //放入集合
-                    lessFortyIEC411.add(iEC411VOResult.get(i1));
-                } else {
-                    //放入集合
-                    lessSeventyIEC411.add(iEC411VOResult.get(i1));
-                }
-            }
-
-
-            //遍历将集合按名称分开
-            for (int i1 = 0; i1 < iEC28VOResult.size(); i1++) {
-                if ("1>U>=0".equals(iEC28VOResult.get(i1).getName())) {
-                    //放入集合
-                    lessOneIEC28.add(iEC28VOResult.get(i1));
-                } else if ("10>U>=1".equals(iEC28VOResult.get(i1).getName())) {
-                    //放入集合
-                    lessTenIEC28.add(iEC28VOResult.get(i1));
-                } else if ("20>U>=10".equals(iEC28VOResult.get(i1).getName())) {
-                    //放入集合
-                    lessTwentyIEC28.add(iEC28VOResult.get(i1));
-                } else if ("30>U>=20".equals(iEC28VOResult.get(i1).getName())) {
-                    //放入集合
-                    lessThirtyIEC28.add(iEC28VOResult.get(i1));
-                } else if ("40>U>=30".equals(iEC28VOResult.get(i1).getName())) {
-                    //放入集合
-                    lessFortyIEC28.add(iEC28VOResult.get(i1));
-                } else if ("50>U>=40".equals(iEC28VOResult.get(i1).getName())) {
-                    //放入集合
-                    lessFiftyIEC28.add(iEC28VOResult.get(i1));
-                } else if ("60>U>=50".equals(iEC28VOResult.get(i1).getName())) {
-                    //放入集合
-                    lessSixtyIEC28.add(iEC28VOResult.get(i1));
-                } else if ("70>U>=60".equals(iEC28VOResult.get(i1).getName())) {
-                    //放入集合
-                    lessSeventyIEC28.add(iEC28VOResult.get(i1));
-                } else if ("80>U>=70".equals(iEC28VOResult.get(i1).getName())) {
-                    //放入集合
-                    lessEightyIEC28.add(iEC28VOResult.get(i1));
-                } else if ("90>U>=80".equals(iEC28VOResult.get(i1).getName())) {
-                    //放入集合
-                    lessNinetyIEC28.add(iEC28VOResult.get(i1));
-                } else if ("120>U>=110".equals(iEC28VOResult.get(i1).getName())) {
-                    //放入集合
-                    lessHundredTwentyIEC28.add(iEC28VOResult.get(i1));
-                } else if ("130>U>=120".equals(iEC28VOResult.get(i1).getName())) {
-                    //放入集合
-                    lessHundredThirtyIEC28.add(iEC28VOResult.get(i1));
-                } else if ("140>U>=130".equals(iEC28VOResult.get(i1).getName())) {
-                    //放入集合
-                    lessHundredFortyIEC28.add(iEC28VOResult.get(i1));
-                } else if ("150>U>=140".equals(iEC28VOResult.get(i1).getName())) {
-                    //放入集合
-                    lessHundredFiftyIEC28.add(iEC28VOResult.get(i1));
-                } else if ("160>U>=150".equals(iEC28VOResult.get(i1).getName())) {
-                    //放入集合
-                    lessHundredSixtyIEC28.add(iEC28VOResult.get(i1));
-                } else if ("170>U>=160".equals(iEC28VOResult.get(i1).getName())) {
-                    //放入集合
-                    lessHundredSeventyIEC28.add(iEC28VOResult.get(i1));
-                } else {
-                    //放入集合
-                    lessHundredEightyIEC28.add(iEC28VOResult.get(i1));
-
-                }
-            }
-
-            //遍历将集合按名称分开
-            for (int i1 = 0; i1 < dISDIPVOResult.size(); i1++) {
-                if ("10%".equals(dISDIPVOResult.get(i1).getName())) {
-                    //放入集合
-                    equalTenDISDIP.add(dISDIPVOResult.get(i1));
-                } else if ("40%".equals(dISDIPVOResult.get(i1).getName())) {
-                    //放入集合
-                    equalFortyDISDIP.add(dISDIPVOResult.get(i1));
-                } else if ("70%".equals(dISDIPVOResult.get(i1).getName())) {
-                    //放入集合
-                    equalSeventyDISDIP.add(dISDIPVOResult.get(i1));
-                } else if ("85%".equals(dISDIPVOResult.get(i1).getName())) {
-                    //放入集合
-                    equalEightyFiveDISDIP.add(dISDIPVOResult.get(i1));
-                } else {
-                    //放入集合
-                    equalNinetyDISDIP.add(dISDIPVOResult.get(i1));
-                }
-            }
-
-
-            //遍历集合中的参数
-            IEC411CountParam iec411LessOne = new IEC411CountParam();
-
-            for (IEC411VO iec411VO : lessOneIEC411) {
-                //获取当前剩余电压名称,不为空就进行添加
-                if (Objects.isNull(iec411LessOne.getName())) {
-                    iec411LessOne.setName(iec411VO.getName());
-                }
-
-                //如果参数不等于0对对象中的参数进行++
-                if (!"0".equals(iec411VO.getTenTwentyMs())) {
-                    int tenToTwenty = iec411LessOne.getTenToTwenty();
-                    iec411LessOne.setTenToTwenty(tenToTwenty++);
-                }
-                if (!"0".equals(iec411VO.getTwentyOneHundredMs())) {
-                    int twentyToHundred = iec411LessOne.getTwentyToHundred();
-                    iec411LessOne.setTenToTwenty(twentyToHundred++);
-                }
-                if (!"0".equals(iec411VO.getZeroPiontOneTwoS())) {
-                    int zeroOneToZeroTwo = iec411LessOne.getZeroOneToZeroTwo();
-                    iec411LessOne.setTenToTwenty(zeroOneToZeroTwo++);
-                }
-                if (!"0".equals(iec411VO.getZeroPiontTwoFiveS())) {
-                    int zeroTwoToZeroFive = iec411LessOne.getZeroTwoToZeroFive();
-                    iec411LessOne.setTenToTwenty(zeroTwoToZeroFive++);
-                }
-                if (!"0".equals(iec411VO.getZeroPiontFive1S())) {
-                    int zeroFiveToOne = iec411LessOne.getZeroFiveToOne();
-                    iec411LessOne.setTenToTwenty(zeroFiveToOne++);
-                }
-                if (!"0".equals(iec411VO.getGreater1S())) {
-                    int lessOne = iec411LessOne.getLessOne();
-                    iec411LessOne.setTenToTwenty(lessOne++);
-                }
-            }
-
-            //遍历集合中的参数
-            IEC411CountParam iec411LessForty = new IEC411CountParam();
-
-            for (IEC411VO iec411VO : lessFortyIEC411) {
-                //获取当前剩余电压名称,不为空就进行添加
-                if (Objects.isNull(iec411LessForty.getName())) {
-                    iec411LessForty.setName(iec411VO.getName());
-                }
-
-                //如果参数不等于0对对象中的参数进行++
-                if (!"0".equals(iec411VO.getTenTwentyMs())) {
-                    int tenToTwenty = iec411LessForty.getTenToTwenty();
-                    iec411LessForty.setTenToTwenty(tenToTwenty++);
-                }
-                if (!"0".equals(iec411VO.getTwentyOneHundredMs())) {
-                    int twentyToHundred = iec411LessForty.getTwentyToHundred();
-                    iec411LessForty.setTenToTwenty(twentyToHundred++);
-                }
-                if (!"0".equals(iec411VO.getZeroPiontOneTwoS())) {
-                    int zeroOneToZeroTwo = iec411LessForty.getZeroOneToZeroTwo();
-                    iec411LessForty.setTenToTwenty(zeroOneToZeroTwo++);
-                }
-                if (!"0".equals(iec411VO.getZeroPiontTwoFiveS())) {
-                    int zeroTwoToZeroFive = iec411LessForty.getZeroTwoToZeroFive();
-                    iec411LessForty.setTenToTwenty(zeroTwoToZeroFive++);
-                }
-                if (!"0".equals(iec411VO.getZeroPiontFive1S())) {
-                    int zeroFiveToOne = iec411LessForty.getZeroFiveToOne();
-                    iec411LessForty.setTenToTwenty(zeroFiveToOne++);
-                }
-                if (!"0".equals(iec411VO.getGreater1S())) {
-                    int lessOne = iec411LessForty.getLessOne();
-                    iec411LessForty.setTenToTwenty(lessOne++);
-                }
-            }
-
-            //遍历集合中的参数
-            IEC411CountParam iec411LessSeventy = new IEC411CountParam();
-
-            for (IEC411VO iec411VO : lessSeventyIEC411) {
-                //获取当前剩余电压名称,不为空就进行添加
-                if (Objects.isNull(iec411LessSeventy.getName())) {
-                    iec411LessSeventy.setName(iec411VO.getName());
-                }
-
-                //如果参数不等于0对对象中的参数进行++
-                if (!"0".equals(iec411VO.getTenTwentyMs())) {
-                    int tenToTwenty = iec411LessSeventy.getTenToTwenty();
-                    iec411LessSeventy.setTenToTwenty(tenToTwenty++);
-                }
-                if (!"0".equals(iec411VO.getTwentyOneHundredMs())) {
-                    int twentyToHundred = iec411LessSeventy.getTwentyToHundred();
-                    iec411LessSeventy.setTenToTwenty(twentyToHundred++);
-                }
-                if (!"0".equals(iec411VO.getZeroPiontOneTwoS())) {
-                    int zeroOneToZeroTwo = iec411LessSeventy.getZeroOneToZeroTwo();
-                    iec411LessSeventy.setTenToTwenty(zeroOneToZeroTwo++);
-                }
-                if (!"0".equals(iec411VO.getZeroPiontTwoFiveS())) {
-                    int zeroTwoToZeroFive = iec411LessSeventy.getZeroTwoToZeroFive();
-                    iec411LessSeventy.setTenToTwenty(zeroTwoToZeroFive++);
-                }
-                if (!"0".equals(iec411VO.getZeroPiontFive1S())) {
-                    int zeroFiveToOne = iec411LessSeventy.getZeroFiveToOne();
-                    iec411LessSeventy.setTenToTwenty(zeroFiveToOne++);
-                }
-                if (!"0".equals(iec411VO.getGreater1S())) {
-                    int lessOne = iec411LessSeventy.getLessOne();
-                    iec411LessSeventy.setTenToTwenty(lessOne++);
-                }
-            }
-
-            /**
-             * ================第一张表结束======================
-             */
-
-            DISDIPCountParam disdipEqualTen = new DISDIPCountParam();
-
-            for (DISDIPVO disdipvo : equalTenDISDIP) {
-                //获取当前剩余电压名称,不为空就进行添加
-                if (Objects.isNull(disdipEqualTen.getName())) {
-                    disdipEqualTen.setName(disdipvo.getName());
-                }
-
-                //如果参数不等于0对对象中的参数进行++
-                if (!"0".equals(disdipvo.getTwentyMs())) {
-                    int twenty = disdipEqualTen.getTwenty();
-                    disdipEqualTen.setTwenty(twenty++);
-                }
-                if (!"0".equals(disdipvo.getOneHundredMs())) {
-                    int oneHundredMS = disdipEqualTen.getOneHundredMS();
-                    disdipEqualTen.setOneHundredMS(oneHundredMS++);
-                }
-                if (!"0".equals(disdipvo.getFiveHundredMs())) {
-                    int fiveHundredMS = disdipEqualTen.getFiveHundredMS();
-                    disdipEqualTen.setOneHundredMS(fiveHundredMS++);
-                }
-                if (!"0".equals(disdipvo.getOneS())) {
-                    int one = disdipEqualTen.getOne();
-                    disdipEqualTen.setOne(one++);
-                }
-                if (!"0".equals(disdipvo.getThreeS())) {
-                    int three = disdipEqualTen.getThree();
-                    disdipEqualTen.setOne(three++);
-                }
-                if (!"0".equals(disdipvo.getTwentyS())) {
-                    int twenty = disdipEqualTen.getTwenty();
-                    disdipEqualTen.setTwenty(twenty++);
-                }
-                if (!"0".equals(disdipvo.getSixtyS())) {
-                    int sixty = disdipEqualTen.getSixty();
-                    disdipEqualTen.setSixty(sixty++);
-                }
-                if (!"0".equals(disdipvo.getOneEightyS())) {
-                    int oneHundredAndEighty = disdipEqualTen.getOneHundredAndEighty();
-                    disdipEqualTen.setOneHundredAndEighty(oneHundredAndEighty++);
-                }
-            }
-
-            DISDIPCountParam disdipEqualForty = new DISDIPCountParam();
-
-            for (DISDIPVO disdipvo : equalFortyDISDIP) {
-                //获取当前剩余电压名称,不为空就进行添加
-                if (Objects.isNull(disdipEqualForty.getName())) {
-                    disdipEqualForty.setName(disdipvo.getName());
-                }
-
-                //如果参数不等于0对对象中的参数进行++
-                if (!"0".equals(disdipvo.getTwentyMs())) {
-                    int twenty = disdipEqualForty.getTwenty();
-                    disdipEqualForty.setTwenty(twenty++);
-                }
-                if (!"0".equals(disdipvo.getOneHundredMs())) {
-                    int oneHundredMS = disdipEqualForty.getOneHundredMS();
-                    disdipEqualForty.setOneHundredMS(oneHundredMS++);
-                }
-                if (!"0".equals(disdipvo.getFiveHundredMs())) {
-                    int fiveHundredMS = disdipEqualForty.getFiveHundredMS();
-                    disdipEqualForty.setOneHundredMS(fiveHundredMS++);
-                }
-                if (!"0".equals(disdipvo.getOneS())) {
-                    int one = disdipEqualForty.getOne();
-                    disdipEqualForty.setOne(one++);
-                }
-                if (!"0".equals(disdipvo.getThreeS())) {
-                    int three = disdipEqualForty.getThree();
-                    disdipEqualForty.setOne(three++);
-                }
-                if (!"0".equals(disdipvo.getTwentyS())) {
-                    int twenty = disdipEqualForty.getTwenty();
-                    disdipEqualForty.setTwenty(twenty++);
-                }
-                if (!"0".equals(disdipvo.getSixtyS())) {
-                    int sixty = disdipEqualForty.getSixty();
-                    disdipEqualForty.setSixty(sixty++);
-                }
-                if (!"0".equals(disdipvo.getOneEightyS())) {
-                    int oneHundredAndEighty = disdipEqualForty.getOneHundredAndEighty();
-                    disdipEqualForty.setOneHundredAndEighty(oneHundredAndEighty++);
-                }
-            }
-
-            DISDIPCountParam disdipEqualSeventy = new DISDIPCountParam();
-
-            for (DISDIPVO disdipvo : equalSeventyDISDIP) {
-                //获取当前剩余电压名称,不为空就进行添加
-                if (Objects.isNull(disdipEqualSeventy.getName())) {
-                    disdipEqualSeventy.setName(disdipvo.getName());
-                }
-
-                //如果参数不等于0对对象中的参数进行++
-                if (!"0".equals(disdipvo.getTwentyMs())) {
-                    int twenty = disdipEqualSeventy.getTwenty();
-                    disdipEqualSeventy.setTwenty(twenty++);
-                }
-                if (!"0".equals(disdipvo.getOneHundredMs())) {
-                    int oneHundredMS = disdipEqualSeventy.getOneHundredMS();
-                    disdipEqualSeventy.setOneHundredMS(oneHundredMS++);
-                }
-                if (!"0".equals(disdipvo.getFiveHundredMs())) {
-                    int fiveHundredMS = disdipEqualSeventy.getFiveHundredMS();
-                    disdipEqualSeventy.setOneHundredMS(fiveHundredMS++);
-                }
-                if (!"0".equals(disdipvo.getOneS())) {
-                    int one = disdipEqualSeventy.getOne();
-                    disdipEqualSeventy.setOne(one++);
-                }
-                if (!"0".equals(disdipvo.getThreeS())) {
-                    int three = disdipEqualSeventy.getThree();
-                    disdipEqualSeventy.setOne(three++);
-                }
-                if (!"0".equals(disdipvo.getTwentyS())) {
-                    int twenty = disdipEqualSeventy.getTwenty();
-                    disdipEqualSeventy.setTwenty(twenty++);
-                }
-                if (!"0".equals(disdipvo.getSixtyS())) {
-                    int sixty = disdipEqualSeventy.getSixty();
-                    disdipEqualSeventy.setSixty(sixty++);
-                }
-                if (!"0".equals(disdipvo.getOneEightyS())) {
-                    int oneHundredAndEighty = disdipEqualSeventy.getOneHundredAndEighty();
-                    disdipEqualSeventy.setOneHundredAndEighty(oneHundredAndEighty++);
-                }
-            }
-
-            DISDIPCountParam disdipEqualEighty = new DISDIPCountParam();
-
-            for (DISDIPVO disdipvo : equalEightyFiveDISDIP) {
-                //获取当前剩余电压名称,不为空就进行添加
-                if (Objects.isNull(disdipEqualEighty.getName())) {
-                    disdipEqualEighty.setName(disdipvo.getName());
-                }
-
-                //如果参数不等于0对对象中的参数进行++
-                if (!"0".equals(disdipvo.getTwentyMs())) {
-                    int twenty = disdipEqualEighty.getTwenty();
-                    disdipEqualEighty.setTwenty(twenty++);
-                }
-                if (!"0".equals(disdipvo.getOneHundredMs())) {
-                    int oneHundredMS = disdipEqualEighty.getOneHundredMS();
-                    disdipEqualEighty.setOneHundredMS(oneHundredMS++);
-                }
-                if (!"0".equals(disdipvo.getFiveHundredMs())) {
-                    int fiveHundredMS = disdipEqualEighty.getFiveHundredMS();
-                    disdipEqualEighty.setOneHundredMS(fiveHundredMS++);
-                }
-                if (!"0".equals(disdipvo.getOneS())) {
-                    int one = disdipEqualEighty.getOne();
-                    disdipEqualEighty.setOne(one++);
-                }
-                if (!"0".equals(disdipvo.getThreeS())) {
-                    int three = disdipEqualEighty.getThree();
-                    disdipEqualEighty.setOne(three++);
-                }
-                if (!"0".equals(disdipvo.getTwentyS())) {
-                    int twenty = disdipEqualEighty.getTwenty();
-                    disdipEqualEighty.setTwenty(twenty++);
-                }
-                if (!"0".equals(disdipvo.getSixtyS())) {
-                    int sixty = disdipEqualEighty.getSixty();
-                    disdipEqualEighty.setSixty(sixty++);
-                }
-                if (!"0".equals(disdipvo.getOneEightyS())) {
-                    int oneHundredAndEighty = disdipEqualEighty.getOneHundredAndEighty();
-                    disdipEqualEighty.setOneHundredAndEighty(oneHundredAndEighty++);
-                }
-            }
-            DISDIPCountParam disdipEqualNinety = new DISDIPCountParam();
-
-            for (DISDIPVO disdipvo : equalNinetyDISDIP) {
-                //获取当前剩余电压名称,不为空就进行添加
-                if (Objects.isNull(disdipEqualNinety.getName())) {
-                    disdipEqualNinety.setName(disdipvo.getName());
-                }
-
-                //如果参数不等于0对对象中的参数进行++
-                if (!"0".equals(disdipvo.getTwentyMs())) {
-                    int twenty = disdipEqualNinety.getTwenty();
-                    disdipEqualNinety.setTwenty(twenty++);
-                }
-                if (!"0".equals(disdipvo.getOneHundredMs())) {
-                    int oneHundredMS = disdipEqualNinety.getOneHundredMS();
-                    disdipEqualNinety.setOneHundredMS(oneHundredMS++);
-                }
-                if (!"0".equals(disdipvo.getFiveHundredMs())) {
-                    int fiveHundredMS = disdipEqualNinety.getFiveHundredMS();
-                    disdipEqualNinety.setOneHundredMS(fiveHundredMS++);
-                }
-                if (!"0".equals(disdipvo.getOneS())) {
-                    int one = disdipEqualNinety.getOne();
-                    disdipEqualNinety.setOne(one++);
-                }
-                if (!"0".equals(disdipvo.getThreeS())) {
-                    int three = disdipEqualNinety.getThree();
-                    disdipEqualNinety.setOne(three++);
-                }
-                if (!"0".equals(disdipvo.getTwentyS())) {
-                    int twenty = disdipEqualNinety.getTwenty();
-                    disdipEqualNinety.setTwenty(twenty++);
-                }
-                if (!"0".equals(disdipvo.getSixtyS())) {
-                    int sixty = disdipEqualNinety.getSixty();
-                    disdipEqualNinety.setSixty(sixty++);
-                }
-                if (!"0".equals(disdipvo.getOneEightyS())) {
-                    int oneHundredAndEighty = disdipEqualNinety.getOneHundredAndEighty();
-                    disdipEqualNinety.setOneHundredAndEighty(oneHundredAndEighty++);
-                }
-            }
-
-            /**
-             * ======================第二张表结束==============================
-             */
-
-            //创建计数对象
-            IEC28CountParam iec28CountLessOne = new IEC28CountParam();
-
-            for (IEC28VO iec28VO : lessOneIEC28) {
-                //获取当前剩余电压名称,不为空就进行添加
-                if (Objects.isNull(iec28CountLessOne.getName())) {
-                    iec28CountLessOne.setName(iec28VO.getName());
-                }
-                //如果参数不等于0对对象中的参数进行++
-                if (!"0".equals(iec28VO.getQ())) {
-                    int zeroZeroTwoToZeroOne = iec28CountLessOne.getZeroZeroTwoToZeroOne();
-                    iec28CountLessOne.setZeroZeroTwoToZeroOne(zeroZeroTwoToZeroOne++);
-                }
-                if (!"0".equals(iec28VO.getW())) {
-                    int zeroOneToZeroTwentyFive = iec28CountLessOne.getZeroOneToZeroTwentyFive();
-                    iec28CountLessOne.setZeroOneToZeroTwentyFive(zeroOneToZeroTwentyFive++);
-                }
-                if (!"0".equals(iec28VO.getE())) {
-                    int zeroTwentyFiveToZeroFive = iec28CountLessOne.getZeroTwentyFiveToZeroFive();
-                    iec28CountLessOne.setZeroTwentyFiveToZeroFive(zeroTwentyFiveToZeroFive++);
-                }
-                if (!"0".equals(iec28VO.getR())) {
-                    int zeroFiveToOne = iec28CountLessOne.getZeroFiveToOne();
-                    iec28CountLessOne.setZeroFiveToOne(zeroFiveToOne++);
-                }
-                if (!"0".equals(iec28VO.getT())) {
-                    int oneToThree = iec28CountLessOne.getOneToThree();
-                    iec28CountLessOne.setOneToThree(oneToThree++);
-                }
-                if (!"0".equals(iec28VO.getY())) {
-                    int threeToTwenty = iec28CountLessOne.getThreeToTwenty();
-                    iec28CountLessOne.setThreeToTwenty(threeToTwenty++);
-                }
-                if (!"0".equals(iec28VO.getU())) {
-                    int twentyToSixty = iec28CountLessOne.getTwentyToSixty();
-                    iec28CountLessOne.setTwentyToSixty(twentyToSixty++);
-                }
-                if (!"0".equals(iec28VO.getI())) {
-                    int sixtyToOneHundredAndEighty = iec28CountLessOne.getSixtyToOneHundredAndEighty();
-                    iec28CountLessOne.setSixtyToOneHundredAndEighty(sixtyToOneHundredAndEighty++);
-                }
-            }
-
-
-            //创建计数对象
-            IEC28CountParam iec28CountLessTen = new IEC28CountParam();
-
-            for (IEC28VO iec28VO : lessTenIEC28) {
-                //获取当前剩余电压名称,不为空就进行添加
-                if (Objects.isNull(iec28CountLessTen.getName())) {
-                    iec28CountLessTen.setName(iec28VO.getName());
-                }
-                //如果参数不等于0对对象中的参数进行++
-                if (!"0".equals(iec28VO.getQ())) {
-                    int zeroZeroTwoToZeroOne = iec28CountLessTen.getZeroZeroTwoToZeroOne();
-                    iec28CountLessTen.setZeroZeroTwoToZeroOne(zeroZeroTwoToZeroOne++);
-                }
-                if (!"0".equals(iec28VO.getW())) {
-                    int zeroOneToZeroTwentyFive = iec28CountLessTen.getZeroOneToZeroTwentyFive();
-                    iec28CountLessTen.setZeroOneToZeroTwentyFive(zeroOneToZeroTwentyFive++);
-                }
-                if (!"0".equals(iec28VO.getE())) {
-                    int zeroTwentyFiveToZeroFive = iec28CountLessTen.getZeroTwentyFiveToZeroFive();
-                    iec28CountLessTen.setZeroTwentyFiveToZeroFive(zeroTwentyFiveToZeroFive++);
-                }
-                if (!"0".equals(iec28VO.getR())) {
-                    int zeroFiveToOne = iec28CountLessTen.getZeroFiveToOne();
-                    iec28CountLessTen.setZeroFiveToOne(zeroFiveToOne++);
-                }
-                if (!"0".equals(iec28VO.getT())) {
-                    int oneToThree = iec28CountLessTen.getOneToThree();
-                    iec28CountLessTen.setOneToThree(oneToThree++);
-                }
-                if (!"0".equals(iec28VO.getY())) {
-                    int threeToTwenty = iec28CountLessTen.getThreeToTwenty();
-                    iec28CountLessTen.setThreeToTwenty(threeToTwenty++);
-                }
-                if (!"0".equals(iec28VO.getU())) {
-                    int twentyToSixty = iec28CountLessTen.getTwentyToSixty();
-                    iec28CountLessTen.setTwentyToSixty(twentyToSixty++);
-                }
-                if (!"0".equals(iec28VO.getI())) {
-                    int sixtyToOneHundredAndEighty = iec28CountLessTen.getSixtyToOneHundredAndEighty();
-                    iec28CountLessTen.setSixtyToOneHundredAndEighty(sixtyToOneHundredAndEighty++);
-                }
-            }
-
-
-            //创建计数对象
-            IEC28CountParam iec28CountLessTwenty = new IEC28CountParam();
-
-            for (IEC28VO iec28VO : lessTwentyIEC28) {
-                //获取当前剩余电压名称,不为空就进行添加
-                if (Objects.isNull(iec28CountLessTwenty.getName())) {
-                    iec28CountLessTwenty.setName(iec28VO.getName());
-                }
-                //如果参数不等于0对对象中的参数进行++
-                if (!"0".equals(iec28VO.getQ())) {
-                    int zeroZeroTwoToZeroOne = iec28CountLessTwenty.getZeroZeroTwoToZeroOne();
-                    iec28CountLessTwenty.setZeroZeroTwoToZeroOne(zeroZeroTwoToZeroOne++);
-                }
-                if (!"0".equals(iec28VO.getW())) {
-                    int zeroOneToZeroTwentyFive = iec28CountLessTwenty.getZeroOneToZeroTwentyFive();
-                    iec28CountLessTwenty.setZeroOneToZeroTwentyFive(zeroOneToZeroTwentyFive++);
-                }
-                if (!"0".equals(iec28VO.getE())) {
-                    int zeroTwentyFiveToZeroFive = iec28CountLessTwenty.getZeroTwentyFiveToZeroFive();
-                    iec28CountLessTwenty.setZeroTwentyFiveToZeroFive(zeroTwentyFiveToZeroFive++);
-                }
-                if (!"0".equals(iec28VO.getR())) {
-                    int zeroFiveToOne = iec28CountLessTwenty.getZeroFiveToOne();
-                    iec28CountLessTwenty.setZeroFiveToOne(zeroFiveToOne++);
-                }
-                if (!"0".equals(iec28VO.getT())) {
-                    int oneToThree = iec28CountLessTwenty.getOneToThree();
-                    iec28CountLessTwenty.setOneToThree(oneToThree++);
-                }
-                if (!"0".equals(iec28VO.getY())) {
-                    int threeToTwenty = iec28CountLessTwenty.getThreeToTwenty();
-                    iec28CountLessTwenty.setThreeToTwenty(threeToTwenty++);
-                }
-                if (!"0".equals(iec28VO.getU())) {
-                    int twentyToSixty = iec28CountLessTwenty.getTwentyToSixty();
-                    iec28CountLessTwenty.setTwentyToSixty(twentyToSixty++);
-                }
-                if (!"0".equals(iec28VO.getI())) {
-                    int sixtyToOneHundredAndEighty = iec28CountLessTwenty.getSixtyToOneHundredAndEighty();
-                    iec28CountLessTwenty.setSixtyToOneHundredAndEighty(sixtyToOneHundredAndEighty++);
-                }
-            }
-
-
-            //创建计数对象
-            IEC28CountParam iec28CountLessThirty = new IEC28CountParam();
-
-            for (IEC28VO iec28VO : lessThirtyIEC28) {
-                //获取当前剩余电压名称,不为空就进行添加
-                if (Objects.isNull(iec28CountLessThirty.getName())) {
-                    iec28CountLessThirty.setName(iec28VO.getName());
-                }
-                //如果参数不等于0对对象中的参数进行++
-                if (!"0".equals(iec28VO.getQ())) {
-                    int zeroZeroTwoToZeroOne = iec28CountLessThirty.getZeroZeroTwoToZeroOne();
-                    iec28CountLessThirty.setZeroZeroTwoToZeroOne(zeroZeroTwoToZeroOne++);
-                }
-                if (!"0".equals(iec28VO.getW())) {
-                    int zeroOneToZeroTwentyFive = iec28CountLessThirty.getZeroOneToZeroTwentyFive();
-                    iec28CountLessThirty.setZeroOneToZeroTwentyFive(zeroOneToZeroTwentyFive++);
-                }
-                if (!"0".equals(iec28VO.getE())) {
-                    int zeroTwentyFiveToZeroFive = iec28CountLessThirty.getZeroTwentyFiveToZeroFive();
-                    iec28CountLessThirty.setZeroTwentyFiveToZeroFive(zeroTwentyFiveToZeroFive++);
-                }
-                if (!"0".equals(iec28VO.getR())) {
-                    int zeroFiveToOne = iec28CountLessThirty.getZeroFiveToOne();
-                    iec28CountLessThirty.setZeroFiveToOne(zeroFiveToOne++);
-                }
-                if (!"0".equals(iec28VO.getT())) {
-                    int oneToThree = iec28CountLessThirty.getOneToThree();
-                    iec28CountLessThirty.setOneToThree(oneToThree++);
-                }
-                if (!"0".equals(iec28VO.getY())) {
-                    int threeToTwenty = iec28CountLessThirty.getThreeToTwenty();
-                    iec28CountLessThirty.setThreeToTwenty(threeToTwenty++);
-                }
-                if (!"0".equals(iec28VO.getU())) {
-                    int twentyToSixty = iec28CountLessThirty.getTwentyToSixty();
-                    iec28CountLessThirty.setTwentyToSixty(twentyToSixty++);
-                }
-                if (!"0".equals(iec28VO.getI())) {
-                    int sixtyToOneHundredAndEighty = iec28CountLessThirty.getSixtyToOneHundredAndEighty();
-                    iec28CountLessThirty.setSixtyToOneHundredAndEighty(sixtyToOneHundredAndEighty++);
-                }
-            }
-
-
-            //创建计数对象
-            IEC28CountParam iec28CountLessForty = new IEC28CountParam();
-
-            for (IEC28VO iec28VO : lessFortyIEC28) {
-                //获取当前剩余电压名称,不为空就进行添加
-                if (Objects.isNull(iec28CountLessForty.getName())) {
-                    iec28CountLessForty.setName(iec28VO.getName());
-                }
-                //如果参数不等于0对对象中的参数进行++
-                if (!"0".equals(iec28VO.getQ())) {
-                    int zeroZeroTwoToZeroOne = iec28CountLessForty.getZeroZeroTwoToZeroOne();
-                    iec28CountLessForty.setZeroZeroTwoToZeroOne(zeroZeroTwoToZeroOne++);
-                }
-                if (!"0".equals(iec28VO.getW())) {
-                    int zeroOneToZeroTwentyFive = iec28CountLessForty.getZeroOneToZeroTwentyFive();
-                    iec28CountLessForty.setZeroOneToZeroTwentyFive(zeroOneToZeroTwentyFive++);
-                }
-                if (!"0".equals(iec28VO.getE())) {
-                    int zeroTwentyFiveToZeroFive = iec28CountLessForty.getZeroTwentyFiveToZeroFive();
-                    iec28CountLessForty.setZeroTwentyFiveToZeroFive(zeroTwentyFiveToZeroFive++);
-                }
-                if (!"0".equals(iec28VO.getR())) {
-                    int zeroFiveToOne = iec28CountLessForty.getZeroFiveToOne();
-                    iec28CountLessForty.setZeroFiveToOne(zeroFiveToOne++);
-                }
-                if (!"0".equals(iec28VO.getT())) {
-                    int oneToThree = iec28CountLessForty.getOneToThree();
-                    iec28CountLessForty.setOneToThree(oneToThree++);
-                }
-                if (!"0".equals(iec28VO.getY())) {
-                    int threeToTwenty = iec28CountLessForty.getThreeToTwenty();
-                    iec28CountLessForty.setThreeToTwenty(threeToTwenty++);
-                }
-                if (!"0".equals(iec28VO.getU())) {
-                    int twentyToSixty = iec28CountLessForty.getTwentyToSixty();
-                    iec28CountLessForty.setTwentyToSixty(twentyToSixty++);
-                }
-                if (!"0".equals(iec28VO.getI())) {
-                    int sixtyToOneHundredAndEighty = iec28CountLessForty.getSixtyToOneHundredAndEighty();
-                    iec28CountLessForty.setSixtyToOneHundredAndEighty(sixtyToOneHundredAndEighty++);
-                }
-            }
-
-
-            //创建计数对象
-            IEC28CountParam iec28CountLessFifty = new IEC28CountParam();
-
-            for (IEC28VO iec28VO : lessFiftyIEC28) {
-                //获取当前剩余电压名称,不为空就进行添加
-                if (Objects.isNull(iec28CountLessFifty.getName())) {
-                    iec28CountLessFifty.setName(iec28VO.getName());
-                }
-                //如果参数不等于0对对象中的参数进行++
-                if (!"0".equals(iec28VO.getQ())) {
-                    int zeroZeroTwoToZeroOne = iec28CountLessFifty.getZeroZeroTwoToZeroOne();
-                    iec28CountLessFifty.setZeroZeroTwoToZeroOne(zeroZeroTwoToZeroOne++);
-                }
-                if (!"0".equals(iec28VO.getW())) {
-                    int zeroOneToZeroTwentyFive = iec28CountLessFifty.getZeroOneToZeroTwentyFive();
-                    iec28CountLessFifty.setZeroOneToZeroTwentyFive(zeroOneToZeroTwentyFive++);
-                }
-                if (!"0".equals(iec28VO.getE())) {
-                    int zeroTwentyFiveToZeroFive = iec28CountLessFifty.getZeroTwentyFiveToZeroFive();
-                    iec28CountLessFifty.setZeroTwentyFiveToZeroFive(zeroTwentyFiveToZeroFive++);
-                }
-                if (!"0".equals(iec28VO.getR())) {
-                    int zeroFiveToOne = iec28CountLessFifty.getZeroFiveToOne();
-                    iec28CountLessFifty.setZeroFiveToOne(zeroFiveToOne++);
-                }
-                if (!"0".equals(iec28VO.getT())) {
-                    int oneToThree = iec28CountLessFifty.getOneToThree();
-                    iec28CountLessFifty.setOneToThree(oneToThree++);
-                }
-                if (!"0".equals(iec28VO.getY())) {
-                    int threeToTwenty = iec28CountLessFifty.getThreeToTwenty();
-                    iec28CountLessFifty.setThreeToTwenty(threeToTwenty++);
-                }
-                if (!"0".equals(iec28VO.getU())) {
-                    int twentyToSixty = iec28CountLessFifty.getTwentyToSixty();
-                    iec28CountLessFifty.setTwentyToSixty(twentyToSixty++);
-                }
-                if (!"0".equals(iec28VO.getI())) {
-                    int sixtyToOneHundredAndEighty = iec28CountLessFifty.getSixtyToOneHundredAndEighty();
-                    iec28CountLessFifty.setSixtyToOneHundredAndEighty(sixtyToOneHundredAndEighty++);
-                }
-            }
-
-
-            //创建计数对象
-            IEC28CountParam iec28CountLessSixty = new IEC28CountParam();
-
-            for (IEC28VO iec28VO : lessSixtyIEC28) {
-                //获取当前剩余电压名称,不为空就进行添加
-                if (Objects.isNull(iec28CountLessSixty.getName())) {
-                    iec28CountLessSixty.setName(iec28VO.getName());
-                }
-                //如果参数不等于0对对象中的参数进行++
-                if (!"0".equals(iec28VO.getQ())) {
-                    int zeroZeroTwoToZeroOne = iec28CountLessSixty.getZeroZeroTwoToZeroOne();
-                    iec28CountLessSixty.setZeroZeroTwoToZeroOne(zeroZeroTwoToZeroOne++);
-                }
-                if (!"0".equals(iec28VO.getW())) {
-                    int zeroOneToZeroTwentyFive = iec28CountLessSixty.getZeroOneToZeroTwentyFive();
-                    iec28CountLessSixty.setZeroOneToZeroTwentyFive(zeroOneToZeroTwentyFive++);
-                }
-                if (!"0".equals(iec28VO.getE())) {
-                    int zeroTwentyFiveToZeroFive = iec28CountLessSixty.getZeroTwentyFiveToZeroFive();
-                    iec28CountLessSixty.setZeroTwentyFiveToZeroFive(zeroTwentyFiveToZeroFive++);
-                }
-                if (!"0".equals(iec28VO.getR())) {
-                    int zeroFiveToOne = iec28CountLessSixty.getZeroFiveToOne();
-                    iec28CountLessSixty.setZeroFiveToOne(zeroFiveToOne++);
-                }
-                if (!"0".equals(iec28VO.getT())) {
-                    int oneToThree = iec28CountLessSixty.getOneToThree();
-                    iec28CountLessSixty.setOneToThree(oneToThree++);
-                }
-                if (!"0".equals(iec28VO.getY())) {
-                    int threeToTwenty = iec28CountLessSixty.getThreeToTwenty();
-                    iec28CountLessSixty.setThreeToTwenty(threeToTwenty++);
-                }
-                if (!"0".equals(iec28VO.getU())) {
-                    int twentyToSixty = iec28CountLessSixty.getTwentyToSixty();
-                    iec28CountLessSixty.setTwentyToSixty(twentyToSixty++);
-                }
-                if (!"0".equals(iec28VO.getI())) {
-                    int sixtyToOneHundredAndEighty = iec28CountLessSixty.getSixtyToOneHundredAndEighty();
-                    iec28CountLessSixty.setSixtyToOneHundredAndEighty(sixtyToOneHundredAndEighty++);
-                }
-            }
-
-
-            //创建计数对象
-            IEC28CountParam iec28CountLessSeventy = new IEC28CountParam();
-
-            for (IEC28VO iec28VO : lessSeventyIEC28) {
-                //获取当前剩余电压名称,不为空就进行添加
-                if (Objects.isNull(iec28CountLessSeventy.getName())) {
-                    iec28CountLessSeventy.setName(iec28VO.getName());
-                }
-                //如果参数不等于0对对象中的参数进行++
-                if (!"0".equals(iec28VO.getQ())) {
-                    int zeroZeroTwoToZeroOne = iec28CountLessSeventy.getZeroZeroTwoToZeroOne();
-                    iec28CountLessSeventy.setZeroZeroTwoToZeroOne(zeroZeroTwoToZeroOne++);
-                }
-                if (!"0".equals(iec28VO.getW())) {
-                    int zeroOneToZeroTwentyFive = iec28CountLessSeventy.getZeroOneToZeroTwentyFive();
-                    iec28CountLessSeventy.setZeroOneToZeroTwentyFive(zeroOneToZeroTwentyFive++);
-                }
-                if (!"0".equals(iec28VO.getE())) {
-                    int zeroTwentyFiveToZeroFive = iec28CountLessSeventy.getZeroTwentyFiveToZeroFive();
-                    iec28CountLessSeventy.setZeroTwentyFiveToZeroFive(zeroTwentyFiveToZeroFive++);
-                }
-                if (!"0".equals(iec28VO.getR())) {
-                    int zeroFiveToOne = iec28CountLessSeventy.getZeroFiveToOne();
-                    iec28CountLessSeventy.setZeroFiveToOne(zeroFiveToOne++);
-                }
-                if (!"0".equals(iec28VO.getT())) {
-                    int oneToThree = iec28CountLessSeventy.getOneToThree();
-                    iec28CountLessSeventy.setOneToThree(oneToThree++);
-                }
-                if (!"0".equals(iec28VO.getY())) {
-                    int threeToTwenty = iec28CountLessSeventy.getThreeToTwenty();
-                    iec28CountLessSeventy.setThreeToTwenty(threeToTwenty++);
-                }
-                if (!"0".equals(iec28VO.getU())) {
-                    int twentyToSixty = iec28CountLessSeventy.getTwentyToSixty();
-                    iec28CountLessSeventy.setTwentyToSixty(twentyToSixty++);
-                }
-                if (!"0".equals(iec28VO.getI())) {
-                    int sixtyToOneHundredAndEighty = iec28CountLessSeventy.getSixtyToOneHundredAndEighty();
-                    iec28CountLessSeventy.setSixtyToOneHundredAndEighty(sixtyToOneHundredAndEighty++);
-                }
-            }
-
-
-            //创建计数对象
-            IEC28CountParam iec28CountLessEighty = new IEC28CountParam();
-
-            for (IEC28VO iec28VO : lessEightyIEC28) {
-                //获取当前剩余电压名称,不为空就进行添加
-                if (Objects.isNull(iec28CountLessEighty.getName())) {
-                    iec28CountLessEighty.setName(iec28VO.getName());
-                }
-                //如果参数不等于0对对象中的参数进行++
-                if (!"0".equals(iec28VO.getQ())) {
-                    int zeroZeroTwoToZeroOne = iec28CountLessEighty.getZeroZeroTwoToZeroOne();
-                    iec28CountLessEighty.setZeroZeroTwoToZeroOne(zeroZeroTwoToZeroOne++);
-                }
-                if (!"0".equals(iec28VO.getW())) {
-                    int zeroOneToZeroTwentyFive = iec28CountLessEighty.getZeroOneToZeroTwentyFive();
-                    iec28CountLessEighty.setZeroOneToZeroTwentyFive(zeroOneToZeroTwentyFive++);
-                }
-                if (!"0".equals(iec28VO.getE())) {
-                    int zeroTwentyFiveToZeroFive = iec28CountLessEighty.getZeroTwentyFiveToZeroFive();
-                    iec28CountLessEighty.setZeroTwentyFiveToZeroFive(zeroTwentyFiveToZeroFive++);
-                }
-                if (!"0".equals(iec28VO.getR())) {
-                    int zeroFiveToOne = iec28CountLessEighty.getZeroFiveToOne();
-                    iec28CountLessEighty.setZeroFiveToOne(zeroFiveToOne++);
-                }
-                if (!"0".equals(iec28VO.getT())) {
-                    int oneToThree = iec28CountLessEighty.getOneToThree();
-                    iec28CountLessEighty.setOneToThree(oneToThree++);
-                }
-                if (!"0".equals(iec28VO.getY())) {
-                    int threeToTwenty = iec28CountLessEighty.getThreeToTwenty();
-                    iec28CountLessEighty.setThreeToTwenty(threeToTwenty++);
-                }
-                if (!"0".equals(iec28VO.getU())) {
-                    int twentyToSixty = iec28CountLessEighty.getTwentyToSixty();
-                    iec28CountLessEighty.setTwentyToSixty(twentyToSixty++);
-                }
-                if (!"0".equals(iec28VO.getI())) {
-                    int sixtyToOneHundredAndEighty = iec28CountLessEighty.getSixtyToOneHundredAndEighty();
-                    iec28CountLessEighty.setSixtyToOneHundredAndEighty(sixtyToOneHundredAndEighty++);
-                }
-            }
-
-            //创建计数对象
-            IEC28CountParam iec28CountLessNinety = new IEC28CountParam();
-
-            for (IEC28VO iec28VO : lessNinetyIEC28) {
-                //获取当前剩余电压名称,不为空就进行添加
-                if (Objects.isNull(iec28CountLessNinety.getName())) {
-                    iec28CountLessNinety.setName(iec28VO.getName());
-                }
-                //如果参数不等于0对对象中的参数进行++
-                if (!"0".equals(iec28VO.getQ())) {
-                    int zeroZeroTwoToZeroOne = iec28CountLessNinety.getZeroZeroTwoToZeroOne();
-                    iec28CountLessNinety.setZeroZeroTwoToZeroOne(zeroZeroTwoToZeroOne++);
-                }
-                if (!"0".equals(iec28VO.getW())) {
-                    int zeroOneToZeroTwentyFive = iec28CountLessNinety.getZeroOneToZeroTwentyFive();
-                    iec28CountLessNinety.setZeroOneToZeroTwentyFive(zeroOneToZeroTwentyFive++);
-                }
-                if (!"0".equals(iec28VO.getE())) {
-                    int zeroTwentyFiveToZeroFive = iec28CountLessNinety.getZeroTwentyFiveToZeroFive();
-                    iec28CountLessNinety.setZeroTwentyFiveToZeroFive(zeroTwentyFiveToZeroFive++);
-                }
-                if (!"0".equals(iec28VO.getR())) {
-                    int zeroFiveToOne = iec28CountLessNinety.getZeroFiveToOne();
-                    iec28CountLessNinety.setZeroFiveToOne(zeroFiveToOne++);
-                }
-                if (!"0".equals(iec28VO.getT())) {
-                    int oneToThree = iec28CountLessNinety.getOneToThree();
-                    iec28CountLessNinety.setOneToThree(oneToThree++);
-                }
-                if (!"0".equals(iec28VO.getY())) {
-                    int threeToTwenty = iec28CountLessNinety.getThreeToTwenty();
-                    iec28CountLessNinety.setThreeToTwenty(threeToTwenty++);
-                }
-                if (!"0".equals(iec28VO.getU())) {
-                    int twentyToSixty = iec28CountLessNinety.getTwentyToSixty();
-                    iec28CountLessNinety.setTwentyToSixty(twentyToSixty++);
-                }
-                if (!"0".equals(iec28VO.getI())) {
-                    int sixtyToOneHundredAndEighty = iec28CountLessNinety.getSixtyToOneHundredAndEighty();
-                    iec28CountLessNinety.setSixtyToOneHundredAndEighty(sixtyToOneHundredAndEighty++);
-                }
-            }
-
-            //创建计数对象
-            IEC28CountParam iec28CountLessHundredTwenty = new IEC28CountParam();
-
-            for (IEC28VO iec28VO : lessHundredTwentyIEC28) {
-                //获取当前剩余电压名称,不为空就进行添加
-                if (Objects.isNull(iec28CountLessHundredTwenty.getName())) {
-                    iec28CountLessHundredTwenty.setName(iec28VO.getName());
-                }
-                //如果参数不等于0对对象中的参数进行++
-                if (!"0".equals(iec28VO.getQ())) {
-                    int zeroZeroTwoToZeroOne = iec28CountLessHundredTwenty.getZeroZeroTwoToZeroOne();
-                    iec28CountLessHundredTwenty.setZeroZeroTwoToZeroOne(zeroZeroTwoToZeroOne++);
-                }
-                if (!"0".equals(iec28VO.getW())) {
-                    int zeroOneToZeroTwentyFive = iec28CountLessHundredTwenty.getZeroOneToZeroTwentyFive();
-                    iec28CountLessHundredTwenty.setZeroOneToZeroTwentyFive(zeroOneToZeroTwentyFive++);
-                }
-                if (!"0".equals(iec28VO.getE())) {
-                    int zeroTwentyFiveToZeroFive = iec28CountLessHundredTwenty.getZeroTwentyFiveToZeroFive();
-                    iec28CountLessHundredTwenty.setZeroTwentyFiveToZeroFive(zeroTwentyFiveToZeroFive++);
-                }
-                if (!"0".equals(iec28VO.getR())) {
-                    int zeroFiveToOne = iec28CountLessHundredTwenty.getZeroFiveToOne();
-                    iec28CountLessHundredTwenty.setZeroFiveToOne(zeroFiveToOne++);
-                }
-                if (!"0".equals(iec28VO.getT())) {
-                    int oneToThree = iec28CountLessHundredTwenty.getOneToThree();
-                    iec28CountLessHundredTwenty.setOneToThree(oneToThree++);
-                }
-                if (!"0".equals(iec28VO.getY())) {
-                    int threeToTwenty = iec28CountLessHundredTwenty.getThreeToTwenty();
-                    iec28CountLessHundredTwenty.setThreeToTwenty(threeToTwenty++);
-                }
-                if (!"0".equals(iec28VO.getU())) {
-                    int twentyToSixty = iec28CountLessHundredTwenty.getTwentyToSixty();
-                    iec28CountLessHundredTwenty.setTwentyToSixty(twentyToSixty++);
-                }
-                if (!"0".equals(iec28VO.getI())) {
-                    int sixtyToOneHundredAndEighty = iec28CountLessHundredTwenty.getSixtyToOneHundredAndEighty();
-                    iec28CountLessHundredTwenty.setSixtyToOneHundredAndEighty(sixtyToOneHundredAndEighty++);
-                }
-            }
-
-
-            //创建计数对象
-            IEC28CountParam iec28CountLessHundredThirty = new IEC28CountParam();
-
-            for (IEC28VO iec28VO : lessHundredThirtyIEC28) {
-                //获取当前剩余电压名称,不为空就进行添加
-                if (Objects.isNull(iec28CountLessHundredThirty.getName())) {
-                    iec28CountLessHundredThirty.setName(iec28VO.getName());
-                }
-                //如果参数不等于0对对象中的参数进行++
-                if (!"0".equals(iec28VO.getQ())) {
-                    int zeroZeroTwoToZeroOne = iec28CountLessHundredThirty.getZeroZeroTwoToZeroOne();
-                    iec28CountLessHundredThirty.setZeroZeroTwoToZeroOne(zeroZeroTwoToZeroOne++);
-                }
-                if (!"0".equals(iec28VO.getW())) {
-                    int zeroOneToZeroTwentyFive = iec28CountLessHundredThirty.getZeroOneToZeroTwentyFive();
-                    iec28CountLessHundredThirty.setZeroOneToZeroTwentyFive(zeroOneToZeroTwentyFive++);
-                }
-                if (!"0".equals(iec28VO.getE())) {
-                    int zeroTwentyFiveToZeroFive = iec28CountLessHundredThirty.getZeroTwentyFiveToZeroFive();
-                    iec28CountLessHundredThirty.setZeroTwentyFiveToZeroFive(zeroTwentyFiveToZeroFive++);
-                }
-                if (!"0".equals(iec28VO.getR())) {
-                    int zeroFiveToOne = iec28CountLessHundredThirty.getZeroFiveToOne();
-                    iec28CountLessHundredThirty.setZeroFiveToOne(zeroFiveToOne++);
-                }
-                if (!"0".equals(iec28VO.getT())) {
-                    int oneToThree = iec28CountLessHundredThirty.getOneToThree();
-                    iec28CountLessHundredThirty.setOneToThree(oneToThree++);
-                }
-                if (!"0".equals(iec28VO.getY())) {
-                    int threeToTwenty = iec28CountLessHundredThirty.getThreeToTwenty();
-                    iec28CountLessHundredThirty.setThreeToTwenty(threeToTwenty++);
-                }
-                if (!"0".equals(iec28VO.getU())) {
-                    int twentyToSixty = iec28CountLessHundredThirty.getTwentyToSixty();
-                    iec28CountLessHundredThirty.setTwentyToSixty(twentyToSixty++);
-                }
-                if (!"0".equals(iec28VO.getI())) {
-                    int sixtyToOneHundredAndEighty = iec28CountLessHundredThirty.getSixtyToOneHundredAndEighty();
-                    iec28CountLessHundredThirty.setSixtyToOneHundredAndEighty(sixtyToOneHundredAndEighty++);
-                }
-            }
-
-            //创建计数对象
-            IEC28CountParam iec28CountLessHundredForty = new IEC28CountParam();
-
-            for (IEC28VO iec28VO : lessHundredFortyIEC28) {
-                //获取当前剩余电压名称,不为空就进行添加
-                if (Objects.isNull(iec28CountLessHundredForty.getName())) {
-                    iec28CountLessHundredForty.setName(iec28VO.getName());
-                }
-                //如果参数不等于0对对象中的参数进行++
-                if (!"0".equals(iec28VO.getQ())) {
-                    int zeroZeroTwoToZeroOne = iec28CountLessHundredForty.getZeroZeroTwoToZeroOne();
-                    iec28CountLessHundredForty.setZeroZeroTwoToZeroOne(zeroZeroTwoToZeroOne++);
-                }
-                if (!"0".equals(iec28VO.getW())) {
-                    int zeroOneToZeroTwentyFive = iec28CountLessHundredForty.getZeroOneToZeroTwentyFive();
-                    iec28CountLessHundredForty.setZeroOneToZeroTwentyFive(zeroOneToZeroTwentyFive++);
-                }
-                if (!"0".equals(iec28VO.getE())) {
-                    int zeroTwentyFiveToZeroFive = iec28CountLessHundredForty.getZeroTwentyFiveToZeroFive();
-                    iec28CountLessHundredForty.setZeroTwentyFiveToZeroFive(zeroTwentyFiveToZeroFive++);
-                }
-                if (!"0".equals(iec28VO.getR())) {
-                    int zeroFiveToOne = iec28CountLessHundredForty.getZeroFiveToOne();
-                    iec28CountLessHundredForty.setZeroFiveToOne(zeroFiveToOne++);
-                }
-                if (!"0".equals(iec28VO.getT())) {
-                    int oneToThree = iec28CountLessHundredForty.getOneToThree();
-                    iec28CountLessHundredForty.setOneToThree(oneToThree++);
-                }
-                if (!"0".equals(iec28VO.getY())) {
-                    int threeToTwenty = iec28CountLessHundredForty.getThreeToTwenty();
-                    iec28CountLessHundredForty.setThreeToTwenty(threeToTwenty++);
-                }
-                if (!"0".equals(iec28VO.getU())) {
-                    int twentyToSixty = iec28CountLessHundredForty.getTwentyToSixty();
-                    iec28CountLessHundredForty.setTwentyToSixty(twentyToSixty++);
-                }
-                if (!"0".equals(iec28VO.getI())) {
-                    int sixtyToOneHundredAndEighty = iec28CountLessHundredForty.getSixtyToOneHundredAndEighty();
-                    iec28CountLessHundredForty.setSixtyToOneHundredAndEighty(sixtyToOneHundredAndEighty++);
-                }
-            }
-
-
-            //创建计数对象
-            IEC28CountParam iec28CountLessHundredFifty = new IEC28CountParam();
-
-            for (IEC28VO iec28VO : lessHundredFiftyIEC28) {
-                //获取当前剩余电压名称,不为空就进行添加
-                if (Objects.isNull(iec28CountLessHundredFifty.getName())) {
-                    iec28CountLessHundredFifty.setName(iec28VO.getName());
-                }
-                //如果参数不等于0对对象中的参数进行++
-                if (!"0".equals(iec28VO.getQ())) {
-                    int zeroZeroTwoToZeroOne = iec28CountLessHundredFifty.getZeroZeroTwoToZeroOne();
-                    iec28CountLessHundredFifty.setZeroZeroTwoToZeroOne(zeroZeroTwoToZeroOne++);
-                }
-                if (!"0".equals(iec28VO.getW())) {
-                    int zeroOneToZeroTwentyFive = iec28CountLessHundredFifty.getZeroOneToZeroTwentyFive();
-                    iec28CountLessHundredFifty.setZeroOneToZeroTwentyFive(zeroOneToZeroTwentyFive++);
-                }
-                if (!"0".equals(iec28VO.getE())) {
-                    int zeroTwentyFiveToZeroFive = iec28CountLessHundredFifty.getZeroTwentyFiveToZeroFive();
-                    iec28CountLessHundredFifty.setZeroTwentyFiveToZeroFive(zeroTwentyFiveToZeroFive++);
-                }
-                if (!"0".equals(iec28VO.getR())) {
-                    int zeroFiveToOne = iec28CountLessHundredFifty.getZeroFiveToOne();
-                    iec28CountLessHundredFifty.setZeroFiveToOne(zeroFiveToOne++);
-                }
-                if (!"0".equals(iec28VO.getT())) {
-                    int oneToThree = iec28CountLessHundredFifty.getOneToThree();
-                    iec28CountLessHundredFifty.setOneToThree(oneToThree++);
-                }
-                if (!"0".equals(iec28VO.getY())) {
-                    int threeToTwenty = iec28CountLessHundredFifty.getThreeToTwenty();
-                    iec28CountLessHundredFifty.setThreeToTwenty(threeToTwenty++);
-                }
-                if (!"0".equals(iec28VO.getU())) {
-                    int twentyToSixty = iec28CountLessHundredFifty.getTwentyToSixty();
-                    iec28CountLessHundredFifty.setTwentyToSixty(twentyToSixty++);
-                }
-                if (!"0".equals(iec28VO.getI())) {
-                    int sixtyToOneHundredAndEighty = iec28CountLessHundredFifty.getSixtyToOneHundredAndEighty();
-                    iec28CountLessHundredFifty.setSixtyToOneHundredAndEighty(sixtyToOneHundredAndEighty++);
-                }
-            }
-
-
-            //创建计数对象
-            IEC28CountParam iec28CountLessHundredSixty = new IEC28CountParam();
-
-            for (IEC28VO iec28VO : lessHundredSixtyIEC28) {
-                //获取当前剩余电压名称,不为空就进行添加
-                if (Objects.isNull(iec28CountLessHundredSixty.getName())) {
-                    iec28CountLessHundredSixty.setName(iec28VO.getName());
-                }
-                //如果参数不等于0对对象中的参数进行++
-                if (!"0".equals(iec28VO.getQ())) {
-                    int zeroZeroTwoToZeroOne = iec28CountLessHundredSixty.getZeroZeroTwoToZeroOne();
-                    iec28CountLessHundredSixty.setZeroZeroTwoToZeroOne(zeroZeroTwoToZeroOne++);
-                }
-                if (!"0".equals(iec28VO.getW())) {
-                    int zeroOneToZeroTwentyFive = iec28CountLessHundredSixty.getZeroOneToZeroTwentyFive();
-                    iec28CountLessHundredSixty.setZeroOneToZeroTwentyFive(zeroOneToZeroTwentyFive++);
-                }
-                if (!"0".equals(iec28VO.getE())) {
-                    int zeroTwentyFiveToZeroFive = iec28CountLessHundredSixty.getZeroTwentyFiveToZeroFive();
-                    iec28CountLessHundredSixty.setZeroTwentyFiveToZeroFive(zeroTwentyFiveToZeroFive++);
-                }
-                if (!"0".equals(iec28VO.getR())) {
-                    int zeroFiveToOne = iec28CountLessHundredSixty.getZeroFiveToOne();
-                    iec28CountLessHundredSixty.setZeroFiveToOne(zeroFiveToOne++);
-                }
-                if (!"0".equals(iec28VO.getT())) {
-                    int oneToThree = iec28CountLessHundredSixty.getOneToThree();
-                    iec28CountLessHundredSixty.setOneToThree(oneToThree++);
-                }
-                if (!"0".equals(iec28VO.getY())) {
-                    int threeToTwenty = iec28CountLessHundredSixty.getThreeToTwenty();
-                    iec28CountLessHundredSixty.setThreeToTwenty(threeToTwenty++);
-                }
-                if (!"0".equals(iec28VO.getU())) {
-                    int twentyToSixty = iec28CountLessHundredSixty.getTwentyToSixty();
-                    iec28CountLessHundredSixty.setTwentyToSixty(twentyToSixty++);
-                }
-                if (!"0".equals(iec28VO.getI())) {
-                    int sixtyToOneHundredAndEighty = iec28CountLessHundredSixty.getSixtyToOneHundredAndEighty();
-                    iec28CountLessHundredSixty.setSixtyToOneHundredAndEighty(sixtyToOneHundredAndEighty++);
-                }
-            }
-
-
-            //创建计数对象
-            IEC28CountParam iec28CountLessHundredSeventy = new IEC28CountParam();
-
-            for (IEC28VO iec28VO : lessHundredSeventyIEC28) {
-                //获取当前剩余电压名称,不为空就进行添加
-                if (Objects.isNull(iec28CountLessHundredSeventy.getName())) {
-                    iec28CountLessHundredSeventy.setName(iec28VO.getName());
-                }
-                //如果参数不等于0对对象中的参数进行++
-                if (!"0".equals(iec28VO.getQ())) {
-                    int zeroZeroTwoToZeroOne = iec28CountLessHundredSeventy.getZeroZeroTwoToZeroOne();
-                    iec28CountLessHundredSeventy.setZeroZeroTwoToZeroOne(zeroZeroTwoToZeroOne++);
-                }
-                if (!"0".equals(iec28VO.getW())) {
-                    int zeroOneToZeroTwentyFive = iec28CountLessHundredSeventy.getZeroOneToZeroTwentyFive();
-                    iec28CountLessHundredSeventy.setZeroOneToZeroTwentyFive(zeroOneToZeroTwentyFive++);
-                }
-                if (!"0".equals(iec28VO.getE())) {
-                    int zeroTwentyFiveToZeroFive = iec28CountLessHundredSeventy.getZeroTwentyFiveToZeroFive();
-                    iec28CountLessHundredSeventy.setZeroTwentyFiveToZeroFive(zeroTwentyFiveToZeroFive++);
-                }
-                if (!"0".equals(iec28VO.getR())) {
-                    int zeroFiveToOne = iec28CountLessHundredSeventy.getZeroFiveToOne();
-                    iec28CountLessHundredSeventy.setZeroFiveToOne(zeroFiveToOne++);
-                }
-                if (!"0".equals(iec28VO.getT())) {
-                    int oneToThree = iec28CountLessHundredSeventy.getOneToThree();
-                    iec28CountLessHundredSeventy.setOneToThree(oneToThree++);
-                }
-                if (!"0".equals(iec28VO.getY())) {
-                    int threeToTwenty = iec28CountLessHundredSeventy.getThreeToTwenty();
-                    iec28CountLessHundredSeventy.setThreeToTwenty(threeToTwenty++);
-                }
-                if (!"0".equals(iec28VO.getU())) {
-                    int twentyToSixty = iec28CountLessHundredSeventy.getTwentyToSixty();
-                    iec28CountLessHundredSeventy.setTwentyToSixty(twentyToSixty++);
-                }
-                if (!"0".equals(iec28VO.getI())) {
-                    int sixtyToOneHundredAndEighty = iec28CountLessHundredSeventy.getSixtyToOneHundredAndEighty();
-                    iec28CountLessHundredSeventy.setSixtyToOneHundredAndEighty(sixtyToOneHundredAndEighty++);
-                }
-            }
-
-
-            //创建计数对象
-            IEC28CountParam iec28CountLessHundredEighty = new IEC28CountParam();
-
-            for (IEC28VO iec28VO : lessHundredEightyIEC28) {
-                //获取当前剩余电压名称,不为空就进行添加
-                if (Objects.isNull(iec28CountLessHundredEighty.getName())) {
-                    iec28CountLessHundredEighty.setName(iec28VO.getName());
-                }
-                //如果参数不等于0对对象中的参数进行++
-                if (!"0".equals(iec28VO.getQ())) {
-                    int zeroZeroTwoToZeroOne = iec28CountLessHundredEighty.getZeroZeroTwoToZeroOne();
-                    iec28CountLessHundredEighty.setZeroZeroTwoToZeroOne(zeroZeroTwoToZeroOne++);
-                }
-                if (!"0".equals(iec28VO.getW())) {
-                    int zeroOneToZeroTwentyFive = iec28CountLessHundredEighty.getZeroOneToZeroTwentyFive();
-                    iec28CountLessHundredEighty.setZeroOneToZeroTwentyFive(zeroOneToZeroTwentyFive++);
-                }
-                if (!"0".equals(iec28VO.getE())) {
-                    int zeroTwentyFiveToZeroFive = iec28CountLessHundredEighty.getZeroTwentyFiveToZeroFive();
-                    iec28CountLessHundredEighty.setZeroTwentyFiveToZeroFive(zeroTwentyFiveToZeroFive++);
-                }
-                if (!"0".equals(iec28VO.getR())) {
-                    int zeroFiveToOne = iec28CountLessHundredEighty.getZeroFiveToOne();
-                    iec28CountLessHundredEighty.setZeroFiveToOne(zeroFiveToOne++);
-                }
-                if (!"0".equals(iec28VO.getT())) {
-                    int oneToThree = iec28CountLessHundredEighty.getOneToThree();
-                    iec28CountLessHundredEighty.setOneToThree(oneToThree++);
-                }
-                if (!"0".equals(iec28VO.getY())) {
-                    int threeToTwenty = iec28CountLessHundredEighty.getThreeToTwenty();
-                    iec28CountLessHundredEighty.setThreeToTwenty(threeToTwenty++);
-                }
-                if (!"0".equals(iec28VO.getU())) {
-                    int twentyToSixty = iec28CountLessHundredEighty.getTwentyToSixty();
-                    iec28CountLessHundredEighty.setTwentyToSixty(twentyToSixty++);
-                }
-                if (!"0".equals(iec28VO.getI())) {
-                    int sixtyToOneHundredAndEighty = iec28CountLessHundredEighty.getSixtyToOneHundredAndEighty();
-                    iec28CountLessHundredEighty.setSixtyToOneHundredAndEighty(sixtyToOneHundredAndEighty++);
-                }
-            }
-
-            /**
-             * =========================第三张表结束===============================
-             */
-
-
-            //汇总放入集合
-            List<IEC411CountParam> iec411Result = new ArrayList<>();
-            iec411Result.add(iec411LessOne);
-            iec411Result.add(iec411LessForty);
-            iec411Result.add(iec411LessSeventy);
-
-            List<DISDIPCountParam> disdipResult = new ArrayList<>();
-            disdipResult.add(disdipEqualTen);
-            disdipResult.add(disdipEqualForty);
-            disdipResult.add(disdipEqualSeventy);
-            disdipResult.add(disdipEqualEighty);
-            disdipResult.add(disdipEqualNinety);
-
-            List<IEC28CountParam> iec28Result = new ArrayList<>();
-            iec28Result.add(iec28CountLessOne);
-            iec28Result.add(iec28CountLessTen);
-            iec28Result.add(iec28CountLessTwenty);
-            iec28Result.add(iec28CountLessThirty);
-            iec28Result.add(iec28CountLessForty);
-            iec28Result.add(iec28CountLessFifty);
-            iec28Result.add(iec28CountLessSixty);
-            iec28Result.add(iec28CountLessSeventy);
-            iec28Result.add(iec28CountLessEighty);
-            iec28Result.add(iec28CountLessNinety);
-            iec28Result.add(iec28CountLessHundredTwenty);
-            iec28Result.add(iec28CountLessHundredThirty);
-            iec28Result.add(iec28CountLessHundredForty);
-            iec28Result.add(iec28CountLessHundredFifty);
-            iec28Result.add(iec28CountLessHundredSixty);
-            iec28Result.add(iec28CountLessHundredSeventy);
-            iec28Result.add(iec28CountLessHundredEighty);
-
-
-            Map<String, Integer> resultMap = new HashMap<>();
-
-            for (int i = 0; i < iec28Result.size(); i++) {
-
-                resultMap.put(iec28Result.get(i).getName(), iec28Result.get(i).getSixtyToOneHundredAndEighty());
-                resultMap.put(iec28Result.get(i).getName(), iec28Result.get(i).getOneToThree());
-                resultMap.put(iec28Result.get(i).getName(), iec28Result.get(i).getZeroFiveToOne());
-                resultMap.put(iec28Result.get(i).getName(), iec28Result.get(i).getZeroOneToZeroTwentyFive());
-                resultMap.put(iec28Result.get(i).getName(), iec28Result.get(i).getZeroTwentyFiveToZeroFive());
-                resultMap.put(iec28Result.get(i).getName(), iec28Result.get(i).getThreeToTwenty());
-                resultMap.put(iec28Result.get(i).getName(), iec28Result.get(i).getTwentyToSixty());
-                resultMap.put(iec28Result.get(i).getName(), iec28Result.get(i).getZeroZeroTwoToZeroOne());
-            }
-
-            //todo 还要对集合中哪个次数最多挑出第一位
-            Map<String, Integer> linkMap = getSort(resultMap);
-
-            //存放结果的集合
-            List<String> resultList = new ArrayList<String>();
-
-            for (String s : linkMap.keySet()) {
-                resultList.add(s);
-                resultList.add(linkMap.get(s).toString());
-            }
-
-            //最多暂降事件名称
-            for (int i = 0; i < iec28Result.size(); i++) {
-                if (iec28Result.get(i).getName().equals(resultList.get(0))) {
-                    if (resultList.get(1).equals(String.valueOf(iec28Result.get(i).getZeroZeroTwoToZeroOne()))) {
-                        resultList.add("0.02~0.1");
-                        break;
-                    } else if (resultList.get(1).equals(String.valueOf(iec28Result.get(i).getZeroOneToZeroTwentyFive()))) {
-                        resultList.add("0.1~0.25");
-                        break;
-                    } else if (resultList.get(1).equals(String.valueOf(iec28Result.get(i).getZeroTwentyFiveToZeroFive()))) {
-                        resultList.add("0.25~0.5");
-                        break;
-                    } else if (resultList.get(1).equals(String.valueOf(iec28Result.get(i).getZeroFiveToOne()))) {
-                        resultList.add("0.5~1");
-                        break;
-                    } else if (resultList.get(1).equals(String.valueOf(iec28Result.get(i).getOneToThree()))) {
-                        resultList.add("1~3");
-                        break;
-                    } else if (resultList.get(1).equals(String.valueOf(iec28Result.get(i).getThreeToTwenty()))) {
-                        resultList.add("3~20");
-                        break;
-                    } else if (resultList.get(1).equals(String.valueOf(iec28Result.get(i).getTwentyToSixty()))) {
-                        resultList.add("20~60");
-                        break;
-                    } else if (resultList.get(1).equals(String.valueOf(iec28Result.get(i).getSixtyToOneHundredAndEighty()))) {
-                        resultList.add("60~180");
-                        break;
-                    }
-                }
-            }
-            //System.out.println(resultList);
-
-
-            //3.1密度密度表格
+            int i  = oneCount;
+            createTitle(doc, "4." + i + " 暂降密度", "标题 2", 200, 15);
+            int two = 1;
             if (areaReportParam.isDensityTable()) {
-                //创建表题计数
-                int twoCount = 1;
-
-                //同步给暂降密度图
-                oneCount4 = oneCount;
-
-                createTitle(doc, "4." + oneCount + " " + typeName + "密度", "标题 2", 200, 11);
-
-                p = doc.createParagraph();// 新建一个段落
-                p.setAlignment(ParagraphAlignment.BOTH);
-                XWPFRun r12 = p.createRun();//创建段落文本
-                r12.setText("  " + typeName + "密度统计可以从幅值和持续时间两个维度直接地反映" + typeName + "事件发生情况，主要反应事件的发生次数，" +
-                        "中国电网在所选择的分析时间内" + typeName + "事件主要集中在幅值为" + resultList.get(0) + "，持续时间为" + resultList.get(2) + "[根据 IEC 61000-2-8:(公共电网电压" + typeName + "测量统计)算出" + typeName + "事件发生最多的区间],具体见表（图）：");
-                r12.setFontSize(11);//字体大小
-
-
-                createTitle(doc, "4." + oneCount + "." + twoCount + " DISDIP表格:国际发配电联盟(UNIPEDE)", "标题 3", 400, 11);
-
-                //第一张表
-                XWPFTable monitorInfo = createTable(doc);
-                XWPFParagraph monitorInfoExcelParagraph = WordUtils.getCenterParagraph(doc);
-
-                // 表格第一行
-                insertRow(doc, monitorInfo, monitorInfoExcelParagraph, true, "剩余电压", "20ms", "100ms", "500ms", "1s", "3s", "20s", "60s", "180s");
-
-
-                //塞入数据
-                for (int i = 0; i < disdipResult.size(); i++) {
-                    insertRow(doc, monitorInfo, monitorInfoExcelParagraph, false, disdipResult.get(i).getName(), String.valueOf(disdipResult.get(i).getTwentyMS()),
-                            String.valueOf(disdipResult.get(i).getOneHundredMS()), String.valueOf(disdipResult.get(i).getFiveHundredMS()), String.valueOf(disdipResult.get(i).getOne()), String.valueOf(disdipResult.get(i).getThree()),
-                            String.valueOf(disdipResult.get(i).getTwenty()), String.valueOf(disdipResult.get(i).getSixty()), String.valueOf(disdipResult.get(i).getOneHundredAndEighty()));
-                }
-
-                twoCount++;
-
-
-                createTitle(doc, "4." + oneCount + "." + twoCount + " IEC 61000-4-11:(用电终端的电压" + typeName + "抗度)", "标题 3", 400, 11);
-
-                //第二张表
-                XWPFTable monitorInfo1 = createTable(doc);
-                XWPFParagraph monitorInfoExcelParagraph1 = WordUtils.getCenterParagraph(doc);
-
-                // 表格第一行
-                insertRow(doc, monitorInfo1, monitorInfoExcelParagraph1, true, "剩余电压", "10~20ms", "20~100ms", "0.1~0.2s", "0.2~0.5s", "0.5~1s", ">1s");
-
-
-                //塞入数据
-                for (int i = 0; i < iec411Result.size(); i++) {
-                    insertRow(doc, monitorInfo1, monitorInfoExcelParagraph1, false, iec411Result.get(i).getName(), String.valueOf(iec411Result.get(i).getTenToTwenty()), String.valueOf(iec411Result.get(i).getTwentyToHundred()),
-                            String.valueOf(iec411Result.get(i).getZeroOneToZeroTwo()), String.valueOf(iec411Result.get(i).getZeroTwoToZeroFive()), String.valueOf(iec411Result.get(i).getZeroFiveToOne()), String.valueOf(iec411Result.get(i).getLessOne()));
-                }
-
-                twoCount++;
-
-
-                createTitle(doc, "4." + oneCount + "." + twoCount + " IEC 61000-2-8:(公共电网电压" + typeName + "测量统计)", "标题 3", 400, 11);
-
-                //第二张表
-                XWPFTable monitorInfo2 = createTable(doc);
-                XWPFParagraph monitorInfoExcelParagraph2 = WordUtils.getCenterParagraph(doc);
-
-                // 表格第一行
-                insertRow(doc, monitorInfo2, monitorInfoExcelParagraph2, true, "剩余电压", "0.02~0.1s", "0.1~0.25s", "0.25~0.5s", "0.5~1s", "1~3s", "3~20s", "20~60s", "60~180s");
-
-
-                //塞入数据
-                for (int i = 0; i < iec28Result.size(); i++) {
-                    insertRow(doc, monitorInfo2, monitorInfoExcelParagraph2, false, iec28Result.get(i).getName(), String.valueOf(iec28Result.get(i).getZeroZeroTwoToZeroOne()), String.valueOf(iec28Result.get(i).getZeroOneToZeroTwentyFive()),
-                            String.valueOf(iec28Result.get(i).getZeroTwentyFiveToZeroFive()), String.valueOf(iec28Result.get(i).getZeroFiveToOne()), String.valueOf(iec28Result.get(i).getOneToThree()), String.valueOf(iec28Result.get(i).getThreeToTwenty()),
-                            String.valueOf(iec28Result.get(i).getTwentyToSixty()), String.valueOf(iec28Result.get(i).getSixtyToOneHundredAndEighty()));
-                }
-
-                //同步给暂降密度表格
-                twoCount1 = twoCount;
-                //序号计数进行++
-                oneCount++;
+                createTitle(doc, "4." + i + "." + two + " 暂降密度点图", "标题 3", 400, 15);
+                Integer[][] eventDensityData = eventReportService.getCoords(eventDetails);
+                String str = drawPicUtil.drawEventDensity(eventDensityData);
+                createPic(doc, str, "暂降密度图");
+                two++;
             }
-
-            //3.2暂降密度图表
             if (areaReportParam.isDensityChart()) {
+                XWPFParagraph centerParagraph = WordUtils.getCenterParagraph(doc);
+                createTitle(doc, "4." + i + "." + two + " DISDIP 表格:国际发配电联盟(UNIPEDE)", "标题 3", 400, 15);
+//                List<DISDIPVO> eventDisdip = eventAnalysisService.eventDisdip(new StatisticsParam(exportParam.getLineId(), exportParam.getSearchBeginTime(), exportParam.getSearchEndTime(),exportParam.getFlag()));
+                List<DISDIPVO> eventDisdip = eventReportService.eventDisdip(eventDetails);
 
-                //如果暂降幅值被勾选,就不需要进行写段落
-                if (areaReportParam.isDensityTable()) {
-                    twoCount1++;
-
-                    //如果幅值图存在与幅值的序号保持同步
-                    createTitle(doc, "4." + oneCount4 + "." + twoCount1 + " " + typeName + "密度图", "标题 3", 400, 11);
-
-                    //代码
-                    List<EventDetail> eventDetails = BeanUtil.copyToList(info, EventDetail.class);
-                    Integer[][] eventDensityData = eventReportService.getCoords(eventDetails);
-                    String str = drawPicUtil.drawEventDensity(eventDensityData);
-                    createPic(doc, str, "" + typeName + "密度图形");
-                } else {
-                    int twoCount = 1;
-                    createTitle(doc, "4." + oneCount + " " + typeName + "密度", "标题 2", 200, 11);
-
-                    p = doc.createParagraph();// 新建一个段落
-                    p.setAlignment(ParagraphAlignment.BOTH);
-                    XWPFRun r12 = p.createRun();//创建段落文本
-                    r12.setText("  " + typeName + "密度统计可以从幅值和持续时间两个维度直接地反映" + typeName + "事件发生情况，主要反应事件的发生次数，" +
-                            "中国电网在所选择的分析时间内" + typeName + "事件主要集中在幅值为" + resultList.get(0) + "，持续时间为" + resultList.get(2) + "[根据 IEC 61000-2-8:(公共电网电压" + typeName + "测量统计)算出" + typeName + "事件发生最多的区间],具体见表（图）：");
-                    r12.setFontSize(11);//字体大小
-
-
-                    createTitle(doc, "4." + oneCount + "." + twoCount + " " + typeName + "密度图", "标题 3", 400, 11);
-
-
-                    //代码
-                    List<EventDetail> eventDetails = BeanUtil.copyToList(info, EventDetail.class);
-                    Integer[][] eventDensityData = eventReportService.getCoords(eventDetails);
-                    String str = drawPicUtil.drawEventDensity(eventDensityData);
-                    createPic(doc, str, "" + typeName + "密度图形");
-
-                    //序号计数进行++
-                    oneCount++;
+                XWPFTable table1 = createTable(doc);
+                insertRow(doc, table1, centerParagraph, true, "剩余电压", "20ms", "100ms", "500ms", "1s", "3s", "20s", "60s", "180s");
+                for (int j = 0; j < eventDisdip.size(); j++) {
+                    DISDIPVO disdipvo = eventDisdip.get(j);
+                    insertRow(doc, table1, centerParagraph, false, disdipvo.getName(), disdipvo.getTwentyMs(), disdipvo.getOneHundredMs(), disdipvo.getFiveHundredMs(), disdipvo.getOneS(), disdipvo.getThreeS(), disdipvo.getTwentyS(), disdipvo.getSixtyS(), disdipvo.getOneEightyS());
                 }
+                two++;
+                createTitle(doc, "4." + i + "." + two + " IEC 61000-4-11:(用电终端的电压暂降抗度)", "标题 3", 400, 15);
+//                List<IEC411VO> iec411VOS = eventAnalysisService.IEC411(new StatisticsParam(exportParam.getLineId(), exportParam.getSearchBeginTime(), exportParam.getSearchEndTime(),exportParam.getFlag()));
+                List<IEC411VO> iec411VOS = eventReportService.IEC411(eventDetails);
+                XWPFTable table2 = createTable(doc);
+                insertRow(doc, table2, centerParagraph, true, "剩余电压", "10~20ms", "20~100ms", "0.1~0.2s", "0.2~0.5s", "0.5~1s", ">1s");
+                for (int j = 0; j < iec411VOS.size(); j++) {
+                    IEC411VO iec411VO = iec411VOS.get(j);
+                    insertRow(doc, table2, centerParagraph, false, iec411VO.getName(), iec411VO.getTenTwentyMs(), iec411VO.getTwentyOneHundredMs(), iec411VO.getZeroPiontOneTwoS(), iec411VO.getZeroPiontTwoFiveS(), iec411VO.getZeroPiontFive1S(), iec411VO.getGreater1S());
+                }
+                two++;
+                createTitle(doc, "4." + i + "." + two + " IEC 61000-2-8:(公共电网电压暂降测量统计)", "标题 3", 400, 15);
+//                List<IEC28VO> iec28VOS = eventAnalysisService.IEC28(new StatisticsParam(exportParam.getLineId(), exportParam.getSearchBeginTime(), exportParam.getSearchEndTime(),exportParam.getFlag()));
+                List<IEC28VO> iec28VOS = eventReportService.IEC28(eventDetails);
+                XWPFTable table3 = createTable(doc);
+                insertRow(doc, table3, centerParagraph, true, "剩余电压", "0.02~0.1s", "0.1~0.25s", "0.25~0.5s", "0.5s~1s", "1~3s", "3~20s", "20~60s", "60~180s");
+                for (int j = 0; j < iec28VOS.size(); j++) {
+                    IEC28VO iec28VO = iec28VOS.get(j);
+                    insertRow(doc, table3, centerParagraph, false, iec28VO.getName(), iec28VO.getQ(), iec28VO.getW(), iec28VO.getE(), iec28VO.getR(), iec28VO.getT(), iec28VO.getY(), iec28VO.getU(), iec28VO.getI());
+                }
+                two++;
             }
+            oneCount++;
         }
-
         //4.itic图
         if (areaReportParam.isItic()) {
             //itic图
@@ -4402,261 +4458,294 @@ public class ReportServiceImpl implements ReportService {
         }
 
         //6.暂降增幅
-        if (areaReportParam.isSagAmplitude()) {
-            //暂降分布幅值
-            //创建结果集合
-            List<EventDetailNew> info = eventDetailList;
 
-            //将sql结果集放入,共用一个sql,减少查询时间
-            AreaTableParam areaTableParam1 = new AreaTableParam();
-            areaTableParam1.setStartTime(areaReportParam.getSearchBeginTime());
-            areaTableParam1.setEndTime(areaReportParam.getSearchEndTime());
-            areaTableParam1.setInfo(info);
-            ProbabilityVO probabilityDistributionArea = getProbabilityDistributionArea(areaTableParam1);
-
-
-            List<String> eventvalue = probabilityDistributionArea.getEventvalue();
-
-            List<AmplitudeCountParam> amplitudeList = new ArrayList<>();
-
-            List<String> xName = new ArrayList<>();
-            xName.add("0");
-            xName.add("10%");
-            xName.add("20%");
-            xName.add("30%");
-            xName.add("40%");
-            xName.add("50%");
-            xName.add("60%");
-            xName.add("70%");
-            xName.add("80%");
-            xName.add("90%");
-            //将幅值绑定对应的x值,放入集合
-            for (int i = 0; i < eventvalue.size(); i++) {
-                AmplitudeCountParam amplitudeCountParam = new AmplitudeCountParam();
-                amplitudeCountParam.setXName(xName.get(i));
-                amplitudeCountParam.setYValue(eventvalue.get(i));
-                amplitudeList.add(amplitudeCountParam);
-            }
-            //存储幅值结果集合
-            List<String> amplitudeResult = new ArrayList<>();
-            for (int i = 1; i < amplitudeList.size(); i++) {
-                if (!amplitudeList.get(i).getYValue().equals(amplitudeList.get(i - 1).getYValue())) {
-                    amplitudeResult.add(amplitudeList.get(i - 1).getXName());
-                    amplitudeResult.add(amplitudeList.get(i).getXName());
-                    break;
-                } else if (amplitudeList.get(0).getYValue().equals(amplitudeList.get(amplitudeList.size() - 1).getYValue())) {
-                    amplitudeResult.add(amplitudeList.get(0).getXName());
-                    amplitudeResult.add(amplitudeList.get(amplitudeList.size() - 1).getXName());
-                    break;
-                }
-            }
-
-
-            List<String> eventvalue1 = probabilityDistributionArea.getSisttime();
-
-            List<AmplitudeCountParam> amplitudeList1 = new ArrayList<>();
-
-            List<String> xName1 = new ArrayList<>();
-            xName1.add("0.01");
-            xName1.add("0.1");
-            xName1.add("0.25");
-            xName1.add("0.5");
-            xName1.add("1");
-            xName1.add("3");
-            xName1.add("20");
-            xName1.add("60");
-            xName1.add("180");
-            //将幅值绑定对应的x值,放入集合
-            for (int i = 0; i < eventvalue1.size(); i++) {
-                AmplitudeCountParam amplitudeCountParam = new AmplitudeCountParam();
-                amplitudeCountParam.setXName(xName1.get(i));
-                amplitudeCountParam.setYValue(eventvalue1.get(i));
-                amplitudeList1.add(amplitudeCountParam);
-            }
-            //存储幅值结果集合
-            List<String> amplitudeResult1 = new ArrayList<>();
-            for (int i = 1; i < amplitudeList1.size(); i++) {
-                if (!amplitudeList1.get(i).getYValue().equals(amplitudeList1.get(i - 1).getYValue())) {
-                    amplitudeResult1.add(amplitudeList1.get(i - 1).getXName());
-                    amplitudeResult1.add(amplitudeList1.get(i).getXName());
-                    break;
-                } else if (amplitudeList1.get(0).getYValue().equals(amplitudeList1.get(amplitudeList1.size() - 1).getYValue())) {
-                    amplitudeResult1.add(amplitudeList1.get(0).getXName());
-                    amplitudeResult1.add(amplitudeList1.get(amplitudeList1.size() - 1).getXName());
-                    break;
-                }
-            }
-
-
-            /**
-             * =========================续写word文档==============================================
-             */
-            //创建表题计数
-            int twoCount = 1;
-
-            oneCount2 = oneCount;
-
-            createTitle(doc, "4." + oneCount2 + " " + typeName + "幅值概率分布图", "标题 2", 200, 11);
-
-            p = doc.createParagraph();// 新建一个段落
-            p.setAlignment(ParagraphAlignment.BOTH);
-            XWPFRun r12 = p.createRun();//创建段落文本
-            r12.setText("  " + typeName + "概率分布图分成" + typeName + "幅值概率分布和持续时间概率分布图，中国电网在所选择的分析时间内" + typeName + "事件从幅值概率分布统计主要集中在幅值为" + amplitudeResult.get(0) + "~" + amplitudeResult.get(1) + "之间，" +
-                    "从持续时间统计主要集中在持续时间为" + amplitudeResult1.get(0) + "~" + amplitudeResult1.get(1) + "[持续时间排序，选择" + typeName + "记录发生最多的区域]，如下表（图）：");
-            r12.setFontSize(11);//字体大小
-
-
-            createTitle(doc, "4." + oneCount + "." + twoCount + " " + typeName + "幅值的概率分布", "标题 3", 400, 11);
-
-
-            List<String> ybardata = probabilityDistributionArea.getPereventvalue();
-            List<String> ylinedata = probabilityDistributionArea.getEventvalue();
-            String fz = drawPicUtil.drawEventAmplitude(ylinedata, ybardata);
-            createPic(doc, fz, "" + typeName + "幅值的概率分布");
-
-
-            //序号计数进行++
-            oneCount++;
-
-            /**
-             * =======================================word结束=========================================
-             */
-
-        }
+//        if (areaReportParam.isSagAmplitude()) {
+//            //暂降分布幅值
+//            //创建结果集合
+//            List<EventDetailNew> info = eventDetailList;
+//
+//            //将sql结果集放入,共用一个sql,减少查询时间
+//            AreaTableParam areaTableParam1 = new AreaTableParam();
+//            areaTableParam1.setStartTime(areaReportParam.getSearchBeginTime());
+//            areaTableParam1.setEndTime(areaReportParam.getSearchEndTime());
+//            areaTableParam1.setInfo(info);
+//            ProbabilityVO probabilityDistributionArea = getProbabilityDistributionArea(areaTableParam1);
+//
+//
+//            List<String> eventvalue = probabilityDistributionArea.getEventvalue();
+//
+//            List<AmplitudeCountParam> amplitudeList = new ArrayList<>();
+//
+//            List<String> xName = new ArrayList<>();
+//            xName.add("0");
+//            xName.add("10%");
+//            xName.add("20%");
+//            xName.add("30%");
+//            xName.add("40%");
+//            xName.add("50%");
+//            xName.add("60%");
+//            xName.add("70%");
+//            xName.add("80%");
+//            xName.add("90%");
+//            //将幅值绑定对应的x值,放入集合
+//            for (int i = 0; i < eventvalue.size(); i++) {
+//                AmplitudeCountParam amplitudeCountParam = new AmplitudeCountParam();
+//                amplitudeCountParam.setXName(xName.get(i));
+//                amplitudeCountParam.setYValue(eventvalue.get(i));
+//                amplitudeList.add(amplitudeCountParam);
+//            }
+//            //存储幅值结果集合
+//            List<String> amplitudeResult = new ArrayList<>();
+//            for (int i = 1; i < amplitudeList.size(); i++) {
+//                if (!amplitudeList.get(i).getYValue().equals(amplitudeList.get(i - 1).getYValue())) {
+//                    amplitudeResult.add(amplitudeList.get(i - 1).getXName());
+//                    amplitudeResult.add(amplitudeList.get(i).getXName());
+//                    break;
+//                } else if (amplitudeList.get(0).getYValue().equals(amplitudeList.get(amplitudeList.size() - 1).getYValue())) {
+//                    amplitudeResult.add(amplitudeList.get(0).getXName());
+//                    amplitudeResult.add(amplitudeList.get(amplitudeList.size() - 1).getXName());
+//                    break;
+//                }
+//            }
+//
+//
+//            List<String> eventvalue1 = probabilityDistributionArea.getSisttime();
+//
+//            List<AmplitudeCountParam> amplitudeList1 = new ArrayList<>();
+//
+//            List<String> xName1 = new ArrayList<>();
+//            xName1.add("0.01");
+//            xName1.add("0.1");
+//            xName1.add("0.25");
+//            xName1.add("0.5");
+//            xName1.add("1");
+//            xName1.add("3");
+//            xName1.add("20");
+//            xName1.add("60");
+//            xName1.add("180");
+//            //将幅值绑定对应的x值,放入集合
+//            for (int i = 0; i < eventvalue1.size(); i++) {
+//                AmplitudeCountParam amplitudeCountParam = new AmplitudeCountParam();
+//                amplitudeCountParam.setXName(xName1.get(i));
+//                amplitudeCountParam.setYValue(eventvalue1.get(i));
+//                amplitudeList1.add(amplitudeCountParam);
+//            }
+//            //存储幅值结果集合
+////            List<String> amplitudeResult1 = new ArrayList<>();
+//            for (int i = 1; i < amplitudeList1.size(); i++) {
+//                if (!amplitudeList1.get(i).getYValue().equals(amplitudeList1.get(i - 1).getYValue())) {
+//                    amplitudeResult1.add(amplitudeList1.get(i - 1).getXName());
+//                    amplitudeResult1.add(amplitudeList1.get(i).getXName());
+//                    break;
+//                } else if (amplitudeList1.get(0).getYValue().equals(amplitudeList1.get(amplitudeList1.size() - 1).getYValue())) {
+//                    amplitudeResult1.add(amplitudeList1.get(0).getXName());
+//                    amplitudeResult1.add(amplitudeList1.get(amplitudeList1.size() - 1).getXName());
+//                    break;
+//                }
+//            }
+//
+//
+//            /**
+//             * =========================续写word文档==============================================
+//             */
+//            //创建表题计数
+//            int twoCount = 1;
+//
+//            oneCount2 = oneCount;
+//
+//            createTitle(doc, "4." + oneCount2 + " " + typeName + "幅值概率分布图", "标题 2", 200, 11);
+//
+//            p = doc.createParagraph();// 新建一个段落
+//            p.setAlignment(ParagraphAlignment.BOTH);
+//            XWPFRun r12 = p.createRun();//创建段落文本
+//            r12.setText("  " + typeName + "概率分布图分成" + typeName + "幅值概率分布和持续时间概率分布图，中国电网在所选择的分析时间内" + typeName + "事件从幅值概率分布统计主要集中在幅值为" + amplitudeResult.get(0) + "~" + amplitudeResult.get(1) + "之间，" +
+//                    "从持续时间统计主要集中在持续时间为" + amplitudeResult1.get(0) + "~" + amplitudeResult1.get(1) + "[持续时间排序，选择" + typeName + "记录发生最多的区域]，如下表（图）：");
+//            r12.setFontSize(11);//字体大小
+//
+//
+//            createTitle(doc, "4." + oneCount + "." + twoCount + " " + typeName + "幅值的概率分布", "标题 3", 400, 11);
+//
+//
+//            List<String> ybardata = probabilityDistributionArea.getPereventvalue();
+//            List<String> ylinedata = probabilityDistributionArea.getEventvalue();
+//            String fz = drawPicUtil.drawEventAmplitude(ylinedata, ybardata);
+//            createPic(doc, fz, "" + typeName + "幅值的概率分布");
+//
+//
+//            //序号计数进行++
+//            oneCount++;
+//
+//            /**
+//             * =======================================word结束=========================================
+//             */
+//
+//        }
 
         //7.暂降持续时间
-        if (areaReportParam.isDuration()) {
-
-            //持续时间概率分布
-            AreaTableParam areaTableParam = new AreaTableParam();
-
-            //创建结果集合
-            List<EventDetailNew> info = eventDetailList;
-
-            //将sql结果集放入,共用一个sql,减少查询时间
-            AreaTableParam areaTableParam1 = new AreaTableParam();
-            areaTableParam1.setInfo(info);
-            ProbabilityVO probabilityDistributionArea = getProbabilityDistributionArea(areaTableParam1);
-
-            List<String> eventvalue = probabilityDistributionArea.getEventvalue();
-            List<AmplitudeCountParam> amplitudeList = new ArrayList<>();
-
-            List<String> xName = new ArrayList<>();
-            xName.add("0");
-            xName.add("10%");
-            xName.add("20%");
-            xName.add("30%");
-            xName.add("40%");
-            xName.add("50%");
-            xName.add("60%");
-            xName.add("70%");
-            xName.add("80%");
-            xName.add("90%");
-            //将幅值绑定对应的x值,放入集合
-            for (int i = 0; i < eventvalue.size(); i++) {
-                AmplitudeCountParam amplitudeCountParam = new AmplitudeCountParam();
-                amplitudeCountParam.setXName(xName.get(i));
-                amplitudeCountParam.setYValue(eventvalue.get(i));
-                amplitudeList.add(amplitudeCountParam);
-            }
-            //存储幅值结果集合
-            List<String> amplitudeResult = new ArrayList<>();
-            for (int i = 1; i < amplitudeList.size(); i++) {
-                if (!amplitudeList.get(i).getYValue().equals(amplitudeList.get(i - 1).getYValue())) {
-                    amplitudeResult.add(amplitudeList.get(i - 1).getXName());
-                    amplitudeResult.add(amplitudeList.get(i).getXName());
-                    break;
-                } else if (amplitudeList.get(0).getYValue().equals(amplitudeList.get(amplitudeList.size() - 1).getYValue())) {
-                    amplitudeResult.add(amplitudeList.get(0).getXName());
-                    amplitudeResult.add(amplitudeList.get(amplitudeList.size() - 1).getXName());
-                    break;
-                }
-            }
-
-
-            List<String> eventvalue1 = probabilityDistributionArea.getSisttime();
-
-            List<AmplitudeCountParam> amplitudeList1 = new ArrayList<>();
-
-            List<String> xName1 = new ArrayList<>();
-            xName1.add("0.01");
-            xName1.add("0.1");
-            xName1.add("0.25");
-            xName1.add("0.5");
-            xName1.add("1");
-            xName1.add("3");
-            xName1.add("20");
-            xName1.add("60");
-            xName1.add("180");
-            //将幅值绑定对应的x值,放入集合
-            for (int i = 0; i < eventvalue1.size(); i++) {
-                AmplitudeCountParam amplitudeCountParam = new AmplitudeCountParam();
-                amplitudeCountParam.setXName(xName1.get(i));
-                amplitudeCountParam.setYValue(eventvalue1.get(i));
-                amplitudeList1.add(amplitudeCountParam);
-            }
-            //存储幅值结果集合
-            List<String> amplitudeResult1 = new ArrayList<>();
-            for (int i = 1; i < amplitudeList1.size(); i++) {
-                if (!amplitudeList1.get(i).getYValue().equals(amplitudeList1.get(i - 1).getYValue())) {
-                    amplitudeResult1.add(amplitudeList1.get(i - 1).getXName());
-                    amplitudeResult1.add(amplitudeList1.get(i).getXName());
-                    break;
-                } else if (amplitudeList1.get(0).getYValue().equals(amplitudeList1.get(amplitudeList1.size() - 1).getYValue())) {
-                    amplitudeResult1.add(amplitudeList1.get(0).getXName());
-                    amplitudeResult1.add(amplitudeList1.get(amplitudeList1.size() - 1).getXName());
-                    break;
-                }
-            }
-            /**
-             * =========================续写word文档==============================================
-             */
-
-            //创建表题计数
-            int twoCount = 1;
-
-            //如果暂降幅值被勾选,就不需要进行写段落
+//        if (areaReportParam.isDuration()) {
+//
+//            //持续时间概率分布
+//            AreaTableParam areaTableParam = new AreaTableParam();
+//
+//            //创建结果集合
+//            List<EventDetailNew> info = eventDetailList;
+//
+//            //将sql结果集放入,共用一个sql,减少查询时间
+//            AreaTableParam areaTableParam1 = new AreaTableParam();
+//            areaTableParam1.setInfo(info);
+//            ProbabilityVO probabilityDistributionArea = getProbabilityDistributionArea(areaTableParam1);
+//
+//            List<String> eventvalue = probabilityDistributionArea.getEventvalue();
+//            List<AmplitudeCountParam> amplitudeList = new ArrayList<>();
+//
+//            List<String> xName = new ArrayList<>();
+//            xName.add("0");
+//            xName.add("10%");
+//            xName.add("20%");
+//            xName.add("30%");
+//            xName.add("40%");
+//            xName.add("50%");
+//            xName.add("60%");
+//            xName.add("70%");
+//            xName.add("80%");
+//            xName.add("90%");
+//            //将幅值绑定对应的x值,放入集合
+//            for (int i = 0; i < eventvalue.size(); i++) {
+//                AmplitudeCountParam amplitudeCountParam = new AmplitudeCountParam();
+//                amplitudeCountParam.setXName(xName.get(i));
+//                amplitudeCountParam.setYValue(eventvalue.get(i));
+//                amplitudeList.add(amplitudeCountParam);
+//            }
+//            //存储幅值结果集合
+//            List<String> amplitudeResult = new ArrayList<>();
+//            for (int i = 1; i < amplitudeList.size(); i++) {
+//                if (!amplitudeList.get(i).getYValue().equals(amplitudeList.get(i - 1).getYValue())) {
+//                    amplitudeResult.add(amplitudeList.get(i - 1).getXName());
+//                    amplitudeResult.add(amplitudeList.get(i).getXName());
+//                    break;
+//                } else if (amplitudeList.get(0).getYValue().equals(amplitudeList.get(amplitudeList.size() - 1).getYValue())) {
+//                    amplitudeResult.add(amplitudeList.get(0).getXName());
+//                    amplitudeResult.add(amplitudeList.get(amplitudeList.size() - 1).getXName());
+//                    break;
+//                }
+//            }
+//
+//
+//            List<String> eventvalue1 = probabilityDistributionArea.getSisttime();
+//
+//            List<AmplitudeCountParam> amplitudeList1 = new ArrayList<>();
+//
+//            List<String> xName1 = new ArrayList<>();
+//            xName1.add("0.01");
+//            xName1.add("0.1");
+//            xName1.add("0.25");
+//            xName1.add("0.5");
+//            xName1.add("1");
+//            xName1.add("3");
+//            xName1.add("20");
+//            xName1.add("60");
+//            xName1.add("180");
+//            //将幅值绑定对应的x值,放入集合
+//            for (int i = 0; i < eventvalue1.size(); i++) {
+//                AmplitudeCountParam amplitudeCountParam = new AmplitudeCountParam();
+//                amplitudeCountParam.setXName(xName1.get(i));
+//                amplitudeCountParam.setYValue(eventvalue1.get(i));
+//                amplitudeList1.add(amplitudeCountParam);
+//            }
+//            //存储幅值结果集合
+//            List<String> amplitudeResult1 = new ArrayList<>();
+//            for (int i = 1; i < amplitudeList1.size(); i++) {
+//                if (!amplitudeList1.get(i).getYValue().equals(amplitudeList1.get(i - 1).getYValue())) {
+//                    amplitudeResult1.add(amplitudeList1.get(i - 1).getXName());
+//                    amplitudeResult1.add(amplitudeList1.get(i).getXName());
+//                    break;
+//                } else if (amplitudeList1.get(0).getYValue().equals(amplitudeList1.get(amplitudeList1.size() - 1).getYValue())) {
+//                    amplitudeResult1.add(amplitudeList1.get(0).getXName());
+//                    amplitudeResult1.add(amplitudeList1.get(amplitudeList1.size() - 1).getXName());
+//                    break;
+//                }
+//            }
+//            /**
+//             * =========================续写word文档==============================================
+//             */
+//
+//            //创建表题计数
+//            int twoCount = 1;
+//
+//            //如果暂降幅值被勾选,就不需要进行写段落
+//            if (areaReportParam.isSagAmplitude()) {
+//                twoCount++;
+//
+//                //如果幅值图存在与幅值的序号保持同步
+//                createTitle(doc, "4." + oneCount2 + "." + twoCount + " 持续时间的概率分函数", "标题 3", 400, 11);
+//
+//
+//                List<String> ybardata = probabilityDistributionArea.getPersisttime();
+//                List<String> ylinedata = probabilityDistributionArea.getSisttime();
+//                String sj = drawPicUtil.drawPersistentTime(ylinedata, ybardata);
+//                createPic(doc, sj, "持续时间的概率分布函数");
+//
+//
+//            } else {
+//                createTitle(doc, "4." + oneCount2 + " " + typeName + "幅值概率分布图", "标题 2", 200, 11);
+//
+//                p = doc.createParagraph();// 新建一个段落
+//                p.setAlignment(ParagraphAlignment.BOTH);
+//                XWPFRun r12 = p.createRun();//创建段落文本
+//                r12.setText("  " + typeName + "概率分布图分成" + typeName + "幅值概率分布和持续时间概率分布图，中国电网在所选择的分析时间内" + typeName + "事件从幅值概率分布统计主要集中在幅值为" + amplitudeResult.get(0) + "~" + amplitudeResult.get(1) + "之间，" +
+//                        "从持续时间统计主要集中在持续时间为" + amplitudeResult1.get(0) + "~" + amplitudeResult1.get(1) + "[持续时间排序，选择" + typeName + "记录发生最多的区域]，如下表（图）：");
+//                r12.setFontSize(11);//字体大小
+//
+//
+//                createTitle(doc, "4." + oneCount + "." + twoCount + " 时序时间的概率分函数", "标题 3", 400, 11);
+//
+//
+//                List<String> ybardata = probabilityDistributionArea.getPersisttime();
+//                List<String> ylinedata = probabilityDistributionArea.getSisttime();
+//                String sj = drawPicUtil.drawPersistentTime(ylinedata, ybardata);
+//                createPic(doc, sj, "持续时间的概率分布函数");
+//
+//
+//                //序号计数进行++
+//                oneCount++;
+//            }
+//            /**
+//             * =======================================word结束=========================================
+//             */
+//        }
+        //持续时间代码有问题注释掉
+        //4.暂降幅值概率分布
+        if (areaReportParam.isSagAmplitude() || areaReportParam.isDuration()) {
+            int i =oneCount;
+            createTitle(doc, "4." + i + " 暂降幅值概率分布图", "标题 2", 200, 15);
+            p.setAlignment(ParagraphAlignment.BOTH);
+            XWPFRun r12 = p.createRun();//创建段落文本
+//            r12.setText("  " + typeName + "概率分布图分成" + typeName + "幅值概率分布和持续时间概率分布图，中国电网在所选择的分析时间内" + typeName + "事件从幅值概率分布统计主要集中在幅值为" + amplitudeResult.get(0) + "~" + amplitudeResult.get(1) + "之间，" +
+//                    "从持续时间统计主要集中在持续时间为" + amplitudeResult1.get(0) + "~" + amplitudeResult1.get(1) + "[持续时间排序，选择" + typeName + "记录发生最多的区域]，如下表（图）：");
+//            r12.setFontSize(11);//字体大小
+//            ProbabilityVO probabilityVO = eventAnalysisService.getProbabilityDistribution(new StatisticsParam(exportParam.getLineId(), exportParam.getSearchBeginTime(), exportParam.getSearchEndTime(),exportParam.getFlag()));
+            ProbabilityVO probabilityVO = eventReportService.getProbabilityDistribution(eventDetails);
+            int two = 1;
             if (areaReportParam.isSagAmplitude()) {
-                twoCount++;
-
-                //如果幅值图存在与幅值的序号保持同步
-                createTitle(doc, "4." + oneCount2 + "." + twoCount + " 持续时间的概率分函数", "标题 3", 400, 11);
-
-
-                List<String> ybardata = probabilityDistributionArea.getPersisttime();
-                List<String> ylinedata = probabilityDistributionArea.getSisttime();
-                String sj = drawPicUtil.drawPersistentTime(ylinedata, ybardata);
-                createPic(doc, sj, "持续时间的概率分布函数");
-
-
-            } else {
-                createTitle(doc, "4." + oneCount2 + " " + typeName + "幅值概率分布图", "标题 2", 200, 11);
-
-                p = doc.createParagraph();// 新建一个段落
-                p.setAlignment(ParagraphAlignment.BOTH);
-                XWPFRun r12 = p.createRun();//创建段落文本
-                r12.setText("  " + typeName + "概率分布图分成" + typeName + "幅值概率分布和持续时间概率分布图，中国电网在所选择的分析时间内" + typeName + "事件从幅值概率分布统计主要集中在幅值为" + amplitudeResult.get(0) + "~" + amplitudeResult.get(1) + "之间，" +
-                        "从持续时间统计主要集中在持续时间为" + amplitudeResult1.get(0) + "~" + amplitudeResult1.get(1) + "[持续时间排序，选择" + typeName + "记录发生最多的区域]，如下表（图）：");
-                r12.setFontSize(11);//字体大小
-
-
-                createTitle(doc, "4." + oneCount + "." + twoCount + " 时序时间的概率分函数", "标题 3", 400, 11);
-
-
-                List<String> ybardata = probabilityDistributionArea.getPersisttime();
-                List<String> ylinedata = probabilityDistributionArea.getSisttime();
-                String sj = drawPicUtil.drawPersistentTime(ylinedata, ybardata);
-                createPic(doc, sj, "持续时间的概率分布函数");
-
-
-                //序号计数进行++
-                oneCount++;
+                createTitle(doc, "4." + i + "." + two + " 暂降幅值的概率分函数", "标题 3", 400, 15);
+                List<String> ybardata = probabilityVO.getPereventvalue();
+                List<String> ylinedata = probabilityVO.getEventvalue();
+                String fz = drawPicUtil.drawEventAmplitude(ylinedata, ybardata);
+                createPic(doc, fz, "暂降幅值的概率分布函数");
+                two++;
             }
-            /**
-             * =======================================word结束=========================================
-             */
+            if (areaReportParam.isDuration()) {
+                createTitle(doc, "4." + i + "." + two + " 持续时间的概率分函数", "标题 3", 400, 15);
+                List<String> ybardata = probabilityVO.getPersisttime();
+                List<String> ylinedata = probabilityVO.getSisttime();
+                String sj = drawPicUtil.drawPersistentTime(ylinedata, ybardata);
+                createPic(doc, sj, "持续时间的概率分布函数");
+                two++;
+            }
+            oneCount++;
         }
 
+
         //8.事件关联统计表格
         if (areaReportParam.isEventRelevanceCountTable()) {
             //事件关联统计表格
@@ -4862,7 +4951,7 @@ public class ReportServiceImpl implements ReportService {
             Map<String, Integer> resultMap = new HashMap<>();
 
             //优化数据（根据暂降类型，进行分组统计有多少条数据，key:暂降类型id，value：次数)
-            Map<String, Long> typeMapCount = eventDetailList.stream().collect(Collectors.groupingBy(EventDetailNew::getEventType, Collectors.counting()));
+            Map<String, Long> typeMapCount = eventDetailList.stream().filter(temp->Objects.nonNull(temp.getAdvanceType())).collect(Collectors.groupingBy(EventDetailNew::getAdvanceType, Collectors.counting()));
             //将数据重新整合为（key：暂降类型的名称，value:暂降类型次数）
             typeMap.forEach((key, value) -> {
                 if (typeMapCount.containsKey(key)) {
@@ -8956,7 +9045,9 @@ public class ReportServiceImpl implements ReportService {
                     )
                     .map(DictData::getId).collect(Collectors.toList());
         } else {
-            typeIds = dictType.stream().filter(x -> DicDataEnum.VOLTAGE_DIP.getCode().equals(x.getCode()))
+            //添加中断
+            typeIds = dictType.stream().filter(x -> DicDataEnum.VOLTAGE_DIP.getCode().equals(x.getCode())
+                    || DicDataEnum.SHORT_INTERRUPTIONS.getCode().equals(x.getCode()))
                     .map(DictData::getId).collect(Collectors.toList());
         }
         //数据暂降查询
diff --git a/pqs-event/event-common/src/main/java/com/njcn/event/common/service/impl/CommMonitorEventReportServiceImpl.java b/pqs-event/event-common/src/main/java/com/njcn/event/common/service/impl/CommMonitorEventReportServiceImpl.java
index 55d759c10..d71044d44 100644
--- a/pqs-event/event-common/src/main/java/com/njcn/event/common/service/impl/CommMonitorEventReportServiceImpl.java
+++ b/pqs-event/event-common/src/main/java/com/njcn/event/common/service/impl/CommMonitorEventReportServiceImpl.java
@@ -374,7 +374,11 @@ public class CommMonitorEventReportServiceImpl implements CommMonitorEventReport
         //6.1整合提出查询语句
         Boolean fly = exportParam.isYybg() || exportParam.isYytx() || exportParam.isLxbg() || exportParam.isLxtx();
         if (fly) {
-            StatisticVO statistic = eventReportService.getStatistic(info, reasonData, typeData);
+            List<DictData> tempDictType = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.EVENT_STATIS.getCode()).getData();
+            List<String> typeIds = tempDictType.stream().filter(x -> DicDataEnum.VOLTAGE_DIP.getCode().equals(x.getCode()) || DicDataEnum.SHORT_INTERRUPTIONS.getCode().equals(x.getCode()))
+                .map(DictData::getId).collect(Collectors.toList());
+            List<EventDetail> tempInfo = info.stream().filter(temp -> typeIds.contains(temp.getEventType())).collect(Collectors.toList());
+            StatisticVO statistic = eventReportService.getStatistic(tempInfo, reasonData, typeData);
             if (exportParam.isYybg() || exportParam.isYytx()) {
                 createTitle(doc, "4." + i + " 原因统计", "标题 2", 200, 15);
 //            StatisticVO statistic = eventAnalysisService.getStatistic(new StatisticsParam(exportParam.getLineId(), exportParam.getSearchBeginTime(), exportParam.getSearchEndTime(),exportParam.getFlag()));
@@ -571,14 +575,14 @@ public class CommMonitorEventReportServiceImpl implements CommMonitorEventReport
      * @return
      */
     private List<EventDetail> info(StatisticsParam statisticsParam) {
-        //获取事件类型
-        List<DictData> dictType = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.EVENT_STATIS.getCode()).getData();
-        List<String> typeIds = dictType.stream().filter(x -> DicDataEnum.VOLTAGE_DIP.getCode().equals(x.getCode()) || DicDataEnum.SHORT_INTERRUPTIONS.getCode().equals(x.getCode()))
-                .map(DictData::getId).collect(Collectors.toList());
+//        //获取事件类型
+//        List<DictData> dictType = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.EVENT_STATIS.getCode()).getData();
+//        List<String> typeIds = dictType.stream().filter(x -> DicDataEnum.VOLTAGE_DIP.getCode().equals(x.getCode()) || DicDataEnum.SHORT_INTERRUPTIONS.getCode().equals(x.getCode()))
+//                .map(DictData::getId).collect(Collectors.toList());
         //数据暂降查询
         List<RmpEventDetailPO> info = rmpEventDetailMapper.selectList(new LambdaQueryWrapper<RmpEventDetailPO>()
                 .eq(RmpEventDetailPO::getMeasurementPointId, statisticsParam.getLineIndex())
-                .in(RmpEventDetailPO::getEventType, typeIds)
+//                .in(RmpEventDetailPO::getEventType, typeIds)
                 .ge(StrUtil.isNotBlank(statisticsParam.getStartTime()), RmpEventDetailPO::getStartTime, DateUtil.beginOfDay(DateUtil.parse(statisticsParam.getStartTime())))
                 .le(StrUtil.isNotBlank(statisticsParam.getEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(statisticsParam.getEndTime())))
         );
diff --git a/pqs-event/event-common/src/main/java/com/njcn/event/common/service/impl/EventAnalysisServiceImpl.java b/pqs-event/event-common/src/main/java/com/njcn/event/common/service/impl/EventAnalysisServiceImpl.java
index 6fb18c827..a7771253a 100644
--- a/pqs-event/event-common/src/main/java/com/njcn/event/common/service/impl/EventAnalysisServiceImpl.java
+++ b/pqs-event/event-common/src/main/java/com/njcn/event/common/service/impl/EventAnalysisServiceImpl.java
@@ -941,37 +941,47 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
                 .le(StringUtils.isNotBlank(statisticsParam.getEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(statisticsParam.getEndTime())))
         );
 
-        List<DictData> reasonList = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.EVENT_REASON.getName()).getData();
-        Map<String,String> reasonData = reasonList.stream().collect(Collectors.toMap(DictData::getId, DictData::getName));
-        Map<String, Integer> reasonMap = convertMap(reasonData);
-        List<DictData> advanceTypeList = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.EVENT_TYPE.getName()).getData();
-        Map<String,String> advanceTypeData = advanceTypeList.stream().collect(Collectors.toMap(DictData::getId, DictData::getName));
-        Map<String, Integer> typeMap = convertMap(advanceTypeData);
+        HttpResult<List<DictData>> reason = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.EVENT_REASON.getName());
+        HttpResult<List<DictData>> type = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.EVENT_TYPE.getName());
+        List<DictData> reasonData = reason.getData();
+        List<DictData> typeData = type.getData();
 
+        Map<String, Integer> reasonMap = new LinkedHashMap<>();
+        Map<String, Integer> typeMap = new LinkedHashMap<>();
+
+        info = info.stream().filter(temp->Objects.nonNull(temp.getAdvanceReason())||Objects.nonNull(temp.getAdvanceType())).collect(Collectors.toList());
         //添加detail
         for (RmpEventDetailPO detail : info) {
-            EventDetail details = BeanUtil.copyProperties(detail, EventDetail.class);
-            if(StrUtil.isNotBlank(detail.getAdvanceType())){
-                details.setAdvanceType(advanceTypeData.get(detail.getAdvanceType()));
-            }else {
-                details.setAdvanceType(DicDataEnum.OTHER.getName());
+            EventDetail details = null;
+            if (typeList.contains(detail.getEventType())) {
+                for (DictData data : reasonData) {
+                    reasonMap.put(data.getName(), 0);
+                    //此处写法会报空指针异常修改写法
+                    if (Objects.equals(detail.getAdvanceReason(),data.getId())) {
+                        details = BeanUtil.copyProperties(detail, EventDetail.class);
+                        details.setAdvanceReason(data.getName());
+                    }
+                }
+                for (DictData data : typeData) {
+                    typeMap.put(data.getName(), 0);
+                    if (Objects.equals(detail.getAdvanceType(),data.getId())) {
+//                        details = BeanUtil.copyProperties(detail, EventDetail.class);
+                        details.setAdvanceType(data.getName());
+                    }
+                }
+                list.add(details);
             }
-            if(StrUtil.isNotBlank(detail.getAdvanceReason())){
-                details.setAdvanceReason(reasonData.get(detail.getAdvanceReason()));
-            }else {
-                details.setAdvanceReason(DicDataEnum.OTHER.getName());
-            }
-            list.add(details);
         }
+
         //添加reason到map
         for (EventDetail data : list) {
-            if (reasonMap.get(data.getAdvanceReason()) != null) {
+            if (Objects.nonNull(data.getAdvanceReason())&&reasonMap.get(data.getAdvanceReason()) != null) {
                 reasonMap.put(data.getAdvanceReason(), reasonMap.get(data.getAdvanceReason()) + 1);
             }
         }
         //添加type到map
         for (EventDetail data : list) {
-            if (typeMap.get(data.getAdvanceType()) != null) {
+            if (Objects.nonNull(data.getAdvanceType())&&typeMap.get(data.getAdvanceType()) != null) {
                 typeMap.put(data.getAdvanceType(), typeMap.get(data.getAdvanceType()) + 1);
             }
         }
@@ -985,29 +995,10 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
         }
         result.setTypes(typesVOS);
         result.setReason(reasonsVOS);
+        //result.setDetail(list);
         return result;
     }
 
-
-    /**
-     * 将原Map的value作为新Map的key，0作为新Map的value
-     * @param originalMap 原始Map（key和value唯一）
-     * @return 转换后的新Map
-     */
-    public static <K, V> Map<V, Integer> convertMap(Map<K, V> originalMap) {
-        // 创建新的HashMap存储结果
-        Map<V, Integer> newMap = new HashMap<>();
-
-        // 遍历原始Map的所有entry
-        for (Map.Entry<K, V> entry : originalMap.entrySet()) {
-            // 原value作为新key，0作为新value
-            V originalValue = entry.getValue();
-            newMap.put(originalValue, 0);
-        }
-
-        return newMap;
-    }
-
     /**
      * 暂降幅值的概率分布函数
      *
@@ -1337,12 +1328,12 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
 //            }
 //        }
         //获取电压暂降信息
-        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<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())
-                .in(RmpEventDetailPO::getEventType,typeList)
+//                .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())))
         );
diff --git a/pqs-event/event-common/src/main/java/com/njcn/event/common/service/impl/EventReportServiceImpl.java b/pqs-event/event-common/src/main/java/com/njcn/event/common/service/impl/EventReportServiceImpl.java
index 0c5e0a6f0..34ee87d3e 100644
--- a/pqs-event/event-common/src/main/java/com/njcn/event/common/service/impl/EventReportServiceImpl.java
+++ b/pqs-event/event-common/src/main/java/com/njcn/event/common/service/impl/EventReportServiceImpl.java
@@ -44,7 +44,8 @@ public class EventReportServiceImpl implements EventReportService {
         }
         for (int i = 0; i < info.size(); i++) {
             Double eventvalue = info.get(i).getFeatureAmplitude();
-            double persisttime = info.get(i).getDuration();
+            //mysql存的S要转换成ms
+            double persisttime = info.get(i).getDuration()*1000;
             if (eventvalue * 100 < 10) {
                 if (persisttime < 20) {
                     arr[4][0]++;
@@ -156,7 +157,8 @@ public class EventReportServiceImpl implements EventReportService {
         }
         for (int i = 0; i < info.size(); i++) {
             Double eventvalue = info.get(i).getFeatureAmplitude();
-            double persisttime = info.get(i).getDuration();
+            //mysql存的S要转换成ms
+            double persisttime = info.get(i).getDuration()*1000;
             if (eventvalue * 100 < 1) {
                 if (persisttime < 20 && persisttime >= 10) {
                     arr[2][0]++;
@@ -218,7 +220,9 @@ public class EventReportServiceImpl implements EventReportService {
         }
         for (int i = 0; i < info.size(); i++) {
             Double eventvalue = info.get(i).getFeatureAmplitude();
-            double persisttime = info.get(i).getDuration();
+            //mysql存的S要转换成ms
+            double persisttime = info.get(i).getDuration()*1000;
+
             if (eventvalue * 100 < 1 && eventvalue * 100 >= 0) {
                 if (persisttime > 10 && persisttime <= 100) {
                     arr[16][0]++;
@@ -709,7 +713,8 @@ public class EventReportServiceImpl implements EventReportService {
         timeMap.put("<180", 0);
         //求不同时间段的总数
         for (EventDetail eventDetail : info) {
-            Double persistTime = eventDetail.getDuration();
+            //转换成ms
+            Double persistTime = eventDetail.getDuration()*1000;
             if (persistTime / 1000 < 0.1) {
                 timeMap.put("<0.1", timeMap.get("<0.1") + 1);
             } else if (persistTime / 1000 > 0.1 && persistTime / 1000 < 0.25) {
@@ -770,7 +775,7 @@ public class EventReportServiceImpl implements EventReportService {
         //求sisttime
         List<String> sisttime = new ArrayList<>();
         for (EventDetail eventDetail : info) {
-            Double persistTime = eventDetail.getDuration();
+            Double persistTime = eventDetail.getDuration()*1000;
             if (persistTime / 1000 < 0.1) {
                 timeMap2.put("<0.1", timeMap2.get("<0.1") + 1);
             }