jiangjiazhi / regional-platform

Download as
Browse Code »

Commit f1559c53de9f25a8044da5dfca005e0168366ec8

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

秦皇岛-20211223-儿童管理-早产儿管理纠正月龄大于2岁不在纠正

Showing 2 changed files with 20 additions and 4 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEvaluationCriterionServiceImpl.java View file @ f1559c5
... ... @@ -1317,20 +1317,28 @@
1317 1317 if(model.getMonthAge()==null){
1318 1318 String redressMonth="";
1319 1319 Date dueDate=DateUtil.addDay(DateUtil.addDay(babyModel.getBirth(), -(babyModel.getDueWeek()*7)+(babyModel.getDueDay()==null?0:babyModel.getDueDay())),280);
  1320 + //预产期大于检查时间，说明纠正后孩子未出生变为母亲的孕周
1320 1321 if(dueDate.after(checkTime)){
1321 1322 Date lastMenses= DateUtil.addDay(babyModel.getBirth(), -(babyModel.getDueWeek()*7)+(babyModel.getDueDay()==null?0:babyModel.getDueDay()));
1322 1323 Long week=(checkTime.getTime()-lastMenses.getTime())/(7*24*60*60*1000);
1323 1324 Long day=(checkTime.getTime()-lastMenses.getTime())/(24*60*60*1000)%7;
1324   - redressMonth="孕"+week.toString()+"周"+day+"天";
  1325 + redressMonth="早产纠正月龄：孕"+week.toString()+"周"+day+"天";
1325 1326 }else {
1326   - redressMonth= DateUtil.getBabyMonthAge(dueDate,checkTime);
  1327 + redressMonth= "早产纠正月龄："+DateUtil.getBabyMonthAge(dueDate,checkTime);
  1328 + //大于2岁不在纠正
  1329 + if(DateUtil.getBabyMonthAge(dueDate,checkTime).indexOf("岁")!=0){
  1330 + Integer age=Integer.valueOf(redressMonth.substring(0, redressMonth.indexOf("岁")));
  1331 + if(age>=2){
  1332 + redressMonth=DateUtil.getBabyMonthAge(model.getBirth(), checkTime);
  1333 + }
  1334 + }
  1335 +
1327 1336 }
1328   - map.put("checkMonthStr","早产纠正月龄："+redressMonth);
  1337 + map.put("checkMonthStr",redressMonth);
1329 1338 }else {
1330 1339 map.put("checkMonthStr","早产纠正月龄："+model.getMonthAge());
1331 1340 }
1332 1341 }
1333   -
1334 1342 }
1335 1343 map.put("checkDoctorStr", usersMapper.getUsers(Integer.parseInt(model.getCheckDoctor())).getName());
1336 1344 add(map);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java View file @ f1559c5
... ... @@ -113,6 +113,7 @@
113 113 if(model.getDueWeek()!=null&&model.getDueWeek()<37&&model.getHospitalId().equals("216")){
114 114 String redressMonth="";
115 115 Date dueDate=DateUtil.addDay(DateUtil.addDay(model.getBirth(), -(model.getDueWeek()*7)+(model.getDueDay()==null?0:model.getDueDay())),280);
  116 + //预产期大于检查时间，说明纠正后孩子未出生变为母亲的孕周
116 117 if(dueDate.after(new Date())){
117 118 Date lastMenses= DateUtil.addDay(model.getBirth(), -(model.getDueWeek()*7)+(model.getDueDay()==null?0:model.getDueDay()));
118 119 Long week=(new Date().getTime()-lastMenses.getTime())/(7*24*60*60*1000);
... ... @@ -120,6 +121,13 @@
120 121 redressMonth="孕"+week.toString()+"周"+day+"天";
121 122 }else {
122 123 redressMonth= DateUtil.getBabyMonthAge(dueDate,new Date());
  124 + //大于2岁不在纠正
  125 + if(redressMonth.indexOf("岁")!=0){
  126 + Integer age=Integer.valueOf(redressMonth.substring(0, redressMonth.indexOf("岁")));
  127 + if(age>=2){
  128 + redressMonth=DateUtil.getBabyMonthAge(model.getBirth(), new Date());
  129 + }
  130 + }
123 131 }
124 132  
125 133 result.setRedressMonth(redressMonth);