Commit 88933b277479235e4c7e1155d5ffe538d23923d9

Authored by jiangjiazhi

Merge remote-tracking branch 'origin/master'

Showing 1 changed file

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 88933b2
... ... @@ -1975,7 +1975,7 @@
1975 1975 for (Object temp : data.getTireData()) {
1976 1976 Map<String, Object> tire = (Map<String, Object>) temp;
1977 1977 if (tire != null) {
1978   - String heartRate = tire.get("heartRate") + "";
  1978 + String heartRate = tire.get("heartRate") == null ? "" : String.valueOf(tire.get("heartRate"));
1979 1979 String fetalPosition = tire.get("fetalPosition") + "";
1980 1980 String fetalPresentation = tire.get("fetalPresentation") + "";
1981 1981 String join = tire.get("join") + "";