From 050e84c49c41d206687e504824bafa1c9bc99f12 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 15 Feb 2017 02:05:03 +0800 Subject: [PATCH] update code --- .../platform/operate/web/facade/ViewFacade.java | 53 ++++++++++++++++------ 1 file changed, 38 insertions(+), 15 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 60f0db3..38cdcaf 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 @@ -680,17 +680,20 @@ public class ViewFacade { if (CollectionUtils.isNotEmpty(data.getTireData())){ for (Object temp : data.getTireData()){ Map tire = JsonUtil.getMap(temp.toString()); - String heartRate = tire.get("heartRate"); - String fetalPosition = tire.get("fetalPosition"); - String fetalPresentation = tire.get("fetalPresentation"); - String join = tire.get("join"); - - Map tireMap = new HashMap<>(); - tireMap.put("heartRate",UnitUtils.unitSplice(heartRate, UnitConstants.CIFEN)); - tireMap.put("fetalPosition", FetalPositionEnums.getTitle(fetalPosition)); - tireMap.put("fetalPresentation", FetalEnums.getTitle(fetalPresentation)); - tireMap.put("join", JoinEnums.getTitle(join)); - tireList.add(tireMap); + if (tire != null) + { + String heartRate = tire.get("heartRate"); + String fetalPosition = tire.get("fetalPosition"); + String fetalPresentation = tire.get("fetalPresentation"); + String join = tire.get("join"); + + Map tireMap = new HashMap<>(); + tireMap.put("heartRate",UnitUtils.unitSplice(heartRate, UnitConstants.CIFEN)); + tireMap.put("fetalPosition", FetalPositionEnums.getTitle(fetalPosition)); + tireMap.put("fetalPresentation", FetalEnums.getTitle(fetalPresentation)); + tireMap.put("join", JoinEnums.getTitle(join)); + tireList.add(tireMap); + } } } map.put("tireData",tireList); @@ -947,9 +950,18 @@ public class ViewFacade { if (MapUtils.isNotEmpty(chBpMap)) { ssy = chBpMap.get("ssy"); szy = chBpMap.get("szy"); + if (StringUtils.isNotEmpty(ssy)) + { + map.put("ssy", UnitUtils.unitSplice(ssy,UnitConstants.MMHG)); + } + + if (StringUtils.isNotEmpty(szy)) + { + map.put("szy", UnitUtils.unitSplice(szy,UnitConstants.MMHG)); + } } - map.put("ssy", UnitUtils.unitSplice(ssy,UnitConstants.MMHG)); - map.put("szy", UnitUtils.unitSplice(szy,UnitConstants.MMHG)); +// map.put("ssy", UnitUtils.unitSplice(ssy,UnitConstants.MMHG)); +// map.put("szy", UnitUtils.unitSplice(szy,UnitConstants.MMHG)); // 产后2小时血压 收缩压，舒张压 String ssy2h = ""; String szy2h = ""; @@ -957,9 +969,20 @@ public class ViewFacade { if (MapUtils.isNotEmpty(ch2BpMap)) { ssy2h = ch2BpMap.get("ssy"); szy2h = ch2BpMap.get("szy"); + + if (StringUtils.isNotEmpty(ssy2h)) + { + map.put("ssy2h",UnitUtils.unitSplice(ssy2h,UnitConstants.MMHG)); + } + + if (StringUtils.isNotEmpty(szy2h)) + { + map.put("szy2h", UnitUtils.unitSplice(szy2h,UnitConstants.MMHG)); + } + } - map.put("ssy2h",UnitUtils.unitSplice(ssy2h,UnitConstants.MMHG)); - map.put("szy2h", UnitUtils.unitSplice(szy2h,UnitConstants.MMHG)); +// map.put("ssy2h",UnitUtils.unitSplice(ssy2h,UnitConstants.MMHG)); +// map.put("szy2h", UnitUtils.unitSplice(szy2h,UnitConstants.MMHG)); map.put("breath", UnitUtils.unitSplice(data.getBreath(),UnitConstants.CIFEN)); map.put("pulse", UnitUtils.unitSplice(data.getPulse(), UnitConstants.CIFEN)); -- 1.8.3.1