jiangjiazhi / regional-platform

Authored by wtt about 4 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 4 additions and 3 deletions

...	...	@@ -96,7 +96,7 @@
96	96	if(listFuture != null){
97	97	for (Future f : listFuture) {
98	98	try {
99		- if(f!=null && f.get(30, TimeUnit.SECONDS)!=null){
	99	+ if(f!=null && f.get(85, TimeUnit.SECONDS)!=null){
100	100	data.addAll((List <Map>) f.get(300, TimeUnit.SECONDS));
101	101	}
102	102	} catch (Exception e) {
...	...	@@ -133,7 +133,7 @@
133	133	return getDtzMap(queryRequest, provinceCityAreaHid);
134	134	}
135	135	}
136		- //4 ：中重度贫血率
	136	+ //4 ：5岁以下中重度贫血率
137	137	class ZdpxMap implements Statistic{
138	138	@Override
139	139	public Map <String, Object> statisticMap(BabyStatisticsQueryRequest queryRequest, List <String> provinceCityAreaHid) {
...	...	@@ -330,7 +330,7 @@
330	330	e.printStackTrace();
331	331	}
332	332	maps.put("data", map);
333		- maps.put("name", "中重度贫血率");
	333	+ maps.put("name", "5岁以下中重度贫血率");
334	334	return maps;
335	335	}
336	336

...	...	@@ -897,6 +897,7 @@
897	897
898	898	//多线程
899	899	patientsQuery.setIds(maternalDeliverParentIds);
	900	+ patientsQuery.setNeed("true");
900	901	List <Patients> ps = patientsService.queryPatientBySort(patientsQuery, "modified","desc");
901	902	if (CollectionUtils.isNotEmpty(ps)) {
902	903	data = convertToHugeQuanWeight(ps);