jiangjiazhi / regional-platform

Download as
Browse Code »

Commit eed576c96a653a985f4ed2c8bcf10bf0b952c595

Authored by shiyang
1 parent 52961ecc2c
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

秦皇岛-20211223-儿保运动评测查看bug

Showing 1 changed file with 18 additions and 3 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEvaluationCriterionServiceImpl.java View file @ eed576c
... ... @@ -1195,7 +1195,7 @@
1195 1195 /**
1196 1196 * 秦皇岛-20211223
1197 1197 * 前端算出来的月龄model.getMonthAge()直接拿,
1198   - * model.getMonthAge()下标0的位置如果是孕表示月龄纠正后孩子现在时间还未出生，这种情况按出生日期计算
  1198 + * model.getMonthAge()下标0的位置如果是“孕”表示月龄纠正后孩子现在还未出生，这种情况按出生日期计算
1199 1199 */
1200 1200 if("216".equals(hospitalId)&&model.getMonthAge().indexOf("孕")!=0){
1201 1201 month=Integer.valueOf(model.getMonthAge().substring(0, model.getMonthAge().indexOf("月")));
... ... @@ -1230,7 +1230,7 @@
1230 1230 /**
1231 1231 * 秦皇岛-20211223
1232 1232 * 前端算出来的月龄model.getMonthAge()直接拿,
1233   - * model.getMonthAge()下标0的位置如果是孕表示月龄纠正后孩子现在时间还未出生，这种情况按出生日期计算
  1233 + * model.getMonthAge()下标0的位置如果是“孕”表示月龄纠正后孩子现在还未出生，这种情况按出生日期计算
1234 1234 */
1235 1235 if("216".equals(hospitalId)&&model.getMonthAge().indexOf("孕")!=0){
1236 1236 month=Integer.valueOf(model.getMonthAge().substring(0, model.getMonthAge().indexOf("月")));
... ... @@ -1313,7 +1313,22 @@
1313 1313 if("216".equals(hospitalId)){
1314 1314 BabyModel babyModel = mongoTemplate.findOne(new Query(Criteria.where("_id").is(model.getBabyId())), BabyModel.class);
1315 1315 if(babyModel!=null&&babyModel.getDueWeek()<37){
1316   - map.put("checkMonthStr","早产纠正月龄："+model.getMonthAge());
  1316 + //处理历史数据。重新计算纠正月龄
  1317 + if(model.getMonthAge()==null){
  1318 + String redressMonth="";
  1319 + Date dueDate=DateUtil.addDay(DateUtil.addDay(babyModel.getBirth(), -(babyModel.getDueWeek()*7)+(babyModel.getDueDay()==null?0:babyModel.getDueDay())),280);
  1320 + if(dueDate.after(checkTime)){
  1321 + Date lastMenses= DateUtil.addDay(babyModel.getBirth(), -(babyModel.getDueWeek()*7)+(babyModel.getDueDay()==null?0:babyModel.getDueDay()));
  1322 + Long week=(checkTime.getTime()-lastMenses.getTime())/(7*24*60*60*1000);
  1323 + Long day=(checkTime.getTime()-lastMenses.getTime())/(24*60*60*1000)%7;
  1324 + redressMonth="孕"+week.toString()+"周"+day+"天";
  1325 + }else {
  1326 + redressMonth= DateUtil.getBabyMonthAge(dueDate,checkTime);
  1327 + }
  1328 + map.put("checkMonthStr","早产纠正月龄："+redressMonth);
  1329 + }else {
  1330 + map.put("checkMonthStr","早产纠正月龄："+model.getMonthAge());
  1331 + }
1317 1332 }
1318 1333  
1319 1334 }