jiangjiazhi / regional-platform

Authored by liquanyu almost 7 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 3 additions and 6 deletions

...	...	@@ -237,7 +237,7 @@
237	237	@RequestMapping("/currentCheckBabyList")
238	238	@ResponseBody
239	239	@TokenRequired
240		- public Object currentCheckBabyList(HttpServletRequest request){
	240	+ public BaseObjectResponse currentCheckBabyList(HttpServletRequest request){
241	241
242	242	return babyCheckFacade.getCurrentDayCheckBabies(getUserId(request));
243	243	}

...	...	@@ -1745,11 +1745,9 @@
1745	1745	}
1746	1746
1747	1747
1748		- public List<Map<String,String>> getCurrentDayCheckBabies(Integer userId)
	1748	+ public BaseObjectResponse getCurrentDayCheckBabies(Integer userId)
1749	1749	{
1750	1750	String hospitalId = autoMatchFacade.getHospitalId(userId);
1751		- List<Map<String,String>> babyList = new ArrayList<>();
1752		-
1753	1751	Date currentDay = DateUtil.parseYMD(DateUtil.getymd());
1754	1752	BabyCheckModelQuery query = new BabyCheckModelQuery();
1755	1753	query.setHospitalId(hospitalId);
...	...	@@ -1817,8 +1815,7 @@
1817	1815	list.add(result);
1818	1816	}
1819	1817	}
1820		-
1821		- return babyList;
	1818	+ return new BaseObjectResponse().setData(list).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
1822	1819	}
1823	1820
1824	1821	}