diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RStatEventOrgMServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RStatEventOrgMServiceImpl.java
index 05925b487..9c1d2e10b 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RStatEventOrgMServiceImpl.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RStatEventOrgMServiceImpl.java
@@ -68,8 +68,8 @@ public class RStatEventOrgMServiceImpl extends ServiceImpl<RStatEventOrgMMapper,
         List<RStatEventOrgM> list = statEventOrgMMapper.selectList(new LambdaQueryWrapper<RStatEventOrgM>()
                 .eq(RStatEventOrgM::getDataType, mainnetData.getId())
                 .in(RStatEventOrgM::getOrgNo, deptIds)
-                .ge(param.getStartTime() != null, RStatEventOrgM::getDataDate, param.getStartTime())
-                .le(param.getEndTime() != null, RStatEventOrgM::getDataDate, param.getEndTime()));
+                .ge(StrUtil.isNotBlank(param.getStartTime()), RStatEventOrgM::getDataDate, param.getStartTime())
+                .le(StrUtil.isNotBlank(param.getEndTime()), RStatEventOrgM::getDataDate, param.getEndTime()));
 
         //初始化指标类型（横向）
         List<RArrayVO> arrayVOList = new ArrayList<>();
@@ -219,7 +219,9 @@ public class RStatEventOrgMServiceImpl extends ServiceImpl<RStatEventOrgMMapper,
                 .collect(Collectors.toMap(DictData::getId, Function.identity()));
 
         //子节点 获取所有得各单位类型
-        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<DeptDTO> deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<DeptDTO> deptDTOList= DeptUtil.getDeptSubsetVOList(deptList,param.getId());
+
         //获取部门id集合
         List<String> deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList());
         Map<String, DeptDTO> deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, Function.identity()));
@@ -231,8 +233,8 @@ public class RStatEventOrgMServiceImpl extends ServiceImpl<RStatEventOrgMMapper,
         List<RStatEventOrgM> list = statEventOrgMMapper.selectList(new LambdaQueryWrapper<RStatEventOrgM>()
                 .eq(RStatEventOrgM::getDataType, distributionData.getId())
                 .in(RStatEventOrgM::getOrgNo, deptIds)
-                .ge(param.getStartTime() != null, RStatEventOrgM::getDataDate, param.getStartTime())
-                .le(param.getEndTime() != null, RStatEventOrgM::getDataDate, param.getEndTime()));
+                .ge(StrUtil.isNotBlank(param.getStartTime()), RStatEventOrgM::getDataDate, param.getStartTime())
+                .le(StrUtil.isNotBlank(param.getEndTime()), RStatEventOrgM::getDataDate, param.getEndTime()));
 
         //初始化指标类型（横向）
         List<RArrayVO> arrayVOList = new ArrayList<>();
@@ -259,8 +261,8 @@ public class RStatEventOrgMServiceImpl extends ServiceImpl<RStatEventOrgMMapper,
 
                     }
                     //根据监测点类别获取差集
-                    Map<String, List<RStatEventOrgM>> listMap = value.stream().collect(Collectors.groupingBy(RStatEventOrgM::getEventType));
-                    List<DeptDTO> notDeptList = deptDTOList.stream().filter(r -> !listMap.containsKey(r.getId()))
+                    Map<String, List<RStatEventOrgM>> listMap = value.stream().collect(Collectors.groupingBy(RStatEventOrgM::getOrgNo));
+                    List<DeptDTO> notDeptList = deptDTOList.stream().filter(r -> !listMap.containsKey(r.getCode()))
                             .collect(Collectors.toList());
                     this.assignDept(notDeptList, eventVO, arrayVO);
                     eventVO.sort(Comparator.comparing(rStatEventMVO -> rStatEventMVO.getSort()));
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RStatEventOrgQServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RStatEventOrgQServiceImpl.java
index 2912c2427..70a714e3d 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RStatEventOrgQServiceImpl.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RStatEventOrgQServiceImpl.java
@@ -67,8 +67,8 @@ public class RStatEventOrgQServiceImpl extends ServiceImpl<RStatEventOrgQMapper,
         List<RStatEventOrgQ> list = statEventOrgQMapper.selectList(new LambdaQueryWrapper<RStatEventOrgQ>()
                 .eq(RStatEventOrgQ::getDataType, mainnetData.getId())
                 .in(RStatEventOrgQ::getOrgNo, deptIds)
-                .ge(param.getStartTime() != null, RStatEventOrgQ::getDataDate, param.getStartTime())
-                .le(param.getEndTime() != null, RStatEventOrgQ::getDataDate, param.getEndTime()));
+                .ge(StrUtil.isNotBlank(param.getStartTime()), RStatEventOrgQ::getDataDate, param.getStartTime())
+                .le(StrUtil.isNotBlank(param.getEndTime()), RStatEventOrgQ::getDataDate, param.getEndTime()));
 
         //初始化指标类型（横向）
         List<RArrayVO> arrayVOList = new ArrayList<>();
@@ -218,7 +218,9 @@ public class RStatEventOrgQServiceImpl extends ServiceImpl<RStatEventOrgQMapper,
                 .collect(Collectors.toMap(DictData::getId, Function.identity()));
 
         //子节点 获取所有得各单位类型
-        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<DeptDTO> deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<DeptDTO> deptDTOList= DeptUtil.getDeptSubsetVOList(deptList,param.getId());
+
         //获取部门id集合
         List<String> deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList());
         Map<String, DeptDTO> deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, Function.identity()));
@@ -230,8 +232,8 @@ public class RStatEventOrgQServiceImpl extends ServiceImpl<RStatEventOrgQMapper,
         List<RStatEventOrgQ> list = statEventOrgQMapper.selectList(new LambdaQueryWrapper<RStatEventOrgQ>()
                 .eq(RStatEventOrgQ::getDataType, distributionData.getId())
                 .in(RStatEventOrgQ::getOrgNo, deptIds)
-                .ge(param.getStartTime() != null, RStatEventOrgQ::getDataDate, param.getStartTime())
-                .le(param.getEndTime() != null, RStatEventOrgQ::getDataDate, param.getEndTime()));
+                .ge(StrUtil.isNotBlank(param.getStartTime()), RStatEventOrgQ::getDataDate, param.getStartTime())
+                .le(StrUtil.isNotBlank(param.getEndTime()), RStatEventOrgQ::getDataDate, param.getEndTime()));
 
         //初始化指标类型（横向）
         List<RArrayVO> arrayVOList = new ArrayList<>();
@@ -258,8 +260,8 @@ public class RStatEventOrgQServiceImpl extends ServiceImpl<RStatEventOrgQMapper,
 
                     }
                     //根据监测点类别获取差集
-                    Map<String, List<RStatEventOrgQ>> listMap = value.stream().collect(Collectors.groupingBy(RStatEventOrgQ::getEventType));
-                    List<DeptDTO> notDeptList = deptDTOList.stream().filter(r -> !listMap.containsKey(r.getId()))
+                    Map<String, List<RStatEventOrgQ>> listMap = value.stream().collect(Collectors.groupingBy(RStatEventOrgQ::getOrgNo));
+                    List<DeptDTO> notDeptList = deptDTOList.stream().filter(r -> !listMap.containsKey(r.getCode()))
                             .collect(Collectors.toList());
                     this.assignDept(notDeptList, eventVO, arrayVO);
                     eventVO.sort(Comparator.comparing(rStatEventMVO -> rStatEventMVO.getSort()));
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RStatEventOrgYServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RStatEventOrgYServiceImpl.java
index 0400c2aad..673069f9d 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RStatEventOrgYServiceImpl.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RStatEventOrgYServiceImpl.java
@@ -3,7 +3,6 @@ package com.njcn.event.service.majornetwork.Impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.Assert;
-import cn.hutool.core.lang.Console;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -13,7 +12,6 @@ import com.njcn.event.mapper.majornetwork.RStatEventOrgMMapper;
 import com.njcn.event.mapper.majornetwork.RStatEventOrgQMapper;
 import com.njcn.event.pojo.param.REventMParam;
 import com.njcn.event.pojo.param.StatSubstationBizBaseParam;
-import com.njcn.event.pojo.po.RStatEventOrgQ;
 import com.njcn.event.pojo.po.RStatEventOrgY;
 import com.njcn.event.mapper.majornetwork.RStatEventOrgYMapper;
 import com.njcn.event.pojo.vo.DeptLevelVO;
@@ -258,8 +256,8 @@ public class RStatEventOrgYServiceImpl extends ServiceImpl<RStatEventOrgYMapper,
         List<RStatEventOrgY> list = statEventOrgYMapper.selectList(new LambdaQueryWrapper<RStatEventOrgY>()
                 .eq(RStatEventOrgY::getDataType, distributionData.getId())
                 .in(RStatEventOrgY::getOrgNo, deptIds)
-                .ge(param.getStartTime() != null, RStatEventOrgY::getDataDate, param.getStartTime())
-                .le(param.getEndTime() != null, RStatEventOrgY::getDataDate, param.getEndTime()));
+                .ge(StrUtil.isNotBlank(param.getStartTime()), RStatEventOrgY::getDataDate, param.getStartTime())
+                .le(StrUtil.isNotBlank(param.getEndTime()), RStatEventOrgY::getDataDate, param.getEndTime()));
 
         //初始化指标类型（横向）
         List<RArrayVO> arrayVOList = new ArrayList<>();
@@ -418,8 +416,8 @@ public class RStatEventOrgYServiceImpl extends ServiceImpl<RStatEventOrgYMapper,
         List<RStatEventOrgY> list = statEventOrgYMapper.selectList(new LambdaQueryWrapper<RStatEventOrgY>()
                 .eq(RStatEventOrgY::getDataType, dictData.getId())
                 .in(RStatEventOrgY::getOrgNo, deptIds)
-                .ge(param.getStartTime() != null, RStatEventOrgY::getDataDate, param.getStartTime())
-                .le(param.getEndTime() != null, RStatEventOrgY::getDataDate, param.getEndTime()));
+                .ge(StrUtil.isNotBlank(param.getStartTime()), RStatEventOrgY::getDataDate, param.getStartTime())
+                .le(StrUtil.isNotBlank(param.getEndTime()), RStatEventOrgY::getDataDate, param.getEndTime()));
 
         //初始化指标类型（横向）
         List<RArrayVO> arrayVOList = new ArrayList<>();
@@ -446,8 +444,8 @@ public class RStatEventOrgYServiceImpl extends ServiceImpl<RStatEventOrgYMapper,
 
                     }
                     //根据监测点类别获取差集
-                    Map<String, List<RStatEventOrgY>> listMap = value.stream().collect(Collectors.groupingBy(RStatEventOrgY::getEventType));
-                    List<DeptDTO> notDeptList = deptDTOList.stream().filter(r -> !listMap.containsKey(r.getId()))
+                    Map<String, List<RStatEventOrgY>> listMap = value.stream().collect(Collectors.groupingBy(RStatEventOrgY::getOrgNo));
+                    List<DeptDTO> notDeptList = deptDTOList.stream().filter(r -> !listMap.containsKey(r.getCode()))
                             .collect(Collectors.toList());
                     this.assignDept(notDeptList, eventVO, arrayVO);
                     eventVO.sort(Comparator.comparing(rStatEventMVO -> rStatEventMVO.getSort()));
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicOrgMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicOrgMServiceImpl.java
index f19fdf34e..c443fe1d7 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicOrgMServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicOrgMServiceImpl.java
@@ -10,6 +10,7 @@ import com.njcn.common.pojo.param.StatisticsBizBaseParam;
 import com.njcn.harmonic.pojo.param.RStatHarmonicMParam;
 import com.njcn.harmonic.pojo.po.RStatHarmonicOrgM;
 import com.njcn.harmonic.mapper.StatHarmonicOrgMMapper;
+import com.njcn.harmonic.pojo.po.RStatHarmonicOrgQ;
 import com.njcn.harmonic.pojo.vo.RArrayVO;
 import com.njcn.harmonic.pojo.vo.RIconVO;
 import com.njcn.harmonic.pojo.vo.RStatHarmonicMVO;
@@ -50,7 +51,9 @@ public class RStatHarmonicOrgMServiceImpl extends ServiceImpl<StatHarmonicOrgMMa
     @Override
     public List<RArrayVO> getRStatHarmonicMAll(StatisticsBizBaseParam param) {
         //子节点 获取所有得各单位类型
-        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<DeptDTO> deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<DeptDTO> deptDTOList= DeptUtil.getDeptSubsetVOList(deptList,param.getId());
+
         //获取部门id集合
         List<String> deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList());
         Map<String, DeptDTO> deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, Function.identity()));
@@ -138,8 +141,10 @@ public class RStatHarmonicOrgMServiceImpl extends ServiceImpl<StatHarmonicOrgMMa
 
     @Override
     public List<RIconVO> getRStatHarmonicOrgMIcon(RStatHarmonicMParam param) {
-        //各单位类型
-        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        //子节点 获取所有得各单位类型
+        List<DeptDTO> deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<DeptDTO> deptDTOList= DeptUtil.getDeptSubsetVOList(deptList,param.getId());
+
         Map<String, DeptDTO> deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, Function.identity()));
         //获取部门id集合
         List<String> deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList());
@@ -241,8 +246,8 @@ public class RStatHarmonicOrgMServiceImpl extends ServiceImpl<StatHarmonicOrgMMa
         List<RStatHarmonicOrgM> list = statHarmonicOrgMMapper.selectList(new LambdaQueryWrapper<RStatHarmonicOrgM>()
                 .eq(RStatHarmonicOrgM::getDataType, distributionData.getId())
                 .in(RStatHarmonicOrgM::getOrgNo, deptIds)
-                .ge(param.getStartTime() != null, RStatHarmonicOrgM::getDataDate, param.getStartTime())
-                .le(param.getEndTime() != null, RStatHarmonicOrgM::getDataDate, param.getEndTime()));
+                .ge(StrUtil.isNotBlank(param.getStartTime()), RStatHarmonicOrgM::getDataDate, param.getStartTime())
+                .le(StrUtil.isNotBlank(param.getEndTime()), RStatHarmonicOrgM::getDataDate, param.getEndTime()));
         //根据稳态指标分组
         Map<String, List<RStatHarmonicOrgM>> measurementMap = list.stream().collect(Collectors.groupingBy(RStatHarmonicOrgM::getHarmonicType));
         //判断对象是否为空
@@ -271,7 +276,7 @@ public class RStatHarmonicOrgMServiceImpl extends ServiceImpl<StatHarmonicOrgMMa
                     }
                     //根据监测点类别获取差集
                     Map<String, List<RStatHarmonicOrgM>> listMap = value.stream().collect(Collectors.groupingBy(RStatHarmonicOrgM::getOrgNo));
-                    List<DeptDTO> notDeptDTOS = deptDTOList.stream().filter(r -> !listMap.containsKey(r.getId()))
+                    List<DeptDTO> notDeptDTOS = deptDTOList.stream().filter(r -> !listMap.containsKey(r.getCode()))
                             .collect(Collectors.toList());
                     this.assignDict(notDeptDTOS, eventVO, arrayVO);
                     eventVO.sort(Comparator.comparing(statHarmonic -> statHarmonic.getSort()));
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicOrgQServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicOrgQServiceImpl.java
index 74e1eead3..f44a7a4e4 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicOrgQServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicOrgQServiceImpl.java
@@ -7,8 +7,10 @@ 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.param.StatisticsBizBaseParam;
+import com.njcn.event.pojo.po.RStatEventOrgY;
 import com.njcn.harmonic.pojo.param.RStatHarmonicMParam;
 import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
+import com.njcn.harmonic.pojo.po.RStatHarmonicOrgM;
 import com.njcn.harmonic.pojo.po.RStatHarmonicOrgQ;
 import com.njcn.harmonic.mapper.StatHarmonicOrgQMapper;
 import com.njcn.harmonic.pojo.po.RStatHarmonicOrgY;
@@ -73,8 +75,8 @@ public class RStatHarmonicOrgQServiceImpl extends ServiceImpl<StatHarmonicOrgQMa
         List<RStatHarmonicOrgQ> list = statHarmonicOrgQMapper.selectList(new LambdaQueryWrapper<RStatHarmonicOrgQ>()
                 .eq(RStatHarmonicOrgQ::getDataType, mainnetData.getId())
                 .in(RStatHarmonicOrgQ::getOrgNo, deptIds)
-                .ge(param.getStartTime() != null, RStatHarmonicOrgQ::getDataDate, param.getStartTime())
-                .le(param.getEndTime() != null, RStatHarmonicOrgQ::getDataDate, param.getEndTime()));
+                .ge(StrUtil.isNotBlank(param.getStartTime()), RStatHarmonicOrgQ::getDataDate, param.getStartTime())
+                .le(StrUtil.isNotBlank(param.getEndTime()), RStatHarmonicOrgQ::getDataDate, param.getEndTime()));
         //根据稳态指标分组
         Map<String, List<RStatHarmonicOrgQ>> measurementMap = list.stream().collect(Collectors.groupingBy(RStatHarmonicOrgQ::getHarmonicType));
         //判断对象是否为空
@@ -99,7 +101,7 @@ public class RStatHarmonicOrgQServiceImpl extends ServiceImpl<StatHarmonicOrgQMa
                     }
                     //根据监测点类别获取差集
                     Map<String, List<RStatHarmonicOrgQ>> listMap = value.stream().collect(Collectors.groupingBy(RStatHarmonicOrgQ::getOrgNo));
-                    List<DeptDTO> notDeptDTOS = deptDTOList.stream().filter(r -> !listMap.containsKey(r.getId()))
+                    List<DeptDTO> notDeptDTOS = deptDTOList.stream().filter(r -> !listMap.containsKey(r.getCode()))
                             .collect(Collectors.toList());
                     this.assignDict(notDeptDTOS, eventVO, arrayVO);
                     eventVO.sort(Comparator.comparing(statHarmonic -> statHarmonic.getSort()));
@@ -125,8 +127,10 @@ public class RStatHarmonicOrgQServiceImpl extends ServiceImpl<StatHarmonicOrgQMa
 
     @Override
     public List<RIconVO> getRStatHarmonicOrgQIcon(RStatHarmonicMParam param) {
-        //各单位类型
-        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        //子节点 获取所有得各单位类型
+        List<DeptDTO> deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<DeptDTO> deptDTOList= DeptUtil.getDeptSubsetVOList(deptList,param.getId());
+
         Map<String, DeptDTO> deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, Function.identity()));
         //获取部门id集合
         List<String> deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList());
@@ -225,8 +229,8 @@ public class RStatHarmonicOrgQServiceImpl extends ServiceImpl<StatHarmonicOrgQMa
         List<RStatHarmonicOrgQ> list = statHarmonicOrgQMapper.selectList(new LambdaQueryWrapper<RStatHarmonicOrgQ>()
                 .eq(RStatHarmonicOrgQ::getDataType, distributionData.getId())
                 .in(RStatHarmonicOrgQ::getOrgNo, deptIds)
-                .ge(param.getStartTime() != null, RStatHarmonicOrgQ::getDataDate, param.getStartTime())
-                .le(param.getEndTime() != null, RStatHarmonicOrgQ::getDataDate, param.getEndTime()));
+                .ge(StrUtil.isNotBlank(param.getStartTime()), RStatHarmonicOrgQ::getDataDate, param.getStartTime())
+                .le(StrUtil.isNotBlank(param.getEndTime()), RStatHarmonicOrgQ::getDataDate, param.getEndTime()));
         //根据稳态指标分组
         Map<String, List<RStatHarmonicOrgQ>> measurementMap = list.stream().collect(Collectors.groupingBy(RStatHarmonicOrgQ::getHarmonicType));
         //判断对象是否为空
@@ -251,7 +255,7 @@ public class RStatHarmonicOrgQServiceImpl extends ServiceImpl<StatHarmonicOrgQMa
                     }
                     //根据监测点类别获取差集
                     Map<String, List<RStatHarmonicOrgQ>> listMap = value.stream().collect(Collectors.groupingBy(RStatHarmonicOrgQ::getOrgNo));
-                    List<DeptDTO> notDeptDTOS = deptDTOList.stream().filter(r -> !listMap.containsKey(r.getId()))
+                    List<DeptDTO> notDeptDTOS = deptDTOList.stream().filter(r -> !listMap.containsKey(r.getCode()))
                             .collect(Collectors.toList());
                     this.assignDict(notDeptDTOS, eventVO, arrayVO);
                     eventVO.sort(Comparator.comparing(statHarmonic -> statHarmonic.getSort()));
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicOrgYServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicOrgYServiceImpl.java
index 0d0297f8f..c74023843 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicOrgYServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicOrgYServiceImpl.java
@@ -1,17 +1,22 @@
 package com.njcn.harmonic.service.majornetwork.impl;
+import java.util.Date;
+import com.google.common.collect.Lists;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Assert;
 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.constant.BizParamConstant;
 import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.event.pojo.po.RStatEventOrgY;
 import com.njcn.harmonic.mapper.StatHarmonicOrgMMapper;
 import com.njcn.harmonic.mapper.StatHarmonicOrgQMapper;
 import com.njcn.harmonic.pojo.param.RStatHarmonicMParam;
 import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
+import com.njcn.harmonic.pojo.po.RStatHarmonicOrgQ;
 import com.njcn.harmonic.pojo.po.RStatHarmonicOrgY;
 import com.njcn.harmonic.mapper.StatHarmonicOrgYMapper;
 import com.njcn.harmonic.pojo.vo.*;
@@ -380,8 +385,8 @@ public class RStatHarmonicOrgYServiceImpl extends ServiceImpl<StatHarmonicOrgYMa
         List<RStatHarmonicOrgY> list = statHarmonicOrgYMapper.selectList(new LambdaQueryWrapper<RStatHarmonicOrgY>()
                 .eq(RStatHarmonicOrgY::getDataType, dictData.getId())
                 .in(RStatHarmonicOrgY::getOrgNo, deptIds)
-                .ge(param.getStartTime() != null, RStatHarmonicOrgY::getDataDate, param.getStartTime())
-                .le(param.getEndTime() != null, RStatHarmonicOrgY::getDataDate, param.getEndTime()));
+                .ge(StrUtil.isNotBlank(param.getStartTime()), RStatHarmonicOrgY::getDataDate, param.getStartTime())
+                .le(StrUtil.isNotBlank(param.getEndTime()), RStatHarmonicOrgY::getDataDate, param.getEndTime()));
         //根据稳态指标分组
         Map<String, List<RStatHarmonicOrgY>> measurementMap = list.stream().collect(Collectors.groupingBy(RStatHarmonicOrgY::getHarmonicType));
         //判断对象是否为空
@@ -406,7 +411,7 @@ public class RStatHarmonicOrgYServiceImpl extends ServiceImpl<StatHarmonicOrgYMa
                     }
                     //根据监测点类别获取差集
                     Map<String, List<RStatHarmonicOrgY>> listMap = value.stream().collect(Collectors.groupingBy(RStatHarmonicOrgY::getOrgNo));
-                    List<DeptDTO> notDeptDTOS = deptDTOList.stream().filter(r -> !listMap.containsKey(r.getId()))
+                    List<DeptDTO> notDeptDTOS = deptDTOList.stream().filter(r -> !listMap.containsKey(r.getCode()))
                             .collect(Collectors.toList());
                     this.assignDict(notDeptDTOS, eventVO, arrayVO);
                     eventVO.sort(Comparator.comparing(statHarmonic -> statHarmonic.getSort()));