diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index dccf534..0c0e694 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -1446,8 +1446,9 @@ public class ViewFacade { String fitness = FitnessEnums.getTitle(Integer.parseInt(otherMap.get("fitness").toString())); if(otherMap.get("fitnessRemark")!=null){ mapData.put("fitness", fitness+","+otherMap.get("fitnessRemark")); + }else { + mapData.put("fitness", fitness); } - mapData.put("fitness", fitness); }else{ mapData.put("fitness", otherMap.get("fitnessRemark")); } @@ -1853,7 +1854,7 @@ public class ViewFacade { List tireList = new ArrayList<>(); if (CollectionUtils.isNotEmpty(data.getTireData())) { for (Object temp : data.getTireData()) { - Map tire = JsonUtil.getMap(temp.toString()); + Map tire = (Map) temp; if (tire != null) { String heartRate = tire.get("heartRate"); String fetalPosition = tire.get("fetalPosition");