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 4e43e12..438e4a8 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
@@ -166,7 +166,7 @@
         base_device_type bdt
         WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
         AND bdt.id=BD.DEVICE_TYPE
-        GROUP BY bdt.id
+        GROUP BY bdt.id,bdt.TYPE_NAME
     </select>
 
     <select id="jobsByDept" resultType="map">

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 4e43e12..438e4a8 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
@@ -166,7 +166,7 @@
         base_device_type bdt
         WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
         AND bdt.id=BD.DEVICE_TYPE
-        GROUP BY bdt.id
+        GROUP BY bdt.id,bdt.TYPE_NAME
     </select>
 
     <select id="jobsByDept" resultType="map">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml
index aab9262..a519d7a 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml
@@ -22,11 +22,11 @@
     </sql>
 
     <sql id="Query_Column_List">
-        c.ID AS id, c.DEVICE_ID AS "deviceId", c.FRAMECONTENT AS framecontent,
-         c.SENSORID AS sensorid, c.SENSORCODE AS sensorcode, c.STATUS AS status,
-          c.ATTEMPTSMAX AS attemptsmax, c.ATTEMPTSCURRENT AS attemptscurrent,
-          c.SENDTIME AS sendtime, c.WRITETIME AS writetime,s.id AS deptid,
-          s.full_name AS "deptName",a.WELL_CODE AS "wellCode",d.DEVCODE AS devcode,
+        c.ID AS "id", c.DEVICE_ID AS "deviceId", c.FRAMECONTENT AS "framecontent",
+         c.SENSORID AS "sensorid", c.SENSORCODE AS "sensorcode", c.STATUS AS "status",
+          c.ATTEMPTSMAX AS "attemptsmax", c.ATTEMPTSCURRENT AS "attemptscurrent",
+          c.SENDTIME AS "sendtime", c.WRITETIME AS "writetime",s.id AS "deptid",
+          s.full_name AS "deptName",a.WELL_CODE AS "wellCode",d.DEVCODE AS "devcode",
           d.DEVICE_NAME AS "deviceName",d.DEVICE_TYPE AS "deviceType",
           t.TYPE_NAME AS "deviceTypeName"
     </sql>

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 4e43e12..438e4a8 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
@@ -166,7 +166,7 @@
         base_device_type bdt
         WHERE BD.VALID = '1' AND BDW.VALID='1' AND BWI.DEPTID IN (${deptIds})
         AND bdt.id=BD.DEVICE_TYPE
-        GROUP BY bdt.id
+        GROUP BY bdt.id,bdt.TYPE_NAME
     </select>
 
     <select id="jobsByDept" resultType="map">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml
index aab9262..a519d7a 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml
@@ -22,11 +22,11 @@
     </sql>
 
     <sql id="Query_Column_List">
-        c.ID AS id, c.DEVICE_ID AS "deviceId", c.FRAMECONTENT AS framecontent,
-         c.SENSORID AS sensorid, c.SENSORCODE AS sensorcode, c.STATUS AS status,
-          c.ATTEMPTSMAX AS attemptsmax, c.ATTEMPTSCURRENT AS attemptscurrent,
-          c.SENDTIME AS sendtime, c.WRITETIME AS writetime,s.id AS deptid,
-          s.full_name AS "deptName",a.WELL_CODE AS "wellCode",d.DEVCODE AS devcode,
+        c.ID AS "id", c.DEVICE_ID AS "deviceId", c.FRAMECONTENT AS "framecontent",
+         c.SENSORID AS "sensorid", c.SENSORCODE AS "sensorcode", c.STATUS AS "status",
+          c.ATTEMPTSMAX AS "attemptsmax", c.ATTEMPTSCURRENT AS "attemptscurrent",
+          c.SENDTIME AS "sendtime", c.WRITETIME AS "writetime",s.id AS "deptid",
+          s.full_name AS "deptName",a.WELL_CODE AS "wellCode",d.DEVCODE AS "devcode",
           d.DEVICE_NAME AS "deviceName",d.DEVICE_TYPE AS "deviceType",
           t.TYPE_NAME AS "deviceTypeName"
     </sql>
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java
index 1a3b37e..5b37acc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java
@@ -396,7 +396,7 @@
             dto.setDevcode(objectMap.get("devcode").toString());
 //            dto.setDeviceName(objectMap.get("deviceName").toString());
             dto.setDeviceType(null != objectMap.get("deviceType") ?
-                    Long.valueOf(objectMap.get("deviceType").toString()) : null);
+                    Long.valueOf(objectMap.get("deviceType").toString().replaceAll(" ","")) : null);
             dto.setDeviceTypeName(objectMap.get("deviceTypeName").toString());
             dto.setDeptid(objectMap.get("deptid").toString());
             dto.setDeptName(objectMap.get("deptName").toString());