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 ff1498e..66f9bda 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 @@ -1197,8 +1197,10 @@ public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriteri * 前端算出来的月龄model.getMonthAge()直接拿, * model.getMonthAge()下标0的位置如果是“孕”表示月龄纠正后孩子现在还未出生,这种情况按出生日期计算 */ - if("216".equals(hospitalId)&&model.getMonthAge().indexOf("孕")>0){ - month=Integer.valueOf(model.getMonthAge().substring(0, model.getMonthAge().indexOf("月"))); + if("216".equals(hospitalId)){ + if(!model.getMonthAge().contains("孕")){ + month=Integer.valueOf(model.getMonthAge().substring(0, model.getMonthAge().indexOf("月"))); + } } model.setBirth(babyModel.getBirth()); model.setCardNo(babyModel.getCardNo()); @@ -1232,8 +1234,10 @@ public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriteri * 前端算出来的月龄model.getMonthAge()直接拿, * model.getMonthAge()下标0的位置如果是“孕”表示月龄纠正后孩子现在还未出生,这种情况按出生日期计算 */ - if("216".equals(hospitalId)&&model.getMonthAge().indexOf("孕")>0){ - month=Integer.valueOf(model.getMonthAge().substring(0, model.getMonthAge().indexOf("月"))); + if("216".equals(hospitalId)){ + if(!model.getMonthAge().contains("孕")){ + month=Integer.valueOf(model.getMonthAge().substring(0, model.getMonthAge().indexOf("月"))); + } } model.setCreateUser(null); model.setCreateTime(null);