jiangjiazhi / regional-platform

Authored by litao about 8 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 16 additions and 1 deletions

...	...	@@ -75,6 +75,7 @@
75	75	Map<String, Object> tempMap = new HashMap<>();
76	76	Patients p = mongoTemplate.findById(model.getParentId(), Patients.class);
77	77	tempMap.put("id", model.getId());
	78	+ tempMap.put("pid", p.getPid());
78	79	tempMap.put("vcCardNo", p.getVcCardNo());
79	80	tempMap.put("pcerteTypeId", p.getPcerteTypeId());
80	81	tempMap.put("checkTime", model.getCheckTime() == null ? null : DateUtil.getyyyy_MM_dd(model.getCheckTime())); /** 复查日期 */

...	...	@@ -1220,7 +1220,21 @@
1220	1220	for (Map.Entry<String, List<Map<String, Object>>> map : userCheckInfo.entrySet()) {
1221	1221	System.out.println(map.getKey() + " : " + map.getValue());
1222	1222	}
1223		- return null;
	1223	+
	1224	+ Map<Integer, Integer> countMap = new HashMap<>();
	1225	+ for (int i = 1; i < 14; i++) {
	1226	+ countMap.put(i, 0);
	1227	+ }
	1228	+ for (Map<String,Object> map : datas) {
	1229	+
	1230	+ }
	1231	+
	1232	+ List<Map<String,Object>> restList = new ArrayList<>();
	1233	+ Map<String, Object> peoples = new LinkedHashMap<>();
	1234	+ peoples.put("desc", "产检人数");
	1235	+
	1236	+
	1237	+ return restList;
1224	1238	}
1225	1239
1226	1240	private void doMerge(List<Map<String, Object>> datas, List<AntExChuModel> antExChuModels, List<AntenatalExaminationModel> antExModels, List<Patients> patients) {