Commit 0fb7368c3566dba3173d7d1556849c7ee9f966fe
1 parent
946130a3d2
Exists in
master
and in
6 other branches
update
Showing 2 changed files with 6 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEvaluationCriterionServiceImpl.java
View file @
0fb7368
| ... | ... | @@ -1315,6 +1315,7 @@ |
| 1315 | 1315 | if(babyModel!=null&&babyModel.getDueWeek()<37){ |
| 1316 | 1316 | //处理历史数据。重新计算纠正月龄 |
| 1317 | 1317 | if(model.getMonthAge()==null){ |
| 1318 | + //纠正月龄 | |
| 1318 | 1319 | String redressMonth=""; |
| 1319 | 1320 | Date dueDate=DateUtil.addDay(DateUtil.addDay(babyModel.getBirth(), -(babyModel.getDueWeek()*7)+(babyModel.getDueDay()==null?0:babyModel.getDueDay())),280); |
| 1320 | 1321 | //预产期大于检查时间，说明纠正后孩子未出生变为母亲的孕周 |
| 1321 | 1322 | |
| 1322 | 1323 | |
| 1323 | 1324 | |
| ... | ... | @@ -1324,12 +1325,15 @@ |
| 1324 | 1325 | Long day=(checkTime.getTime()-lastMenses.getTime())/(24*60*60*1000)%7; |
| 1325 | 1326 | redressMonth="早产纠正月龄：孕"+week.toString()+"周"+day+"天"; |
| 1326 | 1327 | }else { |
| 1327 | - redressMonth= "早产纠正月龄："+DateUtil.getBabyMonthAge(dueDate,checkTime); | |
| 1328 | + redressMonth=DateUtil.getBabyMonthAge(dueDate,checkTime); | |
| 1328 | 1329 | //大于2岁不在纠正 |
| 1329 | - if(DateUtil.getBabyMonthAge(dueDate,checkTime).indexOf("岁")>0){ | |
| 1330 | + if(redressMonth.indexOf("岁")>0){ | |
| 1330 | 1331 | Integer age=Integer.valueOf(redressMonth.substring(0, redressMonth.indexOf("岁"))); |
| 1331 | 1332 | if(age>=2){ |
| 1333 | + //正常出生日期算出月龄 | |
| 1332 | 1334 | redressMonth=DateUtil.getBabyMonthAge(model.getBirth(), checkTime); |
| 1335 | + }else { | |
| 1336 | + redressMonth="早产纠正月龄："+redressMonth; | |
| 1333 | 1337 | } |
| 1334 | 1338 | } |
| 1335 | 1339 | } |