Commit fa2dc4db55689156673c9eb8308f496ccf37ade2
Exists in
master
and in
6 other branches
Merge remote-tracking branch 'origin/master'
Showing 2 changed files
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
fa2dc4d
| ... | ... | @@ -40,6 +40,7 @@ |
| 40 | 40 | import org.springframework.util.StopWatch; |
| 41 | 41 | |
| 42 | 42 | import java.util.*; |
| 43 | +import java.util.regex.Pattern; | |
| 43 | 44 | |
| 44 | 45 | /** |
| 45 | 46 | * 产前检查接口 |
| ... | ... | @@ -2562,7 +2563,7 @@ |
| 2562 | 2563 | Map<String,String> item = new HashMap<>(); |
| 2563 | 2564 | item.put("value", chumodel.getGonggao()); |
| 2564 | 2565 | item.put("time", DateUtil.getyyyy_MM_dd(chumodel.getCheckTime())); |
| 2565 | - if (StringUtils.isNumeric(chumodel.getGonggao())) | |
| 2566 | + if (StringUtils.isNumeric(chumodel.getGonggao()) || Pattern.compile("^[-\\+]?[.\\d]*$").matcher(chumodel.getGonggao()).matches()) | |
| 2566 | 2567 | { |
| 2567 | 2568 | titles.add(DateUtil.getyyyy_MM_dd(chumodel.getCheckTime())); |
| 2568 | 2569 | values.add(chumodel.getGonggao()); |
| ... | ... | @@ -2585,7 +2586,7 @@ |
| 2585 | 2586 | Map<String,String> item = new HashMap<>(); |
| 2586 | 2587 | item.put("value", anmodel.getGongGao()); |
| 2587 | 2588 | item.put("time", DateUtil.getyyyy_MM_dd(anmodel.getCheckDate())); |
| 2588 | - if (StringUtils.isNumeric(anmodel.getGongGao())) | |
| 2589 | + if (StringUtils.isNumeric(anmodel.getGongGao()) || Pattern.compile("^[-\\+]?[.\\d]*$").matcher(anmodel.getGongGao()).matches()) | |
| 2589 | 2590 | { |
| 2590 | 2591 | titles.add(DateUtil.getyyyy_MM_dd(anmodel.getCheckDate())); |
| 2591 | 2592 | values.add(anmodel.getGongGao()); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
View file @
fa2dc4d
| ... | ... | @@ -27,6 +27,7 @@ |
| 27 | 27 | import org.springframework.stereotype.Component; |
| 28 | 28 | |
| 29 | 29 | import java.util.*; |
| 30 | +import java.util.regex.Pattern; | |
| 30 | 31 | |
| 31 | 32 | @Component |
| 32 | 33 | public class BabyCheckFacade { |
| ... | ... | @@ -1668,7 +1669,7 @@ |
| 1668 | 1669 | Map<String,String> heightMap = new HashMap<>(); |
| 1669 | 1670 | if (org.apache.commons.lang.StringUtils.isNotEmpty(checkModel.getHeight())) |
| 1670 | 1671 | { |
| 1671 | - if (org.apache.commons.lang.StringUtils.isNumeric(checkModel.getHeight())) | |
| 1672 | + if (org.apache.commons.lang.StringUtils.isNumeric(checkModel.getHeight()) || Pattern.compile("^[-\\+]?[.\\d]*$").matcher(checkModel.getHeight()).matches()) | |
| 1672 | 1673 | { |
| 1673 | 1674 | heightTitles.add(DateUtil.getyyyy_MM_dd(checkModel.getCheckDate())); |
| 1674 | 1675 | heightValues.add(checkModel.getHeight()); |
| ... | ... | @@ -1683,7 +1684,7 @@ |
| 1683 | 1684 | |
| 1684 | 1685 | if (org.apache.commons.lang.StringUtils.isNotEmpty(checkModel.getWeight())) |
| 1685 | 1686 | { |
| 1686 | - if (org.apache.commons.lang.StringUtils.isNumeric(checkModel.getWeight())) | |
| 1687 | + if (org.apache.commons.lang.StringUtils.isNumeric(checkModel.getWeight()) || Pattern.compile("^[-\\+]?[.\\d]*$").matcher(checkModel.getWeight()).matches()) | |
| 1687 | 1688 | { |
| 1688 | 1689 | weightTitles.add(DateUtil.getyyyy_MM_dd(checkModel.getCheckDate())); |
| 1689 | 1690 | weightValues.add(checkModel.getWeight()); |