diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java index 62cfee9..b130b21 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java @@ -1628,9 +1628,9 @@ public class DateUtil { public static void main(String[] args) { - Date bir = parseYMD("2017-06-27"); - Date bir1 = parseYMD("2020-06-29"); - String i = DateUtil.getBabyMonthAge(bir, bir1); + Date bir = parseYMD("1990-03-07"); + Date bir1 = parseYMD("2019-03-04"); + int i = DateUtil.getAge(bir, bir1); System.out.println(i); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index da4763f..4ad183c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -3499,7 +3499,7 @@ public class ViewFacade { map.put("fmAddr", data.getFmAddr()); map.put("username", patients.getUsername()); map.put("birth", DateUtil.getyyyy_MM_dd(patients.getBirth())); - map.put("age", UnitUtils.unitSplice(DateUtil.getAge(patients.getBirth(), data.getDueDate1()), UnitConstants.SUI)); + map.put("age", UnitUtils.unitSplice(DateUtil.getAge2(patients.getBirth(), data.getDueDate1()), UnitConstants.SUI)); map.put("phone", patients.getPhone()); map.put("fmWeek", checkWeek(patients)); map.put("dueDate", DateUtil.getyyyy_MM_dd(patients.getDueDate()));