jiangjiazhi / regional-platform

Authored by liquanyu over 8 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 12 additions and 4 deletions

...	...	@@ -23,6 +23,7 @@
23	23
24	24	import javax.servlet.http.HttpServletRequest;
25	25	import java.util.ArrayList;
	26	+import java.util.HashMap;
26	27	import java.util.List;
27	28	import java.util.Map;
28	29
29	30
...	...	@@ -165,14 +166,14 @@
165	166	*/
166	167	@RequestMapping(method = RequestMethod.GET, value = "/getNoSendLis")
167	168	@ResponseBody
168		- public List<Map<String,String>> getNoSendLis(@RequestParam("page") Integer page,
	169	+ public Map<String,Object> getNoSendLis(@RequestParam("page") Integer page,
169	170	@RequestParam("limit") Integer limit,
170	171	@RequestHeader("Authorization") String token) {
171	172
172	173	if (!"3d19960bf3e81e7d816c4f26051c49ba".equals(token))
173	174	{
174	175	ExceptionUtils.catchException("The request token is " + token);
175		- return new ArrayList<>();
	176	+ return new HashMap<>();
176	177	}
177	178
178	179	return lisFacade.getNoSendLis(page, limit);

...	...	@@ -668,7 +668,7 @@
668	668	return hospitalNames;
669	669	}
670	670
671		- public List<Map<String,String>> getNoSendLis(Integer page, Integer limit) {
	671	+ public Map<String,Object> getNoSendLis(Integer page, Integer limit) {
672	672
673	673	LisReportQuery query = new LisReportQuery();
674	674	query.setPage(page);
...	...	@@ -677,6 +677,10 @@
677	677	query.setSort(" PUBLISH_TIME DESC ");
678	678	query.setStatus(0); //未推送状态
679	679
	680	+
	681	+ Map<String,Object> result = new HashMap<>();
	682	+
	683	+
680	684	final CopyOnWriteArraySet<String> patientIds = new CopyOnWriteArraySet<>();
681	685	List<Map<String,String>> lists = new ArrayList<>();
682	686
...	...	@@ -724,7 +728,10 @@
724	728	}
725	729	patientIds.clear();
726	730
727		- return lists;
	731	+ result.put("list", lists);
	732	+ result.put("hasNext",CollectionUtils.isNotEmpty(lises) && lises.size() >= limit ? "true" : "false");
	733	+
	734	+ return result;
728	735	}
729	736
730	737	public BaseResponse getBabyLisAssistCheckInfo(String vcCardNo, String phone, String checkTime,Integer userId) {