Commit 626f5899991dea8c5aa2c7542be99f9a66353353
1 parent
82da93b823
Exists in
master
and in
6 other branches
妇科检查
Showing 1 changed file with 3 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
626f589
| ... | ... | @@ -1446,8 +1446,9 @@ |
| 1446 | 1446 | String fitness = FitnessEnums.getTitle(Integer.parseInt(otherMap.get("fitness").toString())); |
| 1447 | 1447 | if(otherMap.get("fitnessRemark")!=null){ |
| 1448 | 1448 | mapData.put("fitness", fitness+"，"+otherMap.get("fitnessRemark")); |
| 1449 | + }else { | |
| 1450 | + mapData.put("fitness", fitness); | |
| 1449 | 1451 | } |
| 1450 | - mapData.put("fitness", fitness); | |
| 1451 | 1452 | }else{ |
| 1452 | 1453 | mapData.put("fitness", otherMap.get("fitnessRemark")); |
| 1453 | 1454 | } |
| ... | ... | @@ -1853,7 +1854,7 @@ |
| 1853 | 1854 | List<Map> tireList = new ArrayList<>(); |
| 1854 | 1855 | if (CollectionUtils.isNotEmpty(data.getTireData())) { |
| 1855 | 1856 | for (Object temp : data.getTireData()) { |
| 1856 | - Map<String, String> tire = JsonUtil.getMap(temp.toString()); | |
| 1857 | + Map<String, String> tire = (Map<String, String>) temp; | |
| 1857 | 1858 | if (tire != null) { |
| 1858 | 1859 | String heartRate = tire.get("heartRate"); |
| 1859 | 1860 | String fetalPosition = tire.get("fetalPosition"); |