Commit 4ec5c3f8fd82a79693b5a1f1a452898c281122b0
1 parent
08b4c3f782
Exists in
master
and in
6 other branches
儿童建档
Showing 1 changed file with 11 additions and 8 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
View file @
4ec5c3f
| ... | ... | @@ -1565,14 +1565,6 @@ |
| 1565 | 1565 | if (CollectionUtils.isNotEmpty(personModels)) { |
| 1566 | 1566 | for (PersonModel babayPerson : personModels) { |
| 1567 | 1567 | BabyInfoResult result = new BabyInfoResult(); |
| 1568 | - result.setPid(babayPerson.getId()); | |
| 1569 | - result.setCardNo(babayPerson.getCardNo());//母亲的身份证号码 | |
| 1570 | - result.setName(babayPerson.getName()); | |
| 1571 | - if (babayPerson.getBirth() != null) { | |
| 1572 | - result.setMonthAge(DateUtil.getBabyMonthAge(babayPerson.getBirth(), new Date())); | |
| 1573 | - } else { | |
| 1574 | - result.setMonthAge(""); | |
| 1575 | - } | |
| 1576 | 1568 | |
| 1577 | 1569 | //通过pid查询儿童的建档记录 |
| 1578 | 1570 | BabyModelQuery babyQuery = new BabyModelQuery(); |
| ... | ... | @@ -1591,6 +1583,17 @@ |
| 1591 | 1583 | |
| 1592 | 1584 | List<Map<String, String>> list = new ArrayList<>(); |
| 1593 | 1585 | if (CollectionUtils.isNotEmpty(builds)) { |
| 1586 | + | |
| 1587 | + | |
| 1588 | + result.setPid(babayPerson.getId()); | |
| 1589 | + result.setCardNo(babayPerson.getCardNo());//母亲的身份证号码 | |
| 1590 | + result.setName(babayPerson.getName()); | |
| 1591 | + if (babayPerson.getBirth() != null) { | |
| 1592 | + result.setMonthAge(DateUtil.getBabyMonthAge(babayPerson.getBirth(), new Date())); | |
| 1593 | + } else { | |
| 1594 | + result.setMonthAge(""); | |
| 1595 | + } | |
| 1596 | + | |
| 1594 | 1597 | for (BabyModel build : builds) { |
| 1595 | 1598 | if (build == null || StringUtils.isEmpty(build.getHospitalId())) { |
| 1596 | 1599 | continue; |