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 8e8b7ed..0df1578 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 @@ -1558,61 +1558,9 @@ public class DateUtil { public static void main(String[] args) { - int i = DateUtil.daysBetween(DateUtil.parseYMD("2018-02-20"), new Date()); - System.out.println(i); - - int week = DateUtil.getWeek2(parseYMD("2017-10-12"), new Date()); - System.out.println(week); - // System.out.println(getDayLastSecond(new Date()).toLocaleString()); - // List> monthBetween = getRange(parseYMD("2017-1-11"), parseYMD("2017-12-29")); - // for (Map map : monthBetween) { - // System.out.print("cname>> " + getyyyy_mm(map.get("cname"))); - // System.out.print(" start>> " + getyyyy_MM_dd(map.get("start"))); - // System.out.println(" end>> " + getyyyy_MM_dd(map.get("end"))); - // } - - /* Date yesterday = DateUtil.getYesterday(); - System.out.println(yesterday.toLocaleString()); - System.out.println(getBetweenDay(parseDate("2017-12-19"), 7)); - - Date date = parseDate("2017-11-30"); - System.out.println(getYesterday().toLocaleString()); - System.out.println("当月第一天: " + getMonthDay(date, 0, 1).toLocaleString()); - System.out.println("当月最后一天: " + getMonthDay(date, 0, 0).toLocaleString()); - System.out.println("上月第一天: " + getMonthDay(date, -1, 1).toLocaleString()); - System.out.println("上月最后一天: " + getMonthDay(date, -1, 0).toLocaleString()); - System.out.println("当前季度第一天: " + getQuartDay(date, 0, 1).toLocaleString()); - System.out.println("当前季度最后一天: " + getQuartDay(date, 0, 0).toLocaleString()); - System.out.println("上个季度第一天: " + getQuartDay(date, -1, 1).toLocaleString()); - System.out.println("上个季度最后一天: " + getQuartDay(date, -1, 0).toLocaleString()); - System.out.println("半年的第一天: " + getHalfDay(date, 0, 1).toLocaleString()); - System.out.println("半年的最后一天: " + getHalfDay(date, 0, 0).toLocaleString()); - System.out.println("上个半年的第一天: " + getHalfDay(date, -1, 1).toLocaleString()); - System.out.println("上个半年的最后一天: " + getHalfDay(date, -1, 0).toLocaleString()); - System.out.println("当前年的第一天: " + getYear(date, 0, 1).toLocaleString()); - System.out.println("当前年的最后一天: " + getYear(date, 0, 0).toLocaleString()); - System.out.println("上一年的第一天: " + getYear(date, -1, 1).toLocaleString()); - System.out.println("上一年的最后一天: " + getYear(date, -1, 0).toLocaleString()); - System.out.println(getBetweenDay(7)); - System.out.println(date.getTime());*/ - - -// Date baby = parseDate("2018-02-01"); -// int weeks = daysBetween(baby, new Date()) / 7; -// String weekAge = String.valueOf(weeks); - -// Date startDate = addDay(new Date(),-10-1); -// Date endDate = addDay(new Date(), -10); -// -// String start = getyyyy_MM_dd(startDate); -// String end = getyyyy_MM_dd(endDate); -// -// System.out.println(start+"=="+end); - Date baby = parseDate("2019-10-24"); - -// Date d = DateUtil.addDay(baby, 294); - - System.out.println(baby.getTime()); + Date start = DateUtil.addDay(parseDate("2020-02-18"),1); + Date end = parseDate("2020-03-01"); + System.out.println(getWeek(start, end)); } } diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/ExpiryMap.java b/platform-common/src/main/java/com/lyms/platform/common/utils/ExpiryMap.java index 7ba0681..30d7240 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/ExpiryMap.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/ExpiryMap.java @@ -116,16 +116,16 @@ public class ExpiryMap extends HashMap{ expiryMap.put(e.getKey(), System.currentTimeMillis() + EXPIRY); super.putAll(m); } -// public Set> entrySet() { -// Set> set = super.entrySet(); -// Iterator> iterator = set.iterator(); -// while (iterator.hasNext()) { -// java.util.Map.Entry entry = iterator.next(); -// if(checkExpiry(entry.getKey(), false)) iterator.remove(); -// } -// -// return set; -// } + public Set> entrySet() { + Set> set = super.entrySet(); + Iterator> iterator = set.iterator(); + while (iterator.hasNext()) { + java.util.Map.Entry entry = iterator.next(); + if(checkExpiry(entry.getKey(), false)) iterator.remove(); + } + + return set; + } /** * * @Description: 是否过期 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 4301685..fac7ca5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -1327,7 +1327,8 @@ public class AntenatalExaminationFacade { { for(CheckItemConfig checkItemConfig : itemConfigs) { - int currentWeek = DateUtil.getWeek(patients.getLastMenses(),nextCheckTime); + //末次月经加一天的原因是 列表中展示的孕周是不包含末次月经那天，计算周数所以也要不包含末次月经当天 + int currentWeek = DateUtil.getWeek(DateUtil.addDay(patients.getLastMenses(), 1),nextCheckTime); if (checkItemConfig.getStartWeek() <= currentWeek && checkItemConfig.getEndWeek() >= currentWeek) { CheckItemOrder order = new CheckItemOrder(); @@ -1350,7 +1351,8 @@ public class AntenatalExaminationFacade { { for(CheckItemConfig checkItemConfig : itemConfigs) { - int currentWeek = DateUtil.getWeek(patients.getLastMenses(),checkTime); + //末次月经加一天的原因是 列表中展示的孕周是不包含末次月经那天，计算周数所以也要不包含末次月经当天 + int currentWeek = DateUtil.getWeek(DateUtil.addDay(patients.getLastMenses(), 1),checkTime); if (checkItemConfig.getStartWeek() <= currentWeek && checkItemConfig.getEndWeek() >= currentWeek) { CheckItemActual actual = new CheckItemActual();