From e1c24197ec11a91b2e620ddd54a2d6ec65c5dc91 Mon Sep 17 00:00:00 2001 From: "litao@lymsh.com" Date: Fri, 15 Dec 2017 09:44:50 +0800 Subject: [PATCH] 123 --- .../com/lyms/platform/operate/web/facade/ViewFacade.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 51d177d..4bca4b5 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 @@ -1978,7 +1978,11 @@ public class ViewFacade { String join = tire.get("join") + ""; Map tireMap = new HashMap<>(); - tireMap.put("heartRate", UnitUtils.unitSplice(heartRate, UnitConstants.CIFEN)); + if(StringUtils.isNotEmpty(heartRate)) { + tireMap.put("heartRate", UnitUtils.unitSplice(heartRate, UnitConstants.CIFEN)); + } else { + tireMap.put("heartRate", "")); + } tireMap.put("fetalPosition", FetalPositionEnums.getTitle(fetalPosition)); tireMap.put("fetalPresentation", FetalEnums.getTitle(fetalPresentation)); tireMap.put("join", JoinEnums.getTitle(join)); @@ -2240,11 +2244,7 @@ public class ViewFacade { Map placetaMap = new HashMap<>(); placetaMap.put("fetalPosition", fetalPosition); placetaMap.put("fetalPresentation", FetalEnums.getTitle(fetalPresentation)); - if(StringUtils.isEmpty(heartRate)) { - placetaMap.put("heartRate", ""); - } else { - placetaMap.put("heartRate", UnitUtils.unitSplice(heartRate, UnitConstants.CIFEN)); - } + placetaMap.put("heartRate", UnitUtils.unitSplice(heartRate, UnitConstants.CIFEN)); placetaList.add(placetaMap); } } -- 1.8.3.1