jiangjiazhi / regional-platform

Download as
Browse Code »

Commit a25bbe8f60d342f3f0f69f94ac1ab227e5ea9d85

Authored by liquanyu
1 parent 94e58bdde0
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update code

Showing 1 changed file with 4 additions and 1 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ a25bbe8
... ... @@ -1620,6 +1620,7 @@
1620 1620 try {
1621 1621 Date date = format.parse(time);
1622 1622 newBabyManagerQueryModel.setBirthHM(new SimpleDateFormat("HH:mm").format(date));
  1623 + newBabyManagerQueryModel.setBirthYMD(DateUtil.getyyyy_MM_dd(date));
1623 1624 } catch (ParseException e) {
1624 1625 ExceptionUtils.catchException(e,"新生儿管理娩出时间格式异常"+time);
1625 1626 }
... ... @@ -1628,6 +1629,7 @@
1628 1629 else
1629 1630 {
1630 1631 newBabyManagerQueryModel.setBirthHM(new SimpleDateFormat("HH:mm").format(babyModel.getBirth()));
  1632 + newBabyManagerQueryModel.setBirthYMD(DateUtil.getyyyy_MM_dd(babyModel.getBirth()));
1631 1633 }
1632 1634 break;
1633 1635 }
1634 1636  
... ... @@ -1636,12 +1638,13 @@
1636 1638 else
1637 1639 {
1638 1640 newBabyManagerQueryModel.setBirthHM(new SimpleDateFormat("HH:mm").format(babyModel.getBirth()));
  1641 + newBabyManagerQueryModel.setBirthYMD(DateUtil.getyyyy_MM_dd(babyModel.getBirth()));
1639 1642 }
1640 1643 BeanUtils.copy(babyModel, newBabyManagerQueryModel);
1641 1644 newBabyManagerQueryModel.setMcertNo(DefenceUtils.getCardNo(babyModel.getMcertNo()));
1642 1645 newBabyManagerQueryModel.setMcertNo2(babyModel.getMcertNo());
1643 1646 newBabyManagerQueryModel.setAge(DateUtil.getAge(babyModel.getMbirth()));
1644   - newBabyManagerQueryModel.setBirthYMD(DateUtil.getyyyy_MM_dd(babyModel.getBirth()));
  1647 + //newBabyManagerQueryModel.setBirthYMD(DateUtil.getyyyy_MM_dd(babyModel.getBirth()));
1645 1648 // newBabyManagerQueryModel.setBirthHM(new SimpleDateFormat("HH:mm").format(babyModel.getBirth()));
1646 1649 newBabyManagerQueryModel.setMphone(DefenceUtils.getPhone(babyModel.getMphone()));
1647 1650 newBabyManagerQueryModel.setBirthDays(DateUtil.getDays(babyModel.getBirth(), new Date()));