diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 528b2fb..e7e1fae 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -446,7 +446,6 @@
     @ResponseBody
     public Object transferJob(@RequestParam(value = "id", required = true) Long id,
                               @RequestParam(value = "transferPerson", required = true) String transferPerson) {
-
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm:ss");
 //        String dbTime = iSysDictService.getDBtime();

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 528b2fb..e7e1fae 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -446,7 +446,6 @@
     @ResponseBody
     public Object transferJob(@RequestParam(value = "id", required = true) Long id,
                               @RequestParam(value = "transferPerson", required = true) String transferPerson) {
-
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm:ss");
 //        String dbTime = iSysDictService.getDBtime();
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 56caa96..1e81d70 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -203,8 +203,7 @@
     @RequestMapping("/alarmStaticsByContent")
     @ResponseBody
     public Object getAlarmCountByType(String beginTime, String endTime, String alarmType) {
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        return statisticsService.getAlarmCountByType(dataScope, beginTime, endTime, alarmType);
+        return statisticsService.getAlarmCountByType( beginTime, endTime, alarmType);
     }
 
     /**
@@ -213,8 +212,7 @@
     @RequestMapping("/alarmStaticsByStatus")
     @ResponseBody
     public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) {
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        return statisticsService.getAlarmByStatus(dataScope, beginTime, endTime, alarmType);
+        return statisticsService.getAlarmByStatus(beginTime, endTime, alarmType);
     }
 
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 528b2fb..e7e1fae 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -446,7 +446,6 @@
     @ResponseBody
     public Object transferJob(@RequestParam(value = "id", required = true) Long id,
                               @RequestParam(value = "transferPerson", required = true) String transferPerson) {
-
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm:ss");
 //        String dbTime = iSysDictService.getDBtime();
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 56caa96..1e81d70 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -203,8 +203,7 @@
     @RequestMapping("/alarmStaticsByContent")
     @ResponseBody
     public Object getAlarmCountByType(String beginTime, String endTime, String alarmType) {
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        return statisticsService.getAlarmCountByType(dataScope, beginTime, endTime, alarmType);
+        return statisticsService.getAlarmCountByType( beginTime, endTime, alarmType);
     }
 
     /**
@@ -213,8 +212,7 @@
     @RequestMapping("/alarmStaticsByStatus")
     @ResponseBody
     public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) {
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        return statisticsService.getAlarmByStatus(dataScope, beginTime, endTime, alarmType);
+        return statisticsService.getAlarmByStatus(beginTime, endTime, alarmType);
     }
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index fbc3a8d..cfe58f5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -11,7 +11,9 @@
 
     List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
 
-    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+    String getDeviceType(@Param("deptid")Long deptId);
+
+    List<Map<String, Object>> deviceStaticsByType();
 
     List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
 
@@ -28,9 +30,9 @@
    List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
                                               @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
 
-    List<Map<String,Object>>  getAlarmCountByType(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+    List<Map<String,Object>>  getAlarmCountByType( @Param("beginTime") String beginTime,
                                                   @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 
-    List<Map<String, Object>> getAlarmByStatus(@Param("dataScope") DataScope dataScope,@Param("beginTime") String  beginTime,
+    List<Map<String, Object>> getAlarmByStatus(@Param("beginTime") String  beginTime,
                                                @Param("endTime") String  endTime,@Param("alarmType") String   alarmType);
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 528b2fb..e7e1fae 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -446,7 +446,6 @@
     @ResponseBody
     public Object transferJob(@RequestParam(value = "id", required = true) Long id,
                               @RequestParam(value = "transferPerson", required = true) String transferPerson) {
-
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm:ss");
 //        String dbTime = iSysDictService.getDBtime();
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 56caa96..1e81d70 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -203,8 +203,7 @@
     @RequestMapping("/alarmStaticsByContent")
     @ResponseBody
     public Object getAlarmCountByType(String beginTime, String endTime, String alarmType) {
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        return statisticsService.getAlarmCountByType(dataScope, beginTime, endTime, alarmType);
+        return statisticsService.getAlarmCountByType( beginTime, endTime, alarmType);
     }
 
     /**
@@ -213,8 +212,7 @@
     @RequestMapping("/alarmStaticsByStatus")
     @ResponseBody
     public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) {
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        return statisticsService.getAlarmByStatus(dataScope, beginTime, endTime, alarmType);
+        return statisticsService.getAlarmByStatus(beginTime, endTime, alarmType);
     }
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index fbc3a8d..cfe58f5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -11,7 +11,9 @@
 
     List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
 
-    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+    String getDeviceType(@Param("deptid")Long deptId);
+
+    List<Map<String, Object>> deviceStaticsByType();
 
     List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
 
@@ -28,9 +30,9 @@
    List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
                                               @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
 
-    List<Map<String,Object>>  getAlarmCountByType(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+    List<Map<String,Object>>  getAlarmCountByType( @Param("beginTime") String beginTime,
                                                   @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 
-    List<Map<String, Object>> getAlarmByStatus(@Param("dataScope") DataScope dataScope,@Param("beginTime") String  beginTime,
+    List<Map<String, Object>> getAlarmByStatus(@Param("beginTime") String  beginTime,
                                                @Param("endTime") String  endTime,@Param("alarmType") String   alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index df31d87..171c917 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -30,21 +30,21 @@
     </select>
 
     <select id="deviceStaticsByType" resultType="map">
-        SELECT
-            bdt.TYPE_NAME AS "deviceType",
-            COALESCE(A.devicecount ,0)  AS "deviceCount"
-        FROM base_device_type bdt
-        LEFT JOIN (
+         SELECT
+						 bdt.ID  AS  "id",
+             bdt.TYPE_NAME AS "deviceType",
+             COALESCE(A.devicecount ,0)  AS "deviceCount"
+         FROM base_device_type bdt
+         LEFT JOIN (
             SELECT
                 COUNT( 1 ) AS devicecount,
                 BD.DEVICE_TYPE AS deviceType
             FROM bus_device BD
             LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID
             LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID
-            WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
+            WHERE BD.VALID = '1' AND BDW.VALID='1'
             GROUP BY BD.DEVICE_TYPE
           ) A ON bdt.ID = A.deviceType
-          WHERE  A.devicecount>0
     </select>
 
     <select id="deviceStaticsByDept" resultType="map">
@@ -270,9 +270,11 @@
     </select>
 
     <select id="getAlarmCountByType" resultType="MAP">
-        SELECT ALARM_CONTENT AS "alarmContent",COUNT(*) AS "alarmCount",DEPTID AS deptid
+        SELECT ALARM_CONTENT AS "alarmContent",COUNT(*) AS "alarmCount",bdt.ID  AS  "deviceType"
         FROM alarm_records ar
-        LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        JOIN bus_device   bd ON bd.DEVCODE=ar.DEVCODE
+        JOIN base_device_type   bdt ON bdt.ID=bd.DEVICE_TYPE
         WHERE 1=1
         <if test="alarmType!='' and alarmType!= null">
             AND ALARM_TYPE = #{alarmType}
@@ -289,15 +291,17 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
-        GROUP BY ALARM_CONTENT,deptid
+        GROUP BY ALARM_CONTENT,deviceType
         ORDER BY "alarmCount" DESC
     </select>
 
     <select id="getAlarmByStatus" resultType="MAP">
-        SELECT ALARM_CONTENT AS "alarmContent",COUNT(*) AS "totalAlarm",DEPTID AS deptid,
+        SELECT ALARM_CONTENT AS "alarmContent",COUNT(*) AS "totalAlarm",bdt.ID  AS  "deviceType",
         SUM(CASE WHEN ar.STATUS='1' THEN 1 ELSE 0 END) AS alarmings
         FROM alarm_records ar
         LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        JOIN bus_device   bd ON bd.DEVCODE=ar.DEVCODE
+        JOIN base_device_type   bdt ON bdt.ID=bd.DEVICE_TYPE
         WHERE 1=1
         <if test="alarmType!='' and alarmType!= null">
             AND ALARM_TYPE = #{alarmType}
@@ -314,8 +318,14 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
-        GROUP BY ALARM_CONTENT,deptid
+        GROUP BY ALARM_CONTENT,deviceType
         ORDER BY "totalAlarm" DESC
     </select>
 
+    <select id="getDeviceType"  resultType="String">
+        SELECT  DEVICE_TYPE
+        FROM config_dept_permission
+        WHERE  DEPTID=#{deptid}
+    </select>
+
 </mapper>
\ No newline at end of file

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 528b2fb..e7e1fae 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -446,7 +446,6 @@
     @ResponseBody
     public Object transferJob(@RequestParam(value = "id", required = true) Long id,
                               @RequestParam(value = "transferPerson", required = true) String transferPerson) {
-
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm:ss");
 //        String dbTime = iSysDictService.getDBtime();
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 56caa96..1e81d70 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -203,8 +203,7 @@
     @RequestMapping("/alarmStaticsByContent")
     @ResponseBody
     public Object getAlarmCountByType(String beginTime, String endTime, String alarmType) {
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        return statisticsService.getAlarmCountByType(dataScope, beginTime, endTime, alarmType);
+        return statisticsService.getAlarmCountByType( beginTime, endTime, alarmType);
     }
 
     /**
@@ -213,8 +212,7 @@
     @RequestMapping("/alarmStaticsByStatus")
     @ResponseBody
     public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) {
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        return statisticsService.getAlarmByStatus(dataScope, beginTime, endTime, alarmType);
+        return statisticsService.getAlarmByStatus(beginTime, endTime, alarmType);
     }
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index fbc3a8d..cfe58f5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -11,7 +11,9 @@
 
     List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
 
-    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+    String getDeviceType(@Param("deptid")Long deptId);
+
+    List<Map<String, Object>> deviceStaticsByType();
 
     List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
 
@@ -28,9 +30,9 @@
    List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
                                               @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
 
-    List<Map<String,Object>>  getAlarmCountByType(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+    List<Map<String,Object>>  getAlarmCountByType( @Param("beginTime") String beginTime,
                                                   @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 
-    List<Map<String, Object>> getAlarmByStatus(@Param("dataScope") DataScope dataScope,@Param("beginTime") String  beginTime,
+    List<Map<String, Object>> getAlarmByStatus(@Param("beginTime") String  beginTime,
                                                @Param("endTime") String  endTime,@Param("alarmType") String   alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index df31d87..171c917 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -30,21 +30,21 @@
     </select>
 
     <select id="deviceStaticsByType" resultType="map">
-        SELECT
-            bdt.TYPE_NAME AS "deviceType",
-            COALESCE(A.devicecount ,0)  AS "deviceCount"
-        FROM base_device_type bdt
-        LEFT JOIN (
+         SELECT
+						 bdt.ID  AS  "id",
+             bdt.TYPE_NAME AS "deviceType",
+             COALESCE(A.devicecount ,0)  AS "deviceCount"
+         FROM base_device_type bdt
+         LEFT JOIN (
             SELECT
                 COUNT( 1 ) AS devicecount,
                 BD.DEVICE_TYPE AS deviceType
             FROM bus_device BD
             LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID
             LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID
-            WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
+            WHERE BD.VALID = '1' AND BDW.VALID='1'
             GROUP BY BD.DEVICE_TYPE
           ) A ON bdt.ID = A.deviceType
-          WHERE  A.devicecount>0
     </select>
 
     <select id="deviceStaticsByDept" resultType="map">
@@ -270,9 +270,11 @@
     </select>
 
     <select id="getAlarmCountByType" resultType="MAP">
-        SELECT ALARM_CONTENT AS "alarmContent",COUNT(*) AS "alarmCount",DEPTID AS deptid
+        SELECT ALARM_CONTENT AS "alarmContent",COUNT(*) AS "alarmCount",bdt.ID  AS  "deviceType"
         FROM alarm_records ar
-        LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        JOIN bus_device   bd ON bd.DEVCODE=ar.DEVCODE
+        JOIN base_device_type   bdt ON bdt.ID=bd.DEVICE_TYPE
         WHERE 1=1
         <if test="alarmType!='' and alarmType!= null">
             AND ALARM_TYPE = #{alarmType}
@@ -289,15 +291,17 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
-        GROUP BY ALARM_CONTENT,deptid
+        GROUP BY ALARM_CONTENT,deviceType
         ORDER BY "alarmCount" DESC
     </select>
 
     <select id="getAlarmByStatus" resultType="MAP">
-        SELECT ALARM_CONTENT AS "alarmContent",COUNT(*) AS "totalAlarm",DEPTID AS deptid,
+        SELECT ALARM_CONTENT AS "alarmContent",COUNT(*) AS "totalAlarm",bdt.ID  AS  "deviceType",
         SUM(CASE WHEN ar.STATUS='1' THEN 1 ELSE 0 END) AS alarmings
         FROM alarm_records ar
         LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        JOIN bus_device   bd ON bd.DEVCODE=ar.DEVCODE
+        JOIN base_device_type   bdt ON bdt.ID=bd.DEVICE_TYPE
         WHERE 1=1
         <if test="alarmType!='' and alarmType!= null">
             AND ALARM_TYPE = #{alarmType}
@@ -314,8 +318,14 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
-        GROUP BY ALARM_CONTENT,deptid
+        GROUP BY ALARM_CONTENT,deviceType
         ORDER BY "totalAlarm" DESC
     </select>
 
+    <select id="getDeviceType"  resultType="String">
+        SELECT  DEVICE_TYPE
+        FROM config_dept_permission
+        WHERE  DEPTID=#{deptid}
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index 9d25549..f46e427 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -25,9 +25,9 @@
 
     Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent);
 
-    Object getAlarmCountByType(DataScope dataScope, String beginTime, String endTime, String alarmType);
+    Object getAlarmCountByType( String beginTime, String endTime, String alarmType);
 
-    Object getAlarmByStatus(DataScope dataScope, String beginTime, String endTime, String alarmType);
+    Object getAlarmByStatus( String beginTime, String endTime, String alarmType);
 
 }
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 528b2fb..e7e1fae 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -446,7 +446,6 @@
     @ResponseBody
     public Object transferJob(@RequestParam(value = "id", required = true) Long id,
                               @RequestParam(value = "transferPerson", required = true) String transferPerson) {
-
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
         SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm:ss");
 //        String dbTime = iSysDictService.getDBtime();
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 56caa96..1e81d70 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
@@ -203,8 +203,7 @@
     @RequestMapping("/alarmStaticsByContent")
     @ResponseBody
     public Object getAlarmCountByType(String beginTime, String endTime, String alarmType) {
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        return statisticsService.getAlarmCountByType(dataScope, beginTime, endTime, alarmType);
+        return statisticsService.getAlarmCountByType( beginTime, endTime, alarmType);
     }
 
     /**
@@ -213,8 +212,7 @@
     @RequestMapping("/alarmStaticsByStatus")
     @ResponseBody
     public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) {
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        return statisticsService.getAlarmByStatus(dataScope, beginTime, endTime, alarmType);
+        return statisticsService.getAlarmByStatus(beginTime, endTime, alarmType);
     }
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index fbc3a8d..cfe58f5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -11,7 +11,9 @@
 
     List<Map<String, Object>> wellStaticsByType(@Param("deptIds") String deptIds);
 
-    List<Map<String, Object>> deviceStaticsByType(@Param("deptIds") String deptIds);
+    String getDeviceType(@Param("deptid")Long deptId);
+
+    List<Map<String, Object>> deviceStaticsByType();
 
     List<Map<String, Object>> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType);
 
@@ -28,9 +30,9 @@
    List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
                                               @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
 
-    List<Map<String,Object>>  getAlarmCountByType(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime,
+    List<Map<String,Object>>  getAlarmCountByType( @Param("beginTime") String beginTime,
                                                   @Param("endTime") String endTime, @Param("alarmType") String alarmType);
 
-    List<Map<String, Object>> getAlarmByStatus(@Param("dataScope") DataScope dataScope,@Param("beginTime") String  beginTime,
+    List<Map<String, Object>> getAlarmByStatus(@Param("beginTime") String  beginTime,
                                                @Param("endTime") String  endTime,@Param("alarmType") String   alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index df31d87..171c917 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -30,21 +30,21 @@
     </select>
 
     <select id="deviceStaticsByType" resultType="map">
-        SELECT
-            bdt.TYPE_NAME AS "deviceType",
-            COALESCE(A.devicecount ,0)  AS "deviceCount"
-        FROM base_device_type bdt
-        LEFT JOIN (
+         SELECT
+						 bdt.ID  AS  "id",
+             bdt.TYPE_NAME AS "deviceType",
+             COALESCE(A.devicecount ,0)  AS "deviceCount"
+         FROM base_device_type bdt
+         LEFT JOIN (
             SELECT
                 COUNT( 1 ) AS devicecount,
                 BD.DEVICE_TYPE AS deviceType
             FROM bus_device BD
             LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID
             LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID
-            WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
+            WHERE BD.VALID = '1' AND BDW.VALID='1'
             GROUP BY BD.DEVICE_TYPE
           ) A ON bdt.ID = A.deviceType
-          WHERE  A.devicecount>0
     </select>
 
     <select id="deviceStaticsByDept" resultType="map">
@@ -270,9 +270,11 @@
     </select>
 
     <select id="getAlarmCountByType" resultType="MAP">
-        SELECT ALARM_CONTENT AS "alarmContent",COUNT(*) AS "alarmCount",DEPTID AS deptid
+        SELECT ALARM_CONTENT AS "alarmContent",COUNT(*) AS "alarmCount",bdt.ID  AS  "deviceType"
         FROM alarm_records ar
-        LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        JOIN bus_device   bd ON bd.DEVCODE=ar.DEVCODE
+        JOIN base_device_type   bdt ON bdt.ID=bd.DEVICE_TYPE
         WHERE 1=1
         <if test="alarmType!='' and alarmType!= null">
             AND ALARM_TYPE = #{alarmType}
@@ -289,15 +291,17 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
-        GROUP BY ALARM_CONTENT,deptid
+        GROUP BY ALARM_CONTENT,deviceType
         ORDER BY "alarmCount" DESC
     </select>
 
     <select id="getAlarmByStatus" resultType="MAP">
-        SELECT ALARM_CONTENT AS "alarmContent",COUNT(*) AS "totalAlarm",DEPTID AS deptid,
+        SELECT ALARM_CONTENT AS "alarmContent",COUNT(*) AS "totalAlarm",bdt.ID  AS  "deviceType",
         SUM(CASE WHEN ar.STATUS='1' THEN 1 ELSE 0 END) AS alarmings
         FROM alarm_records ar
         LEFT JOIN bus_well_info bwi ON bwi.WELL_CODE=ar.WELL_CODE
+        JOIN bus_device   bd ON bd.DEVCODE=ar.DEVCODE
+        JOIN base_device_type   bdt ON bdt.ID=bd.DEVICE_TYPE
         WHERE 1=1
         <if test="alarmType!='' and alarmType!= null">
             AND ALARM_TYPE = #{alarmType}
@@ -314,8 +318,14 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
-        GROUP BY ALARM_CONTENT,deptid
+        GROUP BY ALARM_CONTENT,deviceType
         ORDER BY "totalAlarm" DESC
     </select>
 
+    <select id="getDeviceType"  resultType="String">
+        SELECT  DEVICE_TYPE
+        FROM config_dept_permission
+        WHERE  DEPTID=#{deptid}
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index 9d25549..f46e427 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -25,9 +25,9 @@
 
     Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent);
 
-    Object getAlarmCountByType(DataScope dataScope, String beginTime, String endTime, String alarmType);
+    Object getAlarmCountByType( String beginTime, String endTime, String alarmType);
 
-    Object getAlarmByStatus(DataScope dataScope, String beginTime, String endTime, String alarmType);
+    Object getAlarmByStatus( String beginTime, String endTime, String alarmType);
 
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index 0c7d723..21b0436 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -19,6 +19,7 @@
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -53,13 +54,13 @@
 
     @Override
     public List<Map<String, Object>> deviceStaticsByType(DataScope dataScope) {
-        String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");
-        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByType(deptIds);
-
-//        for (Map<String, Object> map : mapList) {
-//            map.replace("deviceType",sysDictMapper.getDeviceTypeNameById(map.get("deviceType").toString()));
-//        }
-        return mapList;
+        Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
+        String  detypeTypes= statisticMapper.getDeviceType(deptId);
+        List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByType();
+        List<Map<String, Object>> dataScopeFilter= mapList.stream().filter(
+                map->detypeTypes.contains(map.get("id").toString())
+        ).collect(Collectors.toList());
+        return dataScopeFilter;
     }
 
     @Override
@@ -162,16 +163,18 @@
         return responseData;
     }
 
-    public Object getAlarmCountByType(DataScope dataScope, String beginTime, String endTime, String alarmType) {
+    public Object getAlarmCountByType(String beginTime, String endTime, String alarmType) {
+        Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
+        String  detypeTypes= statisticMapper.getDeviceType(deptId);
         ResponseData responseData = new ResponseData();
         try {
-            List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountByType(dataScope, beginTime, endTime, alarmType);
-            alarmWellList.forEach(
-                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(alarmWell.get("deptid").toString())))
-            );
+            List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountByType(beginTime, endTime, alarmType);
+            List<Map<String, Object>> dataScopeFilter= alarmWellList.stream().filter(
+                    map->detypeTypes.contains(map.get("deviceType").toString())
+            ).collect(Collectors.toList());
             responseData.setCode(200);
             responseData.setMessage("查询成功");
-            responseData.setData(alarmWellList);
+            responseData.setData(dataScopeFilter);
         } catch (DataAccessException ex) {
             log.error("主题：报警井查询出现异常，异常信息{}", ex);
             responseData.setCode(500);
@@ -180,16 +183,18 @@
         return responseData;
     }
 
-    public Object getAlarmByStatus(DataScope dataScope, String beginTime, String endTime, String alarmType) {
+    public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) {
         ResponseData responseData = new ResponseData();
+        Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
+        String  detypeTypes= statisticMapper.getDeviceType(deptId);
         try {
-            List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmByStatus(dataScope, beginTime, endTime, alarmType);
-            alarmWellList.forEach(
-                    alarmWell->alarmWell.put("cancelAlarm",Integer.valueOf(alarmWell.get("totalAlarm").toString())-Integer.valueOf(alarmWell.get("alarmings").toString()))
-            );
+            List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmByStatus(beginTime, endTime, alarmType);
+            List<Map<String, Object>> dataScopeFilter= alarmWellList.stream().filter(
+                    map->detypeTypes.contains(map.get("deviceType").toString())
+            ).collect(Collectors.toList());
             responseData.setCode(200);
             responseData.setMessage("查询成功");
-            responseData.setData(alarmWellList);
+            responseData.setData(dataScopeFilter);
         } catch (DataAccessException ex) {
             log.error("主题：报警井查询出现异常，异常信息{}", ex);
             responseData.setCode(500);