jiangjiazhi / regional-platform

Authored by wtt over 5 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 5 additions and 1 deletions

...	...	@@ -734,6 +734,7 @@
734	734	data = convertToTwinsPatient(riskPatientsQueryRequest,patientses, userId, hospital);
735	735	}
736	736	}
	737	+ patientsQuery.mysqlBuild(data.size());
737	738	return new BaseListResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(data).setPageInfo(patientsQuery.getPageInfo());
738	739	}
739	740	/**
740	741
...	...	@@ -761,8 +762,10 @@
761	762	if (type == 1) {
762	763	//处理全部孕妇的情况
763	764	data = convertToRareList(riskPatientsQueryRequest,patientses, userId, hospital);
	765	+
764	766	}
765	767	}
	768	+ patientsQuery.mysqlBuild(data.size());
766	769	return new BaseListResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(data).setPageInfo(patientsQuery.getPageInfo());
767	770	}
768	771
...	...	@@ -899,7 +902,7 @@
899	902	}
900	903	for (Future f : listFuture) {
901	904	try {
902		- data.addAll((List) f.get(30, TimeUnit.SECONDS));
	905	+ data.addAll((List) f.get(300, TimeUnit.SECONDS));
903	906	} catch (Exception e) {
904	907	ExceptionUtils.catchException(e, "convertToQuanPatient get result Future error.");
905	908	}

...	...	@@ -325,6 +325,7 @@
325	325	twinsPatientsResult.setrLevel(HighScoreResult.filter(level));
326	326	}
327	327	stopWatch.stop();
	328	+ data.add(twinsPatientsResult);
328	329	logger.debug(stopWatch.toString());
329	330	}
330	331	return data;