jiangjiazhi / regional-platform

Authored by shiyang over 3 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 5 additions and 9 deletions

...	...	@@ -356,9 +356,8 @@
356	356	*/
357	357	@RequestMapping(value = "/getBaseConfig", method = RequestMethod.GET)
358	358	@ResponseBody
359		- public BaseObjectResponse getBaseConfig(HttpServletRequest request) {
360		- LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
361		- return babyCheckFacade.getBaseConfig(loginState.getId());
	359	+ public BaseObjectResponse getBaseConfig() {
	360	+ return babyCheckFacade.getBaseConfig();
362	361	}
363	362
364	363	/**

...	...	@@ -3084,8 +3084,7 @@
3084	3084	return growthEvaluate;
3085	3085	}
3086	3086
3087		- public BaseObjectResponse getBaseConfig(Integer userId) {
3088		- final String hospitalId = autoMatchFacade.getHospitalId(userId);
	3087	+ public BaseObjectResponse getBaseConfig() {
3089	3088
3090	3089	Map <String, Object> map = new HashMap();
3091	3090
...	...	@@ -3106,10 +3105,8 @@
3106	3105	map.put("jctc", jctc);
3107	3106
3108	3107	//隆化定制月龄套餐
3109		- if(StringUtils.isNotEmpty(hospitalId) && "2100001605".equals(hospitalId)){
3110		- List jctc2 = EnumUtil.toJson(ChildCareEnums.JCTCEnums2.class);
3111		- map.put("jctc", jctc2);
3112		- }
	3108	+ List jctc2 = EnumUtil.toJson(ChildCareEnums.JCTCEnums2.class);
	3109	+ map.put("jctc", jctc2);
3113	3110
3114	3111
3115	3112	List diseases = BabyDiseaseEnums.getBabyDiseaseEnums();