From f1559c53de9f25a8044da5dfca005e0168366ec8 Mon Sep 17 00:00:00 2001 From: shiyang <316555390@qq.com> Date: Thu, 23 Dec 2021 13:34:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=A6=E7=9A=87=E5=B2=9B-20211223-=E5=84=BF?= =?UTF-8?q?=E7=AB=A5=E7=AE=A1=E7=90=86-=E6=97=A9=E4=BA=A7=E5=84=BF?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=BA=A0=E6=AD=A3=E6=9C=88=E9=BE=84=E5=A4=A7?= =?UTF-8?q?=E4=BA=8E2=E5=B2=81=E4=B8=8D=E5=9C=A8=E7=BA=A0=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BabyEvaluationCriterionServiceImpl.java | 16 ++++++++++++---- .../lyms/platform/operate/web/utils/BabyListTask.java | 8 ++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEvaluationCriterionServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEvaluationCriterionServiceImpl.java index 3fdbadf..6cb6218 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEvaluationCriterionServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEvaluationCriterionServiceImpl.java @@ -1317,20 +1317,28 @@ public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriteri if(model.getMonthAge()==null){ String redressMonth=""; Date dueDate=DateUtil.addDay(DateUtil.addDay(babyModel.getBirth(), -(babyModel.getDueWeek()*7)+(babyModel.getDueDay()==null?0:babyModel.getDueDay())),280); + //预产期大于检查时间,说明纠正后孩子未出生变为母亲的孕周 if(dueDate.after(checkTime)){ Date lastMenses= DateUtil.addDay(babyModel.getBirth(), -(babyModel.getDueWeek()*7)+(babyModel.getDueDay()==null?0:babyModel.getDueDay())); Long week=(checkTime.getTime()-lastMenses.getTime())/(7*24*60*60*1000); Long day=(checkTime.getTime()-lastMenses.getTime())/(24*60*60*1000)%7; - redressMonth="孕"+week.toString()+"周"+day+"天"; + redressMonth="早产纠正月龄:孕"+week.toString()+"周"+day+"天"; }else { - redressMonth= DateUtil.getBabyMonthAge(dueDate,checkTime); + redressMonth= "早产纠正月龄:"+DateUtil.getBabyMonthAge(dueDate,checkTime); + //大于2岁不在纠正 + if(DateUtil.getBabyMonthAge(dueDate,checkTime).indexOf("岁")!=0){ + Integer age=Integer.valueOf(redressMonth.substring(0, redressMonth.indexOf("岁"))); + if(age>=2){ + redressMonth=DateUtil.getBabyMonthAge(model.getBirth(), checkTime); + } + } + } - map.put("checkMonthStr","早产纠正月龄:"+redressMonth); + map.put("checkMonthStr",redressMonth); }else { map.put("checkMonthStr","早产纠正月龄:"+model.getMonthAge()); } } - } map.put("checkDoctorStr", usersMapper.getUsers(Integer.parseInt(model.getCheckDoctor())).getName()); add(map); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java index 3e9d758..0040290 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java @@ -113,6 +113,7 @@ public class BabyListTask implements Callable { if(model.getDueWeek()!=null&&model.getDueWeek()<37&&model.getHospitalId().equals("216")){ String redressMonth=""; Date dueDate=DateUtil.addDay(DateUtil.addDay(model.getBirth(), -(model.getDueWeek()*7)+(model.getDueDay()==null?0:model.getDueDay())),280); + //预产期大于检查时间,说明纠正后孩子未出生变为母亲的孕周 if(dueDate.after(new Date())){ Date lastMenses= DateUtil.addDay(model.getBirth(), -(model.getDueWeek()*7)+(model.getDueDay()==null?0:model.getDueDay())); Long week=(new Date().getTime()-lastMenses.getTime())/(7*24*60*60*1000); @@ -120,6 +121,13 @@ public class BabyListTask implements Callable { redressMonth="孕"+week.toString()+"周"+day+"天"; }else { redressMonth= DateUtil.getBabyMonthAge(dueDate,new Date()); + //大于2岁不在纠正 + if(redressMonth.indexOf("岁")!=0){ + Integer age=Integer.valueOf(redressMonth.substring(0, redressMonth.indexOf("岁"))); + if(age>=2){ + redressMonth=DateUtil.getBabyMonthAge(model.getBirth(), new Date()); + } + } } result.setRedressMonth(redressMonth); -- 1.8.3.1