Commit 5c4d963a62af120b17f4adc3c1d145803df8cb1c
1 parent
05eeed91bf
Exists in
master
and in
8 other branches
yueling
Showing 1 changed file with 5 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
View file @
5c4d963
| ... | ... | @@ -1622,13 +1622,14 @@ |
| 1622 | 1622 | babyQuery.setCardNo(request.getBcardNo()); |
| 1623 | 1623 | babyQuery.setName(request.getName()); |
| 1624 | 1624 | babyQuery.setMphone(request.getMphone()); |
| 1625 | - if (request.getMonthAgeStart() != null && request.getMonthAgeEnd() != null) { | |
| 1626 | - | |
| 1627 | - Date currentDate = DateUtil.formatDate(new Date()); | |
| 1625 | + Date currentDate = DateUtil.formatDate(new Date()); | |
| 1626 | + if (request.getMonthAgeStart() != null) { | |
| 1628 | 1627 | Date start = DateUtil.addMonth(currentDate, -request.getMonthAgeStart()); |
| 1628 | + babyQuery.setBirthEnd(start); | |
| 1629 | + } | |
| 1630 | + if(request.getMonthAgeEnd() != null){ | |
| 1629 | 1631 | Date end = DateUtil.addDay(DateUtil.addMonth(currentDate, -request.getMonthAgeEnd() - 1), 1); |
| 1630 | 1632 | babyQuery.setBirthStart(end); |
| 1631 | - babyQuery.setBirthEnd(start); | |
| 1632 | 1633 | } |
| 1633 | 1634 | |
| 1634 | 1635 | // if (StringUtils.isNotEmpty(request.getDiagnose())) |