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 72502fc..62cfee9 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 @@ -229,6 +229,57 @@ public class DateUtil { // return age.intValue(); return (Math.abs(year1 - year2) + i); } + public static Integer getAge2(Date birth,Date date) { + if (null == birth || date==null) { + return null; + } + java.util.Calendar calendar = Calendar.getInstance(); +// Date date = new Date(); + calendar.setTime(date); + + Calendar c1 = Calendar.getInstance(); + Calendar c2 = Calendar.getInstance(); + c1.setTime(date); + c2.setTime(birth); + int year1 = c1.get(Calendar.YEAR); + int year2 = c2.get(Calendar.YEAR); + + int mouth1 = c1.get(Calendar.MONTH);//0当前 + int mouth2 = c2.get(Calendar.MONTH);//4 + int i = 0; + /* if(mouth2-mouth1>=0){ + int days1 = c1.get(Calendar.DAY_OF_MONTH);//当前10 + int days2 = c2.get(Calendar.DAY_OF_MONTH);//1 + if(days1days2){ + } + }else if(mouth1-mouth2<0){ + i=i-1; + }*/ + + if (mouth2 == mouth1) { + int days1 = c1.get(Calendar.DAY_OF_MONTH);//当前10 + int days2 = c2.get(Calendar.DAY_OF_MONTH);//1 + if (days1 < days2) { + i = i - 1; + } else if (days1 > days2) { +// i=i-1; + } + } else if (mouth2 > mouth1) { + i = i - 1; + } + + +// if (birth == null) { +// return null; +// } +// Date now = new Date(); +// long m = now.getTime() - birth.getTime(); +// Long age = m / 31536000000L; +// return age.intValue(); + return (Math.abs(year1 - year2) + i); + } public static Integer getAge(Date birth, Date fmDate) { if (birth == null || null == fmDate) { 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 14064be..b5edca6 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()), UnitConstants.SUI)); +// map.put("age", UnitUtils.unitSplice(DateUtil.getAge(patients.getBirth()), UnitConstants.SUI)); map.put("phone", patients.getPhone()); map.put("fmWeek", checkWeek(patients)); map.put("dueDate", DateUtil.getyyyy_MM_dd(patients.getDueDate())); @@ -3991,6 +3991,7 @@ public class ViewFacade { } babyMap.put("babyId", temp.getId()); babyMap.put("dueTime", temp.getDueTime()); + map.put("age", UnitUtils.unitSplice(DateUtil.getAge2(patients.getBirth(),DateUtil.parseYMDHMS(temp.getDueTime())), UnitConstants.SUI)); babyMap.put("pregnancyOut", temp.getPregnancyOut() == null ? "" : RenShenJieJuEnums.getTitle(temp.getPregnancyOut())); babyMap.put("deformity", temp.getDeformity() == null ? "" : temp.getDeformity() == 1 ? "是" : "否"); babyMap.put("babyGender", temp.getBabyGender() == null ? "" : SexEnum.getTextById(