jiangjiazhi / regional-platform

Authored by tranny over 4 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 12 additions and 3 deletions

...	...	@@ -819,7 +819,7 @@
819	819	*/
820	820	@RequestMapping(value = "/getBabyDiseases", method = RequestMethod.GET)
821	821	@ResponseBody
822		- public List<String> getBabyDisease(@RequestParam(required = true) String id) {
	822	+ public Map<String,Object> getBabyDisease(@RequestParam(required = true) String id) {
823	823
824	824	return babyBookbuildingFacade.getBabyDisease(id);
825	825

...	...	@@ -5042,15 +5042,24 @@
5042	5042	}
5043	5043
5044	5044
5045		- public List <String> getBabyDisease(String id) {
	5045	+ public Map<String,Object> getBabyDisease(String id) {
	5046	+
	5047	+ Map<String,Object> data = new HashMap<>();
	5048	+
5046	5049	List <String> diseases = new ArrayList <>();
5047	5050	BabyModel babyModel = babyBookbuildingService.queryBabyBuildById(id);
5048	5051	if (babyModel != null && CollectionUtils.isNotEmpty(babyModel.getDiseases())) {
5049	5052	for (int i = 0, len = babyModel.getDiseases().size(); i < len; i++) {
5050	5053	diseases.add(BabyDiseaseEnums.getNameById(Integer.parseInt(babyModel.getDiseases().get(i))));
5051	5054	}
	5055	+ data.put("diseases", diseases);
	5056	+ data.put("openDisease",com.lyms.platform.common.utils.StringUtils.isNotEmpty(babyModel.getOpenDisease()) ? babyModel.getOpenDisease() : "1");
	5057	+ data.put("openDiseaseType", babyModel.getOpenDiseaseType());
	5058	+ data.put("openDiseaseEndTime", DateUtil.getyyyy_MM_dd(babyModel.getOpenDiseaseEndTime()));
	5059	+ data.put("babyBirthday",DateUtil.getyyyy_MM_dd(babyModel.getBirth()));
	5060	+
5052	5061	}
5053		- return diseases;
	5062	+ return data;
5054	5063	}
5055	5064
5056	5065	public BaseResponse getBabyAppBuildInfo(String phone) {