diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/handler/CaseTypeRankDataHandlerAdapter.java b/casic-server/src/main/java/com/casic/missiles/modular/system/handler/CaseTypeRankDataHandlerAdapter.java
index cf1fe50..af760d1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/handler/CaseTypeRankDataHandlerAdapter.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/handler/CaseTypeRankDataHandlerAdapter.java
@@ -38,31 +38,29 @@
                 params[0] = DateFormateUtil.getDayCycle(-1);
                 objectLast = (List<Map<String, Object>>) DataSqlUtil.processData(currView);
                 break;
-
             case "week":
-
                 params[0] = DateFormateUtil.getWeekCycle(0).split(",")[1];
-                String begtime1= DateFormateUtil.getWeekCycle(0).split(",")[0];
-                String sql1="SELECT SUM(t1.alarm_num) AS value,IFNULL(t2.name,'其他') AS name \n" +
+                String begtime1 = DateFormateUtil.getWeekCycle(0).split(",")[0];
+                String sql1 = "SELECT SUM(t1.alarm_num) AS value,IFNULL(t2.name,'其他') AS name \n" +
                         "FROM casic_urban_governance.traffic_control_crossing_alarm_type_day  t1\n" +
                         "LEFT JOIN casic_urban_governance.traffic_control_crossing_dict  t2\n" +
                         "ON t1.alarm_type = t2.key\n" +
-                        "WHERE t1.STATISTIC_TIME  BETWEEN '"+begtime1 +"'  AND {0} GROUP BY t1.ALARM_TYPE";
+                        "WHERE t1.STATISTIC_TIME  BETWEEN '" + begtime1 + "'  AND {0} GROUP BY t1.ALARM_TYPE";
                 currView.setSqlContent(sql1);
                 objectNow = (List<Map<String, Object>>) DataSqlUtil.processData(currView);
-                params[0] =  DateFormateUtil.getWeekCycle(-1).split(",")[1];
-                String begtime2=DateFormateUtil.getWeekCycle(-1).split(",")[0];
-                String sql2="SELECT SUM(t1.alarm_num) AS value,IFNULL(t2.name,'其他') AS name \n" +
+                params[0] = DateFormateUtil.getWeekCycle(-1).split(",")[1];
+                String begtime2 = DateFormateUtil.getWeekCycle(-1).split(",")[0];
+                String sql2 = "SELECT SUM(t1.alarm_num) AS value,IFNULL(t2.name,'其他') AS name \n" +
                         "FROM casic_urban_governance.traffic_control_crossing_alarm_type_day  t1\n" +
                         "LEFT JOIN casic_urban_governance.traffic_control_crossing_dict  t2\n" +
                         "ON t1.alarm_type = t2.key\n" +
-                        "WHERE t1.STATISTIC_TIME BETWEEN '"+begtime2 +"'  AND {0} GROUP BY t1.ALARM_TYPE";
+                        "WHERE t1.STATISTIC_TIME BETWEEN '" + begtime2 + "'  AND {0} GROUP BY t1.ALARM_TYPE";
                 currView.setSqlContent(sql2);
                 objectLast = (List<Map<String, Object>>) DataSqlUtil.processData(currView);
                 break;
             case "month":
                 params[0] = DateFormateUtil.getMonthCycle(0);
-                String sqlM1="SELECT SUM(t1.alarm_num) AS value,IFNULL(t2.name,'其他') AS name \n" +
+                String sqlM1 = "SELECT SUM(t1.alarm_num) AS value,IFNULL(t2.name,'其他') AS name \n" +
                         "FROM casic_urban_governance.traffic_control_crossing_alarm_type_day  t1\n" +
                         "LEFT JOIN casic_urban_governance.traffic_control_crossing_dict  t2\n" +
                         "ON t1.alarm_type = t2.key\n" +
@@ -74,7 +72,7 @@
                 break;
             case "year":
                 params[0] = DateFormateUtil.getYearCycle(0);
-                String sqlY1="SELECT SUM(t1.alarm_num) AS value,IFNULL(t2.name,'其他') AS name \n" +
+                String sqlY1 = "SELECT SUM(t1.alarm_num) AS value,IFNULL(t2.name,'其他') AS name \n" +
                         "FROM casic_urban_governance.traffic_control_crossing_alarm_type_day  t1\n" +
                         "LEFT JOIN casic_urban_governance.traffic_control_crossing_dict  t2\n" +
                         "ON t1.alarm_type = t2.key\n" +
@@ -102,7 +100,8 @@
 
                         String percent = PercentUtils.percentBigDecimal(new BigDecimal(nowMap.get("value") + ""), new BigDecimal(lastMap.get("value") + ""));
 
-                        nowMap.put("percent", Double.parseDouble(percent.substring(0, percent.length() - 1)));
+                        nowMap.put("percent", ToolUtil.isNotEmpty(percent) ?
+                                Double.parseDouble(percent.substring(0, percent.length() - 1)) : 0);
 
                         break;
                     }
@@ -131,7 +130,6 @@
             }
         }
 
-
         return objectNow;
     }
 

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/handler/CaseTypeRankDataHandlerAdapter.java b/casic-server/src/main/java/com/casic/missiles/modular/system/handler/CaseTypeRankDataHandlerAdapter.java
index cf1fe50..af760d1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/handler/CaseTypeRankDataHandlerAdapter.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/handler/CaseTypeRankDataHandlerAdapter.java
@@ -38,31 +38,29 @@
                 params[0] = DateFormateUtil.getDayCycle(-1);
                 objectLast = (List<Map<String, Object>>) DataSqlUtil.processData(currView);
                 break;
-
             case "week":
-
                 params[0] = DateFormateUtil.getWeekCycle(0).split(",")[1];
-                String begtime1= DateFormateUtil.getWeekCycle(0).split(",")[0];
-                String sql1="SELECT SUM(t1.alarm_num) AS value,IFNULL(t2.name,'其他') AS name \n" +
+                String begtime1 = DateFormateUtil.getWeekCycle(0).split(",")[0];
+                String sql1 = "SELECT SUM(t1.alarm_num) AS value,IFNULL(t2.name,'其他') AS name \n" +
                         "FROM casic_urban_governance.traffic_control_crossing_alarm_type_day  t1\n" +
                         "LEFT JOIN casic_urban_governance.traffic_control_crossing_dict  t2\n" +
                         "ON t1.alarm_type = t2.key\n" +
-                        "WHERE t1.STATISTIC_TIME  BETWEEN '"+begtime1 +"'  AND {0} GROUP BY t1.ALARM_TYPE";
+                        "WHERE t1.STATISTIC_TIME  BETWEEN '" + begtime1 + "'  AND {0} GROUP BY t1.ALARM_TYPE";
                 currView.setSqlContent(sql1);
                 objectNow = (List<Map<String, Object>>) DataSqlUtil.processData(currView);
-                params[0] =  DateFormateUtil.getWeekCycle(-1).split(",")[1];
-                String begtime2=DateFormateUtil.getWeekCycle(-1).split(",")[0];
-                String sql2="SELECT SUM(t1.alarm_num) AS value,IFNULL(t2.name,'其他') AS name \n" +
+                params[0] = DateFormateUtil.getWeekCycle(-1).split(",")[1];
+                String begtime2 = DateFormateUtil.getWeekCycle(-1).split(",")[0];
+                String sql2 = "SELECT SUM(t1.alarm_num) AS value,IFNULL(t2.name,'其他') AS name \n" +
                         "FROM casic_urban_governance.traffic_control_crossing_alarm_type_day  t1\n" +
                         "LEFT JOIN casic_urban_governance.traffic_control_crossing_dict  t2\n" +
                         "ON t1.alarm_type = t2.key\n" +
-                        "WHERE t1.STATISTIC_TIME BETWEEN '"+begtime2 +"'  AND {0} GROUP BY t1.ALARM_TYPE";
+                        "WHERE t1.STATISTIC_TIME BETWEEN '" + begtime2 + "'  AND {0} GROUP BY t1.ALARM_TYPE";
                 currView.setSqlContent(sql2);
                 objectLast = (List<Map<String, Object>>) DataSqlUtil.processData(currView);
                 break;
             case "month":
                 params[0] = DateFormateUtil.getMonthCycle(0);
-                String sqlM1="SELECT SUM(t1.alarm_num) AS value,IFNULL(t2.name,'其他') AS name \n" +
+                String sqlM1 = "SELECT SUM(t1.alarm_num) AS value,IFNULL(t2.name,'其他') AS name \n" +
                         "FROM casic_urban_governance.traffic_control_crossing_alarm_type_day  t1\n" +
                         "LEFT JOIN casic_urban_governance.traffic_control_crossing_dict  t2\n" +
                         "ON t1.alarm_type = t2.key\n" +
@@ -74,7 +72,7 @@
                 break;
             case "year":
                 params[0] = DateFormateUtil.getYearCycle(0);
-                String sqlY1="SELECT SUM(t1.alarm_num) AS value,IFNULL(t2.name,'其他') AS name \n" +
+                String sqlY1 = "SELECT SUM(t1.alarm_num) AS value,IFNULL(t2.name,'其他') AS name \n" +
                         "FROM casic_urban_governance.traffic_control_crossing_alarm_type_day  t1\n" +
                         "LEFT JOIN casic_urban_governance.traffic_control_crossing_dict  t2\n" +
                         "ON t1.alarm_type = t2.key\n" +
@@ -102,7 +100,8 @@
 
                         String percent = PercentUtils.percentBigDecimal(new BigDecimal(nowMap.get("value") + ""), new BigDecimal(lastMap.get("value") + ""));
 
-                        nowMap.put("percent", Double.parseDouble(percent.substring(0, percent.length() - 1)));
+                        nowMap.put("percent", ToolUtil.isNotEmpty(percent) ?
+                                Double.parseDouble(percent.substring(0, percent.length() - 1)) : 0);
 
                         break;
                     }
@@ -131,7 +130,6 @@
             }
         }
 
-
         return objectNow;
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/handler/CountByYearDataHandlerAdapter.java b/casic-server/src/main/java/com/casic/missiles/modular/system/handler/CountByYearDataHandlerAdapter.java
index d91f4ab..77d467b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/handler/CountByYearDataHandlerAdapter.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/handler/CountByYearDataHandlerAdapter.java
@@ -95,6 +95,17 @@
                 dataMap.put("data", dataList);
                 mapList.add(dataMap);
             }
+
+        }
+
+        for(Map<String, Object> map : mapList ){
+            List<Map<String, Object>>  mapList1= (List<Map<String, Object>>)map.get("data");
+            Collections.sort(mapList1, new Comparator<Map<String, Object>>() {
+                @Override
+                public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+                    return ((String) o1.get("type")).compareTo((String) o2.get("type"));
+                }
+            });
         }
 
         return mapList;