diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 57c33fc..18bfae7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -40,6 +40,7 @@ import org.springframework.stereotype.Component; import org.springframework.util.StopWatch; import java.util.*; +import java.util.regex.Pattern; /** * 产前检查接口 @@ -2562,7 +2563,7 @@ public class AntenatalExaminationFacade { Map item = new HashMap<>(); item.put("value", chumodel.getGonggao()); item.put("time", DateUtil.getyyyy_MM_dd(chumodel.getCheckTime())); - if (StringUtils.isNumeric(chumodel.getGonggao())) + if (StringUtils.isNumeric(chumodel.getGonggao()) || Pattern.compile("^[-\\+]?[.\\d]*$").matcher(chumodel.getGonggao()).matches()) { titles.add(DateUtil.getyyyy_MM_dd(chumodel.getCheckTime())); values.add(chumodel.getGonggao()); @@ -2585,7 +2586,7 @@ public class AntenatalExaminationFacade { Map item = new HashMap<>(); item.put("value", anmodel.getGongGao()); item.put("time", DateUtil.getyyyy_MM_dd(anmodel.getCheckDate())); - if (StringUtils.isNumeric(anmodel.getGongGao())) + if (StringUtils.isNumeric(anmodel.getGongGao()) || Pattern.compile("^[-\\+]?[.\\d]*$").matcher(anmodel.getGongGao()).matches()) { titles.add(DateUtil.getyyyy_MM_dd(anmodel.getCheckDate())); values.add(anmodel.getGongGao()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index c4e01e0..334dceb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -27,6 +27,7 @@ import org.springframework.data.domain.Sort; import org.springframework.stereotype.Component; import java.util.*; +import java.util.regex.Pattern; @Component public class BabyCheckFacade { @@ -1668,7 +1669,7 @@ public class BabyCheckFacade { Map heightMap = new HashMap<>(); if (org.apache.commons.lang.StringUtils.isNotEmpty(checkModel.getHeight())) { - if (org.apache.commons.lang.StringUtils.isNumeric(checkModel.getHeight())) + if (org.apache.commons.lang.StringUtils.isNumeric(checkModel.getHeight()) || Pattern.compile("^[-\\+]?[.\\d]*$").matcher(checkModel.getHeight()).matches()) { heightTitles.add(DateUtil.getyyyy_MM_dd(checkModel.getCheckDate())); heightValues.add(checkModel.getHeight()); @@ -1683,7 +1684,7 @@ public class BabyCheckFacade { if (org.apache.commons.lang.StringUtils.isNotEmpty(checkModel.getWeight())) { - if (org.apache.commons.lang.StringUtils.isNumeric(checkModel.getWeight())) + if (org.apache.commons.lang.StringUtils.isNumeric(checkModel.getWeight()) || Pattern.compile("^[-\\+]?[.\\d]*$").matcher(checkModel.getWeight()).matches()) { weightTitles.add(DateUtil.getyyyy_MM_dd(checkModel.getCheckDate())); weightValues.add(checkModel.getWeight());