jiangjiazhi / regional-platform

Commit 707759f4ae31d19760868510113acecd68df2b63

Authored by litao over 8 years ago

Exists in master and in 6 other branches

产检次数分布统计

Showing 2 changed files with 7 additions and 15 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/dao/impl/BaseDaoImpl.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java

...	...	@@ -39,8 +39,8 @@
39	39	return qr.query(sql, new MapListHandler(), params.toArray());
40	40	} catch (SQLException e) {
41	41	logger.error("查询出错: sql: {}, params: {}", sql, params);
42		- throw new RuntimeException();
43	42	}
	43	+ return null;
44	44	}
45	45	}

...	...	@@ -52,8 +52,8 @@
52	52	}
53	53
54	54
55		- private Map<String, Object> createGrid(List<Object> peopleList, List<Object> proportionList) {
56		- Map<String, Object> map = new HashMap<>();
	55	+ private List<Map<String, Object>> createGrid(List<Object> peopleList, List<Object> proportionList) {
	56	+ List<Map<String, Object>> restList = new ArrayList<>();
57	57	Map<String, Object> peoples = new HashMap<>();
58	58	peoples.put("desc", peopleList.get(0)); /** 产检人数 */
59	59	peoples.put("count", peopleList.get(1));/** 总计 */
...	...	@@ -69,8 +69,7 @@
69	69	peoples.put("tenTimes", peopleList.get(11));
70	70	peoples.put("elevenTimes", peopleList.get(12));
71	71	peoples.put("twelveTimes", peopleList.get(13));
72		-// map.put("peoples", peopleList);
73		- map.put("peoples", peoples);
	72	+ restList.add(peoples);
74	73
75	74	Map<String, Object> proportion = new HashMap<>();
76	75	proportion.put("desc", proportionList.get(0)); /** 占比 */
...	...	@@ -87,9 +86,8 @@
87	86	proportion.put("tenTimes", proportionList.get(11));
88	87	proportion.put("elevenTimes", proportionList.get(12));
89	88	proportion.put("twelveTimes", proportionList.get(13));
90		-// map.put("proportion", proportionList);
91		- map.put("proportion", proportion);
92		- return map;
	89	+ restList.add(proportion);
	90	+ return restList;
93	91	}
94	92
95	93	private List<Object> createProportion(List<Object> peopleList) {
...	...	@@ -137,6 +135,7 @@
137	135	List<Object> newList = new ArrayList<>();
138	136	newList.addAll(list);
139	137	newList.remove(0);
	138	+ newList.remove(0);
140	139	return newList;
141	140	}
142	141
...	...	@@ -238,12 +237,5 @@
238	237	return sql.toString();
239	238	}
240	239
241		- public static void main(String[] args) {
242		- System.out.println("1".equals("" + 1));
243		- System.out.println(StringUtils.isNotBlank(""));
244		-
245		-
246		-
247		- }
248	240	}