diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ScreenDataService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ScreenDataService.java
index db1f830..d6b455c 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ScreenDataService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ScreenDataService.java
@@ -3,8 +3,8 @@
 import com.casic.missiles.model.response.ResponseData;
 
 public interface ScreenDataService {
-    ResponseData getInstalledDevice(String beginTime, String endTime);
+    Object getInstalledDevice(String beginTime, String endTime);
 
-    ResponseData getKindsAlarmRate(String beginTime, String endTime);
+    Object getKindsAlarmRate(String beginTime, String endTime);
 
 }

diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ScreenDataService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ScreenDataService.java
index db1f830..d6b455c 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ScreenDataService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ScreenDataService.java
@@ -3,8 +3,8 @@
 import com.casic.missiles.model.response.ResponseData;
 
 public interface ScreenDataService {
-    ResponseData getInstalledDevice(String beginTime, String endTime);
+    Object getInstalledDevice(String beginTime, String endTime);
 
-    ResponseData getKindsAlarmRate(String beginTime, String endTime);
+    Object getKindsAlarmRate(String beginTime, String endTime);
 
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ScreenDataServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ScreenDataServiceImpl.java
index bcf14b3..34ce478 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ScreenDataServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ScreenDataServiceImpl.java
@@ -28,35 +28,25 @@
         this.permissionService = permissionService;
     }
 
-    public ResponseData getInstalledDevice(String beginTime, String endTime) {
-        ResponseData responseData = new ResponseData();
+    public Object getInstalledDevice(String beginTime, String endTime) {
+        List<Map<String, Object>> installedDeviceList = null;
         try {
-            List<Map<String, Object>> installedDeviceList = initInstalledDevice();
-            responseData.setData(installedDeviceList);
-            responseData.setMessage("查询成功");
-            responseData.setCode(200);
+            installedDeviceList = initInstalledDevice();
         } catch (DataAccessException dex) {
             log.error("主题：查询燃气探测仪设备数据出现数据异常,开始时间{},结束时间{},异常信息{}", beginTime, endTime, dex);
-            responseData.setMessage("查询异常");
-            responseData.setCode(500);
         }
-        return responseData;
+        return installedDeviceList;
     }
 
 
-    public ResponseData getKindsAlarmRate(String beginTime, String endTime) {
-        ResponseData responseData = new ResponseData();
+    public Object getKindsAlarmRate(String beginTime, String endTime) {
+        List<Map<String, Object>> rateDeviceList = null;
         try {
-            List<Map<String, Object>> rateDeviceList = countTypeAlarm();
-            responseData.setData(rateDeviceList);
-            responseData.setMessage("查询成功");
-            responseData.setCode(200);
+            rateDeviceList = countTypeAlarm();
         } catch (DataAccessException dex) {
             log.error("主题：查询燃气探测仪设备数据出现数据异常,开始时间{},结束时间{},异常信息{}", beginTime, endTime, dex);
-            responseData.setMessage("查询异常");
-            responseData.setCode(500);
         }
-        return responseData;
+        return rateDeviceList;
     }
 
     private List<Map<String, Object>> initInstalledDevice() {
@@ -67,7 +57,7 @@
         deviceCountList.forEach(
                 deviceCountMap -> {
                     Map<String, Object> installedDeviceMap = new HashMap<>();
-                    installedDeviceMap.put("count", deviceCountMap.get("deviceType"));
+                    installedDeviceMap.put("count", deviceCountMap.get("count"));
                     installedDeviceMap.put("typeName", DeviceDataTableEnum.DEVICE_TYPE_TABLE.getTableNameMap().
                             get(Integer.valueOf(String.valueOf(deviceCountMap.get("deviceType")))).getTypeName());
                     installedDeviceList.add(installedDeviceMap);
@@ -88,11 +78,12 @@
 //        deviceCountList.forEach(
         for (Map deviceCountMap : deviceCountList) {
             Map<String, Object> rateDeviceMap = new HashMap<>();
-            rateDeviceMap.put("rate", df.format(Double.valueOf(deviceCountMap.get("deviceType") == null ? "0" : deviceCountMap.get("deviceType").toString()) / totalAlarm));
+            rateDeviceMap.put("rate", totalAlarm==0?0:df.format(Double.valueOf(deviceCountMap.get("count") == null ? "0" : deviceCountMap.get("count").toString()) / totalAlarm));
             rateDeviceMap.put("typeName", DeviceDataTableEnum.DEVICE_TYPE_TABLE.getTableNameMap().
                     get(Integer.valueOf(deviceCountMap.get("deviceType").toString())).getTypeName());
             rateDeviceList.add(rateDeviceMap);
-        } ;
+        }
+        ;
 //        for (Object deviceType : JSON.parseObject(deviceTypes, List.class)) {
 //            Map<String, Object> rateDeviceMap = new HashMap<>();
 //            rateDeviceMap.put("rate", df.format(Double.valueOf(deviceCountMap.get(deviceType) == null ? "0" : deviceCountMap.get(deviceType)) / totalAlarm));