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 2163939..dce42bf 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
@@ -10,6 +10,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Required;
 import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -182,12 +183,11 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow() {
+    public Object alarmsNow(@RequestParam(value = "alarmType", required = false) String alarmType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         try {
-            List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total", alarmNowViews.size());
+            res.put("total", statisticsService.countNowAlarmRecords(dataScope,alarmType));
             return ResponseData.success(res);
         } catch (Exception e) {
             e.printStackTrace();

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 2163939..dce42bf 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
@@ -10,6 +10,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Required;
 import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -182,12 +183,11 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow() {
+    public Object alarmsNow(@RequestParam(value = "alarmType", required = false) String alarmType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         try {
-            List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total", alarmNowViews.size());
+            res.put("total", statisticsService.countNowAlarmRecords(dataScope,alarmType));
             return ResponseData.success(res);
         } catch (Exception e) {
             e.printStackTrace();
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 a480f26..5040f06 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
@@ -31,6 +31,8 @@
 
     Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
+    Integer countNowAlarmRecords(@Param("dataScope") DataScope dataScope,@Param("alarmType") String alarmType);
+
    List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope,
                                               @Param("page")Page<Map<String, Object>> page, @Param("beginTime") String beginTime,
                                               @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);

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 2163939..dce42bf 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
@@ -10,6 +10,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Required;
 import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -182,12 +183,11 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow() {
+    public Object alarmsNow(@RequestParam(value = "alarmType", required = false) String alarmType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         try {
-            List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total", alarmNowViews.size());
+            res.put("total", statisticsService.countNowAlarmRecords(dataScope,alarmType));
             return ResponseData.success(res);
         } catch (Exception e) {
             e.printStackTrace();
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 a480f26..5040f06 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
@@ -31,6 +31,8 @@
 
     Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
+    Integer countNowAlarmRecords(@Param("dataScope") DataScope dataScope,@Param("alarmType") String alarmType);
+
    List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope,
                                               @Param("page")Page<Map<String, Object>> page, @Param("beginTime") String beginTime,
                                               @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
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 514448a..13bcb04 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
@@ -29,6 +29,29 @@
         GROUP BY WELL_TYPE
     </select>
 
+    <select id="countNowAlarmRecords" resultType="Integer">
+        SELECT  count(*)
+        FROM  alarm_records ar
+        JOIN bus_device_well rdv ON  ar.device_id = rdv.device_id
+        JOIN bus_well_info wi ON rdv.well_id = wi.ID
+        JOIN alarm_job aj ON  ar.job_id = aj.ID
+        WHERE  rdv.VALID = '1'
+        <choose>
+            <when test="alarmType != null and alarmType != ''">
+                <if test="alarmType == 1">
+                    AND ar.ALARM_TYPE = #{alarmType}
+                    AND ar.status = '1'
+                </if>
+                <if test="alarmType == 2">
+                    AND ALARM_TYPE = #{alarmType}
+                </if>
+            </when>
+            <otherwise>
+                AND ar.status = '1'
+            </otherwise>
+        </choose>
+    </select>
+
     <select id="deviceStaticsByType" resultType="map">
          SELECT
 						 bdt.ID  AS  "id",

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 2163939..dce42bf 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
@@ -10,6 +10,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Required;
 import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -182,12 +183,11 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow() {
+    public Object alarmsNow(@RequestParam(value = "alarmType", required = false) String alarmType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         try {
-            List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total", alarmNowViews.size());
+            res.put("total", statisticsService.countNowAlarmRecords(dataScope,alarmType));
             return ResponseData.success(res);
         } catch (Exception e) {
             e.printStackTrace();
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 a480f26..5040f06 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
@@ -31,6 +31,8 @@
 
     Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
+    Integer countNowAlarmRecords(@Param("dataScope") DataScope dataScope,@Param("alarmType") String alarmType);
+
    List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope,
                                               @Param("page")Page<Map<String, Object>> page, @Param("beginTime") String beginTime,
                                               @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
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 514448a..13bcb04 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
@@ -29,6 +29,29 @@
         GROUP BY WELL_TYPE
     </select>
 
+    <select id="countNowAlarmRecords" resultType="Integer">
+        SELECT  count(*)
+        FROM  alarm_records ar
+        JOIN bus_device_well rdv ON  ar.device_id = rdv.device_id
+        JOIN bus_well_info wi ON rdv.well_id = wi.ID
+        JOIN alarm_job aj ON  ar.job_id = aj.ID
+        WHERE  rdv.VALID = '1'
+        <choose>
+            <when test="alarmType != null and alarmType != ''">
+                <if test="alarmType == 1">
+                    AND ar.ALARM_TYPE = #{alarmType}
+                    AND ar.status = '1'
+                </if>
+                <if test="alarmType == 2">
+                    AND ALARM_TYPE = #{alarmType}
+                </if>
+            </when>
+            <otherwise>
+                AND ar.status = '1'
+            </otherwise>
+        </choose>
+    </select>
+
     <select id="deviceStaticsByType" resultType="map">
          SELECT
 						 bdt.ID  AS  "id",
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 41876f4..8e200b2 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,13 +25,15 @@
 
     List<Map<String, Object>> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException;
 
+    Integer countNowAlarmRecords(DataScope dataScope,String alarmType);
+
     List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope);
 
-    ResponseData alarmWellListPage(DataScope dataScope, Page<Map<String, Object>> page,String beginTime, String endTime, String alarmContent);
+    ResponseData alarmWellListPage(DataScope dataScope, Page<Map<String, Object>> page, String beginTime, String endTime, String alarmContent);
 
-    Object getAlarmCountByType( String beginTime, String endTime, String alarmType);
+    Object getAlarmCountByType(String beginTime, String endTime, String alarmType);
 
-    Object getAlarmByStatus( 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/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
index 2163939..dce42bf 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
@@ -10,6 +10,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Required;
 import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -182,12 +183,11 @@
      */
     @RequestMapping(value = "/alarmsNow")
     @ResponseBody
-    public Object alarmsNow() {
+    public Object alarmsNow(@RequestParam(value = "alarmType", required = false) String alarmType) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         try {
-            List<AlarmNowView> alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope);
             Map<String, Object> res = new HashMap<>();
-            res.put("total", alarmNowViews.size());
+            res.put("total", statisticsService.countNowAlarmRecords(dataScope,alarmType));
             return ResponseData.success(res);
         } catch (Exception e) {
             e.printStackTrace();
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 a480f26..5040f06 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
@@ -31,6 +31,8 @@
 
     Map<String, Object> jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
+    Integer countNowAlarmRecords(@Param("dataScope") DataScope dataScope,@Param("alarmType") String alarmType);
+
    List<Map<String,Object>> alarmWellListPage(@Param("dataScope") DataScope dataScope,
                                               @Param("page")Page<Map<String, Object>> page, @Param("beginTime") String beginTime,
                                               @Param("endTime") String endTime, @Param("alarmContent") String alarmContent);
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 514448a..13bcb04 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
@@ -29,6 +29,29 @@
         GROUP BY WELL_TYPE
     </select>
 
+    <select id="countNowAlarmRecords" resultType="Integer">
+        SELECT  count(*)
+        FROM  alarm_records ar
+        JOIN bus_device_well rdv ON  ar.device_id = rdv.device_id
+        JOIN bus_well_info wi ON rdv.well_id = wi.ID
+        JOIN alarm_job aj ON  ar.job_id = aj.ID
+        WHERE  rdv.VALID = '1'
+        <choose>
+            <when test="alarmType != null and alarmType != ''">
+                <if test="alarmType == 1">
+                    AND ar.ALARM_TYPE = #{alarmType}
+                    AND ar.status = '1'
+                </if>
+                <if test="alarmType == 2">
+                    AND ALARM_TYPE = #{alarmType}
+                </if>
+            </when>
+            <otherwise>
+                AND ar.status = '1'
+            </otherwise>
+        </choose>
+    </select>
+
     <select id="deviceStaticsByType" resultType="map">
          SELECT
 						 bdt.ID  AS  "id",
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 41876f4..8e200b2 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,13 +25,15 @@
 
     List<Map<String, Object>> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException;
 
+    Integer countNowAlarmRecords(DataScope dataScope,String alarmType);
+
     List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope);
 
-    ResponseData alarmWellListPage(DataScope dataScope, Page<Map<String, Object>> page,String beginTime, String endTime, String alarmContent);
+    ResponseData alarmWellListPage(DataScope dataScope, Page<Map<String, Object>> page, String beginTime, String endTime, String alarmContent);
 
-    Object getAlarmCountByType( String beginTime, String endTime, String alarmType);
+    Object getAlarmCountByType(String beginTime, String endTime, String alarmType);
 
-    Object getAlarmByStatus( 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 95110b4..bf3bb38 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
@@ -132,6 +132,10 @@
         return mapList;
     }
 
+   public Integer countNowAlarmRecords(DataScope dataScope,String alarmType){
+        return  statisticMapper.countNowAlarmRecords( dataScope, alarmType);
+   }
+
     @Override
     public List<Map<String, Object>> alarmsByDay(String beginTime, String endTime, DataScope dataScope) {
         String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]");