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);