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 60b49ab..752c309 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 @@ -1441,7 +1441,8 @@ public class DateUtil { 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) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java index 723d097..287c57e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java @@ -143,7 +143,6 @@ public class TrackDownFacade { if (null != downQueryRequest.getTrackType() && TrackDownDateEnums.C.getId() == downQueryRequest.getTrackType()) { downRecordQuery.setTrackTypes(Arrays.asList(3, 9)); } else if (null != downQueryRequest.getTrackType() && TrackDownDateEnums.D.getId() == downQueryRequest.getTrackType()) { - downRecordQuery.setLastMensesStart(DateUtil.addDay(DateUtil.formatDate(new Date()), -140)); downRecordQuery.setTrackTypes(Arrays.asList(3, 8)); } else if (null != downQueryRequest.getTrackType() && TrackDownDateEnums.F.getId() == downQueryRequest.getTrackType()) { downRecordQuery.setTrackTypes(Arrays.asList(6, 11)); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownJobFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownJobFacade.java index c880f11..8fd33ca 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownJobFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownJobFacade.java @@ -172,7 +172,9 @@ public class TrackDownJobFacade { //孕妇档案生成产检追访 @Override public void handOneByOne(Patients model) { - + if(model.getId().equals("5a6adaca0cf25c05e1262d83")){ + System.out.println(model.toString()); + } logger.info("CJTrackDownDataLoader addTrackDown by id :" + model.getId()); //添加产检追访信息 TrackDownRecord trackDownRecord = model.build();