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 48a0df5..f37ff54 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,9 @@ public class BabyBuildController extends BaseController { request.setBcardNo(bcardNo); request.setMcardNo(mcardNo); request.setMphone(mphone); + if(startMonthAge!=null) {//不改变之前逻辑 //儿童管理页面月龄条件查询36:3岁 37:4岁 38:5岁 39:6岁 40:>6岁 - switch (startMonthAge){ + switch (startMonthAge) { case 36: request.setMonthAgeStart(startMonthAge); break; @@ -308,7 +309,12 @@ public class BabyBuildController extends BaseController { default: request.setMonthAgeStart(startMonthAge); } - switch (endMonthAge){ + }else { + request.setMonthAgeStart(startMonthAge); + } + + if(endMonthAge!=null) {//不改变之前逻辑 + switch (endMonthAge) { case 36: request.setMonthAgeEnd(47); break; @@ -327,6 +333,9 @@ public class BabyBuildController extends BaseController { default: request.setMonthAgeEnd(endMonthAge); } + }else { + request.setMonthAgeEnd(endMonthAge); + } request.setBirth(birth); request.setNextDate(nextDate);