jiangjiazhi / yimiao

Authored by landong2015 over 9 years ago

Exists in master

Showing 4 changed files with 5 additions and 11 deletions

...	...	@@ -45,7 +45,6 @@
45	45	AppVersion version = new AppVersion(100, "1.0.0", "当前为最新版本","");
46	46	Map<String, Object> map = new HashMap<>();
47	47	map.put("version", version);
48		- map.put("forceUpdate", 0);
49	48	map.put("errorcode", ConstantInterface.SUCCESS);
50	49	map.put("errormsg", "成功");
51	50	writeJson(response, JsonUtil.obj2JsonString(map));

...	...	@@ -161,7 +161,7 @@
161	161	* @param response
162	162	* @param id 宝宝id
163	163	*/
164		- @RequestMapping(value = "/relateKids", method = RequestMethod.POST)
	164	+ @RequestMapping(value = "/babys", method = RequestMethod.POST)
165	165	@TokenRequired
166	166	public void UserRelateKids(HttpServletResponse response,
167	167	@RequestParam("id")String id){
...	...	@@ -194,7 +194,7 @@
194	194	* @param response
195	195	* @param id 宝宝id
196	196	*/
197		- @RequestMapping(value = "/kids", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE + ";charset=utf-8")
	197	+ @RequestMapping(value = "/babys", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE + ";charset=utf-8")
198	198	@TokenRequired
199	199	public void getKids(HttpServletResponse response,
200	200	@RequestParam("id")String id) {
...	...	@@ -247,7 +247,7 @@
247	247	* @param response
248	248	* @param mouthAge 月龄
249	249	*/
250		- @RequestMapping(value = "/kidsVaccines", method = RequestMethod.GET)
	250	+ @RequestMapping(value = "/inoculatePlan", method = RequestMethod.GET)
251	251	@TokenRequired
252	252	public void getKidVaccines(HttpServletResponse response,
253	253	@RequestParam("mouthAge")String mouthAge,

...	...	@@ -55,12 +55,6 @@
55	55	}else {
56	56	map.put("city",null);
57	57	}
58		- //区
59		- if (medOrganization.getoCityNo()!=null){
60		- map.put("city",medAreaService.getMedArea(medOrganization.getoCityNo()) == null ? null : medAreaService.getMedArea(medOrganization.getoCityNo()).getAName());
61		- }else {
62		- map.put("city",null);
63		- }
64	58	//县
65	59	if (medOrganization.getoCountyNo()!=null){
66	60	map.put("county",medAreaService.getMedArea(medOrganization.getoCountyNo()) == null ? null : medAreaService.getMedArea(medOrganization.getoCountyNo()).getAName());

...	...	@@ -39,10 +39,11 @@
39	39	return;
40	40	}
41	41	Map<String,Object> map = new HashMap<>();
	42	+ map.put("id",medVaccineName.getVnId());
42	43	//1.免费2.收费
43	44	map.put("vaccineType",medVaccineName.getVnVaccineType());
44	45	//疫苗名称
45		- map.put("vaccineName",medVaccineName.getVnName());
	46	+ map.put("title",medVaccineName.getVnName());
46	47	//接种预防疾病
47	48	map.put("preventDisease",medVaccineName.getVnPreventDisease());
48	49	//TODO 接种月龄需要处理成 3月龄(1/2),6月龄(2/2)