diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/SpecialAnalysisMonitorVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/SpecialAnalysisMonitorVO.java
index ed285205d..569dc5c4e 100644
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/SpecialAnalysisMonitorVO.java
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/SpecialAnalysisMonitorVO.java
@@ -126,16 +126,16 @@ public class SpecialAnalysisMonitorVO implements Serializable {
         private String name;
 
         @ApiModelProperty(name = "tractionStation", value = "牵引站数量")
-        private String tractionStation;
+        private Integer tractionStation;
 
         @ApiModelProperty(name = "num", value = "监测点数量")
-        private String num;
+        private Integer num;
 
         @ApiModelProperty(name = "ytbSumNum", value = "同比数量")
-        private String ytbSumNum;
+        private Integer ytbSumNum;
 
         @ApiModelProperty(name = "yhbSumNum", value = "环比数量")
-        private String yhbSumNum;
+        private Integer yhbSumNum;
 
         @ApiModelProperty(name = "sameNum", value = "监测点数量同比")
         private String sameNum;
@@ -157,16 +157,16 @@ public class SpecialAnalysisMonitorVO implements Serializable {
         private String connetGroupWay;
 
         @ApiModelProperty(name = "num", value = "牵引站数量")
-        private String num;
+        private Integer num;
 
         @ApiModelProperty(name = "rateAvg", value = "负载量（平均值）")
-        private String rateAvg;
+        private Integer rateAvg;
 
         @ApiModelProperty(name = "rate95", value = "负载量（95值）")
-        private String rate95;
+        private Integer rate95;
 
         @ApiModelProperty(name = "rate99", value = "负载量（99值）")
-        private String rate99;
+        private Integer rate99;
 
     }
 
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/OverviewMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/OverviewMapper.xml
index d3ef43f70..6e6b2e896 100644
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/OverviewMapper.xml
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/OverviewMapper.xml
@@ -32,7 +32,7 @@
                                     <foreach collection="orgIds" item="item" open="(" close=")" separator=",">
                                         #{item}
                                     </foreach>
-                                    AND Is_Up_To_Grid = 1 AND STATUS = 1
+                                      AND STATUS = 1
                                 </where>
                                 ) UNION ALL
                                 ( SELECT id, Operation_Id, Power_Station_Id, Line_Id FROM pms_power_generation_user
@@ -42,7 +42,7 @@
                                         <foreach collection="orgIds" item="item" open="(" close=")" separator=",">
                                             #{item}
                                         </foreach>
-                                        AND Is_Up_To_Grid = 1 AND STATUS = 1
+                                          AND STATUS = 1
                                     </where>
                                 ) UNION ALL
                                 ( SELECT id, Operation_Id, Power_Station_Id, Line_Id FROM pms_power_distributionarea
@@ -52,7 +52,7 @@
                                     <foreach collection="orgIds" item="item" open="(" close=")" separator=",">
                                         #{item}
                                     </foreach>
-                                        AND Is_Up_To_Grid = 1 AND STATUS = 1
+                                          AND STATUS = 1
                                 </where>
 
                                 ) UNION ALL
@@ -63,7 +63,7 @@
                                     <foreach collection="orgIds" item="item" open="(" close=")" separator=",">
                                         #{item}
                                     </foreach>
-                                    AND Is_Up_To_Grid = 1 AND STATUS = 1
+                                      AND STATUS = 1
                                 </where>
 
                                 )
@@ -95,7 +95,7 @@
                             <foreach collection="orgIds" item="item" open="(" close=")" separator=",">
                                 #{item}
                             </foreach>
-                            AND Is_Up_To_Grid = 1 AND STATUS = 1
+                              AND STATUS = 1
                         </where>
                         ) UNION ALL
                         ( SELECT id, Operation_Id, Power_Station_Id, Line_Id FROM pms_power_generation_user
@@ -105,7 +105,7 @@
                             <foreach collection="orgIds" item="item" open="(" close=")" separator=",">
                                 #{item}
                             </foreach>
-                            AND Is_Up_To_Grid = 1 AND STATUS = 1
+                              AND STATUS = 1
                         </where>
                         ) UNION ALL
                         ( SELECT id, Operation_Id, Power_Station_Id, Line_Id FROM pms_power_distributionarea
@@ -115,7 +115,7 @@
                             <foreach collection="orgIds" item="item" open="(" close=")" separator=",">
                                 #{item}
                             </foreach>
-                            AND Is_Up_To_Grid = 1 AND STATUS = 1
+                              AND STATUS = 1
                         </where>
 
                         ) UNION ALL
@@ -126,7 +126,7 @@
                             <foreach collection="orgIds" item="item" open="(" close=")" separator=",">
                                 #{item}
                             </foreach>
-                            AND Is_Up_To_Grid = 1 AND STATUS = 1
+                              AND STATUS = 1
                         </where>
 
                         )
@@ -160,7 +160,7 @@
             <foreach collection="orgIds" item="item" open="(" close=")" separator=",">
                 #{item}
             </foreach>
-            AND Is_Up_To_Grid = 1 AND STATUS = 1
+              AND STATUS = 1
         </where>
         ) UNION ALL
         ( SELECT id, Operation_Id, Power_Station_Id, Line_Id FROM pms_power_generation_user
@@ -170,7 +170,7 @@
             <foreach collection="orgIds" item="item" open="(" close=")" separator=",">
                 #{item}
             </foreach>
-            AND Is_Up_To_Grid = 1 AND STATUS = 1
+              AND STATUS = 1
         </where>
         ) UNION ALL
         ( SELECT id, Operation_Id, Power_Station_Id, Line_Id FROM pms_power_distributionarea
@@ -180,7 +180,7 @@
             <foreach collection="orgIds" item="item" open="(" close=")" separator=",">
                 #{item}
             </foreach>
-            AND Is_Up_To_Grid = 1 AND STATUS = 1
+              AND STATUS = 1
         </where>
 
         ) UNION ALL
@@ -191,7 +191,7 @@
             <foreach collection="orgIds" item="item" open="(" close=")" separator=",">
                 #{item}
             </foreach>
-            AND Is_Up_To_Grid = 1 AND STATUS = 1
+              AND STATUS = 1
         </where>
 
         )
@@ -236,7 +236,7 @@
             <foreach collection="orgIds" item="item" open="(" close=")" separator=",">
                 #{item}
             </foreach>
-            AND Is_Up_To_Grid = 1 AND STATUS = 1
+              AND STATUS = 1
         </where>
         ) UNION ALL
         ( SELECT id,org_id, Operation_Id, Power_Station_Id, Line_Id FROM pms_power_generation_user
@@ -246,7 +246,7 @@
             <foreach collection="orgIds" item="item" open="(" close=")" separator=",">
                 #{item}
             </foreach>
-            AND Is_Up_To_Grid = 1 AND STATUS = 1
+              AND STATUS = 1
         </where>
         ) UNION ALL
         ( SELECT id,org_id, Operation_Id, Power_Station_Id, Line_Id FROM pms_power_distributionarea
@@ -256,7 +256,7 @@
             <foreach collection="orgIds" item="item" open="(" close=")" separator=",">
                 #{item}
             </foreach>
-            AND Is_Up_To_Grid = 1 AND STATUS = 1
+              AND STATUS = 1
         </where>
 
         ) UNION ALL
@@ -267,7 +267,7 @@
             <foreach collection="orgIds" item="item" open="(" close=")" separator=",">
                 #{item}
             </foreach>
-            AND Is_Up_To_Grid = 1 AND STATUS = 1
+              AND STATUS = 1
         </where>
 
         )
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/SpecialAnalysisMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/SpecialAnalysisMapper.xml
index 6efa5d9fc..51b469b3d 100644
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/SpecialAnalysisMapper.xml
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/SpecialAnalysisMapper.xml
@@ -12,7 +12,7 @@
             pm.Powerr_Id,
             pm.Terminal_Id,
             pm.Voltage_Level,
-            psm.capacity,
+            IFNULL(psm.capacity,0) as capacity,
             ps.Longitude,
             ps.Latitude
         FROM
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/OverviewServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/OverviewServiceImpl.java
index daf73e06d..e9572f29c 100644
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/OverviewServiceImpl.java
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/OverviewServiceImpl.java
@@ -57,7 +57,8 @@ public class OverviewServiceImpl implements OverviewService {
                 DicDataTypeEnum.LINE_SORT.getCode()).getData();
 
         //获取部门数据
-        List<String> deptListCode = getDeptListCode(param.getId());
+        List<DeptDTO> data = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<String> deptListCode = data.stream().map(DeptDTO::getCode).collect(Collectors.toList());
         if(CollectionUtil.isNotEmpty(deptListCode)){
 
             List<OverviewVO.MonitorObject>  overviewVOS = overviewMapper.selectYoY(deptListCode, param);
@@ -125,7 +126,8 @@ public class OverviewServiceImpl implements OverviewService {
     public List<OverviewVO.AlarmVO> getAlarmProportion(OverviewParam.OverviewDateParam param) {
         List<OverviewVO.AlarmVO> alarmVOS=new ArrayList<>();
         //获取部门数据
-        List<String> deptListCode = getDeptListCode(param.getId());
+        List<DeptDTO> deptDTOS = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<String> deptListCode = deptDTOS.stream().map(DeptDTO::getCode).collect(Collectors.toList());
         DictData data = dicDataFeignClient.getDicDataByCode(DicDataEnum.DISTRIBUTION_POINT.getCode()).getData();
 
         //获取监测点类别集合（配网1-2-3类监测点）
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/SpecialAnalysisServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/SpecialAnalysisServiceImpl.java
index 46f671475..0e171bced 100644
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/SpecialAnalysisServiceImpl.java
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/SpecialAnalysisServiceImpl.java
@@ -167,10 +167,10 @@ public class SpecialAnalysisServiceImpl implements SpecialAnalysisService {
         for (DictData notData : notMeasurementList) {
             wiringTypeDetail = new SpecialAnalysisMonitorVO.WiringTypeDetail();
             wiringTypeDetail.setConnetGroupWay(notData.getId());
-            wiringTypeDetail.setNum("0");
-            wiringTypeDetail.setRateAvg("0");
-            wiringTypeDetail.setRate95("0");
-            wiringTypeDetail.setRate99("0");
+            wiringTypeDetail.setNum(0);
+            wiringTypeDetail.setRateAvg(0);
+            wiringTypeDetail.setRate95(0);
+            wiringTypeDetail.setRate99(0);
             wiringTypeRailway.add(wiringTypeDetail);
         }
         if (CollUtil.isNotEmpty(wiringTypeRailway)) {