jiangjiazhi / regional-platform

Download as
Browse Code ยป

Commit 14d587ea333ff8c50a947146050714e96b823e31

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

update

Showing 2 changed files with 4 additions and 4 deletions

platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java View file @ 14d587e
... ... @@ -1628,9 +1628,9 @@
1628 1628  
1629 1629 public static void main(String[] args) {
1630 1630  
1631   - Date bir = parseYMD("2017-06-27");
1632   - Date bir1 = parseYMD("2020-06-29");
1633   - String i = DateUtil.getBabyMonthAge(bir, bir1);
  1631 + Date bir = parseYMD("1990-03-07");
  1632 + Date bir1 = parseYMD("2019-03-04");
  1633 + int i = DateUtil.getAge(bir, bir1);
1634 1634 System.out.println(i);
1635 1635  
1636 1636 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 14d587e
... ... @@ -3499,7 +3499,7 @@
3499 3499 map.put("fmAddr", data.getFmAddr());
3500 3500 map.put("username", patients.getUsername());
3501 3501 map.put("birth", DateUtil.getyyyy_MM_dd(patients.getBirth()));
3502   - map.put("age", UnitUtils.unitSplice(DateUtil.getAge(patients.getBirth(), data.getDueDate1()), UnitConstants.SUI));
  3502 + map.put("age", UnitUtils.unitSplice(DateUtil.getAge2(patients.getBirth(), data.getDueDate1()), UnitConstants.SUI));
3503 3503 map.put("phone", patients.getPhone());
3504 3504 map.put("fmWeek", checkWeek(patients));
3505 3505 map.put("dueDate", DateUtil.getyyyy_MM_dd(patients.getDueDate()));