首页接口完善

dgtis-modules/dgtis-modules-data/src/main/java/com/dgtis/data/api/IndexApiController.java

@@ -143,35 +143,44 @@ public class IndexApiController extends BaseController {
                             JSONObject object = JSONUtil.parseObj(o);
                             if(object!=null){
                                 JSONObject source = object.getJSONObject("_source");
-                                Map map = new HashMap();
                                 String labelname = source.getStr("labelname").trim();
-                                /*map.put("value",source.getStr("bdnum"));
-                                map.put("name",source.getStr("labelname").trim());
-                                seriesData.add(map);*/
                                 Map m = new HashMap();
-                                m.put("name",labelname);
-                                m.put("value",source.getStr("bdnum"));
-                                if("无保单".equals(labelname)){
+                                String bdnum = source.getStr("bdnum");
+                                m.put("value",StringUtils.isEmpty(bdnum)?"0":bdnum);
+                                if(labelname.contains("无保单")){
                                     seriesData[0] = m;
-                                }else if("1件".equals(labelname)){
+                                    m.put("name","无保单");
+                                }else if(labelname.contains("1件")){
                                     seriesData[1] = m;
-                                }else if("2件".equals(labelname)){
+                                    m.put("name","1件");
+                                }else if(labelname.contains("2件")){
                                     seriesData[2] = m;
-                                }else if("3-5件".equals(labelname)){
+                                    m.put("name","2件");
+                                }else if(labelname.contains("3-5件")){
                                     seriesData[3] = m;
-                                }else if("6-10件".equals(labelname)){
+                                    m.put("name","3-5件");
+                                }else if(labelname.contains("6-10件")){
                                     seriesData[4] = m;
-                                }else if("11-20件".equals(labelname)){
+                                    m.put("name","6-10件");
+                                }else if(labelname.contains("11-20件")){
                                     seriesData[5] = m;
-                                }else if("21-50件".equals(labelname)){
+                                    m.put("name","11-20件");
+                                }else if(labelname.contains("21-50件")){
                                     seriesData[6] = m;
+                                    m.put("name","21-50件");
                                 }else{
                                     seriesData[7] = m;
+                                    m.put("name","50件以上");
                                 }
                             }
 
                         }
-
+                       if(seriesData[7]==null){
+                            Map map = new HashMap();
+                            map.put("name","50件以上");
+                            map.put("value","0");
+                           seriesData[7] = map;
+                       }
                     }
                 }
             }