Commit e3eda0315c8fd5e96995da6adc6e34de244b4cc0
1 parent
10adf9b75b
Exists in
master
and in
6 other branches
update code
Showing 1 changed file with 6 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveRecordFacade.java
View file @
e3eda03
| ... | ... | @@ -278,9 +278,13 @@ |
| 278 | 278 | map.put("certeTypeId",model.getPcerteTypeId()); //证件类型 |
| 279 | 279 | map.put("phone",model.getPhone());//手机号码 |
| 280 | 280 | map.put("birth",DateUtil.getyyyy_MM_dd(model.getBirth())); //出生日期 |
| 281 | - map.put("age",DateUtil.getAge(model.getBirth(), new Date())); //年龄 | |
| 281 | + map.put("age",DateUtil.getAge(model.getBirth())); //年龄 | |
| 282 | 282 | map.put("lastMenses",DateUtil.getyyyy_MM_dd(model.getLastMenses())); //末次月经 |
| 283 | - map.put("currentDueWeek",DateUtil.getWeekDesc(model.getLastMenses(), new Date())); //当前孕周 | |
| 283 | + | |
| 284 | + int days= DateUtil.daysBetween(model.getLastMenses(),new Date()); | |
| 285 | + String week = com.lyms.platform.common.utils.StringUtils.dueWeek(days); | |
| 286 | + | |
| 287 | + map.put("currentDueWeek",week); //当前孕周 | |
| 284 | 288 | map.put("dueDate",DateUtil.getyyyy_MM_dd(model.getDueDate())); //预产期 |
| 285 | 289 | map.put("created",DateUtil.gety_m_dhm(model.getCreated()));//创建日期 |
| 286 | 290 | map.put("status",model.getStatus());//导出状态 |