diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/DatePointEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/DatePointEnums.java index 9f88c89..5205784 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/DatePointEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/DatePointEnums.java @@ -83,6 +83,42 @@ public enum DatePointEnums { } return list; } + //增加3/4/5/6 岁条件 + public static List getDatePoint2(Integer pid) { + + List list = new ArrayList<>(); + for (DatePointEnums e : DatePointEnums.values()) { + if(e.getPid() == pid) { + for(int i = 0 ; i <= 39 ;i++) + { + Map rootMap = new HashMap(); + switch (i){ + case 36: + rootMap.put("id", i); + rootMap.put("name", "3岁"); + break; + case 37: + rootMap.put("id", i); + rootMap.put("name", "4岁"); + break; + case 38: + rootMap.put("id", i); + rootMap.put("name", "5岁"); + break; + case 39: + rootMap.put("id", i); + rootMap.put("name", "6岁"); + break; + default: + rootMap.put("id", i); + rootMap.put("name", i+e.getName()); + } + list.add(rootMap); + } + } + } + return list; + } public static String getNameById(int id){ for(DatePointEnums enums:values()){ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java index 9c81b3b..d8544d2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java @@ -288,8 +288,38 @@ public class BabyBuildController extends BaseController { request.setBcardNo(bcardNo); request.setMcardNo(mcardNo); request.setMphone(mphone); - request.setMonthAgeStart(startMonthAge); - request.setMonthAgeEnd(endMonthAge); + switch (startMonthAge){ + case 36: + request.setMonthAgeStart(startMonthAge); + break; + case 37: + request.setMonthAgeStart(48); + break; + case 38: + request.setMonthAgeStart(60); + break; + case 39: + request.setMonthAgeStart(72); + break; + default: + request.setMonthAgeStart(startMonthAge); + } + switch (endMonthAge){ + case 36: + request.setMonthAgeEnd(47); + break; + case 37: + request.setMonthAgeEnd(59); + break; + case 38: + request.setMonthAgeEnd(71); + break; + case 39: + request.setMonthAgeEnd(null); + break; + default: + request.setMonthAgeEnd(endMonthAge); + } request.setBirth(birth); request.setNextDate(nextDate); request.setEndCaseTime(endCaseTime); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java index 739f38c..9e0179f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java @@ -326,7 +326,7 @@ public class EnumsController { @RequestMapping(value = "/getSpecialDatePoint/{specialType}", method = RequestMethod.GET) @ResponseBody public List getDateType(@PathVariable("specialType") Integer specialType) { - List list = DatePointEnums.getDatePoint(specialType); + List list = DatePointEnums.getDatePoint2(specialType); return list; }