jiangjiazhi / regional-platform

Authored by shiyang about 4 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 69 additions and 3 deletions

...	...	@@ -83,6 +83,42 @@
83	83	}
84	84	return list;
85	85	}
	86	+ //增加3/4/5/6 岁条件
	87	+ public static List<Map> getDatePoint2(Integer pid) {
	88	+
	89	+ List<Map> list = new ArrayList<>();
	90	+ for (DatePointEnums e : DatePointEnums.values()) {
	91	+ if(e.getPid() == pid) {
	92	+ for(int i = 0 ; i <= 39 ;i++)
	93	+ {
	94	+ Map rootMap = new HashMap();
	95	+ switch (i){
	96	+ case 36:
	97	+ rootMap.put("id", i);
	98	+ rootMap.put("name", "3岁");
	99	+ break;
	100	+ case 37:
	101	+ rootMap.put("id", i);
	102	+ rootMap.put("name", "4岁");
	103	+ break;
	104	+ case 38:
	105	+ rootMap.put("id", i);
	106	+ rootMap.put("name", "5岁");
	107	+ break;
	108	+ case 39:
	109	+ rootMap.put("id", i);
	110	+ rootMap.put("name", "6岁");
	111	+ break;
	112	+ default:
	113	+ rootMap.put("id", i);
	114	+ rootMap.put("name", i+e.getName());
	115	+ }
	116	+ list.add(rootMap);
	117	+ }
	118	+ }
	119	+ }
	120	+ return list;
	121	+ }
86	122
87	123	public static String getNameById(int id){
88	124	for(DatePointEnums enums:values()){

...	...	@@ -288,8 +288,38 @@
288	288	request.setBcardNo(bcardNo);
289	289	request.setMcardNo(mcardNo);
290	290	request.setMphone(mphone);
291		- request.setMonthAgeStart(startMonthAge);
292		- request.setMonthAgeEnd(endMonthAge);
	291	+ switch (startMonthAge){
	292	+ case 36:
	293	+ request.setMonthAgeStart(startMonthAge);
	294	+ break;
	295	+ case 37:
	296	+ request.setMonthAgeStart(48);
	297	+ break;
	298	+ case 38:
	299	+ request.setMonthAgeStart(60);
	300	+ break;
	301	+ case 39:
	302	+ request.setMonthAgeStart(72);
	303	+ break;
	304	+ default:
	305	+ request.setMonthAgeStart(startMonthAge);
	306	+ }
	307	+ switch (endMonthAge){
	308	+ case 36:
	309	+ request.setMonthAgeEnd(47);
	310	+ break;
	311	+ case 37:
	312	+ request.setMonthAgeEnd(59);
	313	+ break;
	314	+ case 38:
	315	+ request.setMonthAgeEnd(71);
	316	+ break;
	317	+ case 39:
	318	+ request.setMonthAgeEnd(null);
	319	+ break;
	320	+ default:
	321	+ request.setMonthAgeEnd(endMonthAge);
	322	+ }
293	323	request.setBirth(birth);
294	324	request.setNextDate(nextDate);
295	325	request.setEndCaseTime(endCaseTime);

...	...	@@ -326,7 +326,7 @@
326	326	@RequestMapping(value = "/getSpecialDatePoint/{specialType}", method = RequestMethod.GET)
327	327	@ResponseBody
328	328	public List <Map> getDateType(@PathVariable("specialType") Integer specialType) {
329		- List <Map> list = DatePointEnums.getDatePoint(specialType);
	329	+ List <Map> list = DatePointEnums.getDatePoint2(specialType);
330	330	return list;
331	331	}
332	332