jiangjiazhi / regional-platform

Authored by shiyang almost 3 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 57 additions and 3 deletions

...	...	@@ -44,6 +44,51 @@
44	44	this.name = name;
45	45	}
46	46	}
	47	+ public enum JCTCEnums2 {
	48	+ A(1, "1月龄"),
	49	+ B(2, "2月龄"),
	50	+ C(3, "3月龄"),
	51	+ D(4, "4月龄"),
	52	+ E(5, "5月龄"),
	53	+ F(6, "6月龄"),
	54	+ G(7, "7月龄"),
	55	+ H(8, "8月龄"),
	56	+ I(9, "9月龄"),
	57	+ J(10, "10月龄"),
	58	+ K(11, "11月龄"),
	59	+ L(12, "12月龄"),
	60	+ M(18, "18月龄"),
	61	+ N(24, "24月龄"),
	62	+ O(30, "30月龄"),
	63	+ P(36, "36月龄"),
	64	+ Q(48, "4岁"),
	65	+ R(60, "5岁"),
	66	+ S(72, "6岁");
	67	+
	68	+ private int id;
	69	+ private String name;
	70	+
	71	+ JCTCEnums2(int id, String name) {
	72	+ this.id = id;
	73	+ this.name = name;
	74	+ }
	75	+
	76	+ public int getId() {
	77	+ return id;
	78	+ }
	79	+
	80	+ public void setId(int id) {
	81	+ this.id = id;
	82	+ }
	83	+
	84	+ public String getName() {
	85	+ return name;
	86	+ }
	87	+
	88	+ public void setName(String name) {
	89	+ this.name = name;
	90	+ }
	91	+ }
47	92
48	93	public enum CNQKEnums {
49	94	A(1, "好"),

...	...	@@ -10,6 +10,7 @@
10	10	import com.lyms.platform.common.result.BaseObjectResponse;
11	11	import com.lyms.platform.common.result.BaseResponse;
12	12	import com.lyms.platform.common.result.RespBuilder;
	13	+import com.lyms.platform.common.utils.HttpRequest;
13	14	import com.lyms.platform.common.utils.StringUtils;
14	15	import com.lyms.platform.operate.web.facade.AutoMatchFacade;
15	16	import com.lyms.platform.operate.web.facade.BabyCheckFacade;
...	...	@@ -355,8 +356,9 @@
355	356	*/
356	357	@RequestMapping(value = "/getBaseConfig", method = RequestMethod.GET)
357	358	@ResponseBody
358		- public BaseObjectResponse getBaseConfig() {
359		- return babyCheckFacade.getBaseConfig();
	359	+ public BaseObjectResponse getBaseConfig(HttpServletRequest request) {
	360	+ LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
	361	+ return babyCheckFacade.getBaseConfig(loginState.getId());
360	362	}
361	363
362	364	/**

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