Commit 063c94bac61087a537a6c2f5f2cd6f71cbbc5a8d
1 parent
8a8af9dbff
Exists in
master
and in
6 other branches
1
Showing 1 changed file with 4 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java
View file @
063c94b
| ... | ... | @@ -94,7 +94,7 @@ |
| 94 | 94 | downRecordQuery.setTrackType(downQueryRequest.getTrackType()); |
| 95 | 95 | //如果是产筛请求 |
| 96 | 96 | if(null!=downQueryRequest.getTrackType() && TrackDownDateEnums.D.getId()==downQueryRequest.getTrackType()){ |
| 97 | - downRecordQuery.setLastMensesStart(DateUtil.addDay(DateUtil.formatDate(new Date()),-140)); | |
| 97 | + downRecordQuery.setLastMensesStart(DateUtil.addDay(DateUtil.formatDate(new Date()), -140)); | |
| 98 | 98 | downRecordQuery.setTrackType(3); |
| 99 | 99 | } |
| 100 | 100 | downRecordQuery.setPage(downQueryRequest.getPage()); |
| ... | ... | @@ -264,7 +264,9 @@ |
| 264 | 264 | temp.put("id", downRecord.getId()); |
| 265 | 265 | temp.put("parentId", downRecord.getParentId()); |
| 266 | 266 | // temp.put("dueDate", DateUtil.getyyyy_MM_dd(patient.getDueDate())); |
| 267 | -// temp.put("week", DateUtil.getWeekDesc(patient.getLastMenses(), new Date())); /** 孕周 */ | |
| 267 | + if(null!=downRecord.getLastMenses()){ | |
| 268 | + temp.put("week", DateUtil.getWeekDesc(downRecord.getLastMenses(), new Date())); /** 孕周 */ | |
| 269 | + } | |
| 268 | 270 | temp.put("cjDate", ""); /** 产检日期 */ |
| 269 | 271 | temp.put("yycjDate", ""); /** 预约产检日期 */ |
| 270 | 272 | temp.put("cjzfDate", ""); /** 产检追访时间 */ |