Commit e1c24197ec11a91b2e620ddd54a2d6ec65c5dc91
1 parent
a5e9049505
Exists in
master
and in
6 other branches
123
Showing 1 changed file with 6 additions and 6 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
e1c2419
| ... | ... | @@ -1978,7 +1978,11 @@ |
| 1978 | 1978 | String join = tire.get("join") + ""; |
| 1979 | 1979 | |
| 1980 | 1980 | Map<String, Object> tireMap = new HashMap<>(); |
| 1981 | - tireMap.put("heartRate", UnitUtils.unitSplice(heartRate, UnitConstants.CIFEN)); | |
| 1981 | + if(StringUtils.isNotEmpty(heartRate)) { | |
| 1982 | + tireMap.put("heartRate", UnitUtils.unitSplice(heartRate, UnitConstants.CIFEN)); | |
| 1983 | + } else { | |
| 1984 | + tireMap.put("heartRate", "")); | |
| 1985 | + } | |
| 1982 | 1986 | tireMap.put("fetalPosition", FetalPositionEnums.getTitle(fetalPosition)); |
| 1983 | 1987 | tireMap.put("fetalPresentation", FetalEnums.getTitle(fetalPresentation)); |
| 1984 | 1988 | tireMap.put("join", JoinEnums.getTitle(join)); |
| ... | ... | @@ -2240,11 +2244,7 @@ |
| 2240 | 2244 | Map<String, Object> placetaMap = new HashMap<>(); |
| 2241 | 2245 | placetaMap.put("fetalPosition", fetalPosition); |
| 2242 | 2246 | placetaMap.put("fetalPresentation", FetalEnums.getTitle(fetalPresentation)); |
| 2243 | - if(StringUtils.isEmpty(heartRate)) { | |
| 2244 | - placetaMap.put("heartRate", ""); | |
| 2245 | - } else { | |
| 2246 | - placetaMap.put("heartRate", UnitUtils.unitSplice(heartRate, UnitConstants.CIFEN)); | |
| 2247 | - } | |
| 2247 | + placetaMap.put("heartRate", UnitUtils.unitSplice(heartRate, UnitConstants.CIFEN)); | |
| 2248 | 2248 | placetaList.add(placetaMap); |
| 2249 | 2249 | } |
| 2250 | 2250 | } |