Commit 2d43c000a6af96404c1be2f40d27753850be791c
1 parent
4a49d74f30
Exists in
master
and in
6 other branches
update code
Showing 2 changed files with 32 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
2d43c00
| ... | ... | @@ -28,6 +28,7 @@ |
| 28 | 28 | import org.springframework.beans.factory.annotation.Autowired; |
| 29 | 29 | import org.springframework.stereotype.Component; |
| 30 | 30 | |
| 31 | +import java.text.ParseException; | |
| 31 | 32 | import java.text.SimpleDateFormat; |
| 32 | 33 | import java.util.*; |
| 33 | 34 | |
| 34 | 35 | |
| ... | ... | @@ -1605,12 +1606,39 @@ |
| 1605 | 1606 | for (BabyModel babyModel : babyModelList) { |
| 1606 | 1607 | if (maternalDeliverModel.getParentId().equals(babyModel.getParentId())) { |
| 1607 | 1608 | NewBabyManagerQueryModel newBabyManagerQueryModel = new NewBabyManagerQueryModel(); |
| 1609 | + List<MaternalDeliverModel.Baby> babies = maternalDeliverModel.getBaby(); | |
| 1610 | + if (CollectionUtils.isNotEmpty(babies)) | |
| 1611 | + { | |
| 1612 | + for(MaternalDeliverModel.Baby baby : babies) | |
| 1613 | + { | |
| 1614 | + if (baby.getId() != null && baby.getId().equals(babyModel.getId())) | |
| 1615 | + { | |
| 1616 | + String time = baby.getDueTime(); | |
| 1617 | + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(time)) | |
| 1618 | + { | |
| 1619 | + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm"); | |
| 1620 | + try { | |
| 1621 | + Date date = format.parse(time); | |
| 1622 | + newBabyManagerQueryModel.setBirthHM(new SimpleDateFormat("HH:mm").format(date)); | |
| 1623 | + } catch (ParseException e) { | |
| 1624 | + ExceptionUtils.catchException(e,"新生儿管理娩出时间格式异常"+time); | |
| 1625 | + } | |
| 1626 | + | |
| 1627 | + } | |
| 1628 | + else | |
| 1629 | + { | |
| 1630 | + newBabyManagerQueryModel.setBirthHM(new SimpleDateFormat("HH:mm").format(babyModel.getBirth())); | |
| 1631 | + } | |
| 1632 | + break; | |
| 1633 | + } | |
| 1634 | + } | |
| 1635 | + } | |
| 1608 | 1636 | BeanUtils.copy(babyModel, newBabyManagerQueryModel); |
| 1609 | 1637 | newBabyManagerQueryModel.setMcertNo(DefenceUtils.getCardNo(babyModel.getMcertNo())); |
| 1610 | 1638 | newBabyManagerQueryModel.setMcertNo2(babyModel.getMcertNo()); |
| 1611 | 1639 | newBabyManagerQueryModel.setAge(DateUtil.getAge(babyModel.getMbirth())); |
| 1612 | 1640 | newBabyManagerQueryModel.setBirthYMD(DateUtil.getyyyy_MM_dd(babyModel.getBirth())); |
| 1613 | - newBabyManagerQueryModel.setBirthHM(new SimpleDateFormat("HH:mm").format(babyModel.getBirth())); | |
| 1641 | +// newBabyManagerQueryModel.setBirthHM(new SimpleDateFormat("HH:mm").format(babyModel.getBirth())); | |
| 1614 | 1642 | newBabyManagerQueryModel.setMphone(DefenceUtils.getPhone(babyModel.getMphone())); |
| 1615 | 1643 | newBabyManagerQueryModel.setBirthDays(DateUtil.getDays(babyModel.getBirth(), new Date())); |
| 1616 | 1644 | newBabyManagerQueryModel.setBabyId(babyModel.getId()); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
2d43c00
| ... | ... | @@ -1527,11 +1527,12 @@ |
| 1527 | 1527 | } |
| 1528 | 1528 | |
| 1529 | 1529 | //母亲是否高危 |
| 1530 | - if (!com.lyms.platform.common.utils.StringUtils.isEmpty(model.getMcertNo())) { | |
| 1530 | + if (!com.lyms.platform.common.utils.StringUtils.isEmpty(model.getParentId())) { | |
| 1531 | 1531 | |
| 1532 | 1532 | PatientsQuery patientsQuery = new PatientsQuery(); |
| 1533 | - patientsQuery.setCardNo(model.getMcertNo()); | |
| 1533 | +// patientsQuery.setCardNo(model.getMcertNo()); | |
| 1534 | 1534 | patientsQuery.setYn(YnEnums.YES.getId()); |
| 1535 | + patientsQuery.setId(model.getParentId()); | |
| 1535 | 1536 | |
| 1536 | 1537 | List<Patients> list = patientsService.queryPatient(patientsQuery); |
| 1537 | 1538 | if (CollectionUtils.isNotEmpty(list)) { |