Commit 3c577fb8768812540846417bcec958e00b363979
1 parent
fff1785cde
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 11 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java
View file @
3c577fb
| ... | ... | @@ -288,8 +288,9 @@ |
| 288 | 288 | request.setBcardNo(bcardNo); |
| 289 | 289 | request.setMcardNo(mcardNo); |
| 290 | 290 | request.setMphone(mphone); |
| 291 | + if(startMonthAge!=null) {//不改变之前逻辑 | |
| 291 | 292 | //儿童管理页面月龄条件查询36：3岁 37:4岁 38：5岁 39：6岁 40：>6岁 |
| 292 | - switch (startMonthAge){ | |
| 293 | + switch (startMonthAge) { | |
| 293 | 294 | case 36: |
| 294 | 295 | request.setMonthAgeStart(startMonthAge); |
| 295 | 296 | break; |
| ... | ... | @@ -308,7 +309,12 @@ |
| 308 | 309 | default: |
| 309 | 310 | request.setMonthAgeStart(startMonthAge); |
| 310 | 311 | } |
| 311 | - switch (endMonthAge){ | |
| 312 | + }else { | |
| 313 | + request.setMonthAgeStart(startMonthAge); | |
| 314 | + } | |
| 315 | + | |
| 316 | + if(endMonthAge!=null) {//不改变之前逻辑 | |
| 317 | + switch (endMonthAge) { | |
| 312 | 318 | case 36: |
| 313 | 319 | request.setMonthAgeEnd(47); |
| 314 | 320 | break; |
| ... | ... | @@ -327,6 +333,9 @@ |
| 327 | 333 | default: |
| 328 | 334 | request.setMonthAgeEnd(endMonthAge); |
| 329 | 335 | } |
| 336 | + }else { | |
| 337 | + request.setMonthAgeEnd(endMonthAge); | |
| 338 | + } | |
| 330 | 339 | |
| 331 | 340 | request.setBirth(birth); |
| 332 | 341 | request.setNextDate(nextDate); |