From 52961ecc2c1d8e71071e0dfba6b1d1859e05c70f Mon Sep 17 00:00:00 2001 From: shiyang <316555390@qq.com> Date: Thu, 23 Dec 2021 10:56:31 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=A6=E7=9A=87=E5=B2=9B-20211223-=E5=84=BF?= =?UTF-8?q?=E4=BF=9D=E8=BF=90=E5=8A=A8=E8=AF=84=E6=B5=8B=E4=BF=9D=E5=AD=98?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BabyEvaluationCriterionServiceImpl.java | 16 ++++++++++++---- 1 file changed, 12 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 c1cbce2..60f5f14 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 @@ -1192,8 +1192,12 @@ public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriteri } Integer month = DateUtil.getBabyAgeMonth(babyModel.getBirth(), new Date()); //Integer currentMonth = getCurrentMonth(month, 3, 1); - //秦皇岛-前端算出来的月龄model.getMonthAge()直接拿 - if("216".equals(hospitalId)){ + /** + * 秦皇岛-20211223 + * 前端算出来的月龄model.getMonthAge()直接拿, + * model.getMonthAge()下标0的位置如果是孕表示月龄纠正后孩子现在时间还未出生，这种情况按出生日期计算 + */ + if("216".equals(hospitalId)&&model.getMonthAge().indexOf("孕")!=0){ month=Integer.valueOf(model.getMonthAge().substring(0, model.getMonthAge().indexOf("月"))); } model.setBirth(babyModel.getBirth()); @@ -1223,8 +1227,12 @@ public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriteri Integer month = DateUtil.getBabyAgeMonth(babyModel.getBirth(), mongoTemplate.findOne(Query.query(Criteria.where("_id").is(id)), ExerciseAppraisalModel.class).getCreateTime()); - //秦皇岛-前端算出来的月龄model.getMonthAge()直接拿 - if("216".equals(hospitalId)){ + /** + * 秦皇岛-20211223 + * 前端算出来的月龄model.getMonthAge()直接拿, + * model.getMonthAge()下标0的位置如果是孕表示月龄纠正后孩子现在时间还未出生，这种情况按出生日期计算 + */ + if("216".equals(hospitalId)&&model.getMonthAge().indexOf("孕")!=0){ month=Integer.valueOf(model.getMonthAge().substring(0, model.getMonthAge().indexOf("月"))); } model.setCreateUser(null); -- 1.8.3.1