Commit d710869eafda2b44854343c2e4ba4d34caefbee9
1 parent
c9fc6838d0
Exists in
master
and in
6 other branches
儿童建档添加分娩天数
Showing 1 changed file with 4 additions and 0 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
d710869
| ... | ... | @@ -540,6 +540,8 @@ |
| 540 | 540 | if (null != deliverAddRequest.getDueDate()) { |
| 541 | 541 | int day = DateUtil.getDays(patients.getLastMenses(), DateUtil.parseYMD(deliverAddRequest.getDueDate())); |
| 542 | 542 | babyModel.setDueWeek(day / 7); |
| 543 | + int dueDay = day % 7; | |
| 544 | + babyModel.setDueDay(dueDay == 0 ? null : dueDay); | |
| 543 | 545 | } |
| 544 | 546 | } |
| 545 | 547 | // 产妇分娩建档 |
| ... | ... | @@ -646,6 +648,8 @@ |
| 646 | 648 | if (null != deliverAddRequest.getDueDate()) { |
| 647 | 649 | int day = DateUtil.getDays(lastMenses, DateUtil.parseYMD(deliverAddRequest.getDueDate())); |
| 648 | 650 | babyModel1.setDueWeek(day / 7); |
| 651 | + int dueDay = day % 7; | |
| 652 | + babyModel1.setDueDay(dueDay == 0 ? null : dueDay); | |
| 649 | 653 | } |
| 650 | 654 | babyModel1.setBabyHeight(baby.getBabyHeight()); |
| 651 | 655 | babyModel1.setBabyWeight(baby.getBabyWeight()); |