From 063c94bac61087a537a6c2f5f2cd6f71cbbc5a8d Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Wed, 24 Jan 2018 16:02:01 +0800 Subject: [PATCH] 1 --- .../java/com/lyms/platform/operate/web/facade/TrackDownFacade.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 1917139..3bfcedc 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 @@ -94,7 +94,7 @@ public class TrackDownFacade { downRecordQuery.setTrackType(downQueryRequest.getTrackType()); //如果是产筛请求 if(null!=downQueryRequest.getTrackType() && TrackDownDateEnums.D.getId()==downQueryRequest.getTrackType()){ - downRecordQuery.setLastMensesStart(DateUtil.addDay(DateUtil.formatDate(new Date()),-140)); + downRecordQuery.setLastMensesStart(DateUtil.addDay(DateUtil.formatDate(new Date()), -140)); downRecordQuery.setTrackType(3); } downRecordQuery.setPage(downQueryRequest.getPage()); @@ -264,7 +264,9 @@ public class TrackDownFacade { temp.put("id", downRecord.getId()); temp.put("parentId", downRecord.getParentId()); // temp.put("dueDate", DateUtil.getyyyy_MM_dd(patient.getDueDate())); -// temp.put("week", DateUtil.getWeekDesc(patient.getLastMenses(), new Date())); /** 孕周 */ + if(null!=downRecord.getLastMenses()){ + temp.put("week", DateUtil.getWeekDesc(downRecord.getLastMenses(), new Date())); /** 孕周 */ + } temp.put("cjDate", ""); /** 产检日期 */ temp.put("yycjDate", ""); /** 预约产检日期 */ temp.put("cjzfDate", ""); /** 产检追访时间 */ -- 1.8.3.1