From 4034aca895e7c5af173095b9b7c13fab1adca5a1 Mon Sep 17 00:00:00 2001 From: yangfei Date: Wed, 21 Jun 2017 17:13:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8F=B7bug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/common/utils/JsonUtil.java | 1 + .../platform/operate/web/facade/ViewFacade.java | 28 +++++++++++----------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/JsonUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/JsonUtil.java index e3a0272..0dec6ae 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/JsonUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/JsonUtil.java @@ -163,6 +163,7 @@ public class JsonUtil { } return data; } catch (Exception e) { + e.printStackTrace(); return null; } } 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 10a7e32..37d7674 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 @@ -1177,7 +1177,7 @@ public class ViewFacade { } if ("java.util.LinkedHashMap".equals(obj.getClass().getName())) { - Map placenta = JsonUtil.getMap(obj.toString()); + Map placenta = (Map)obj; if (MapUtils.isNotEmpty(placenta)) { if (placenta.get("fetalPosition") != null) { for (FetalPositionEnums fetalPositionEnums : FetalPositionEnums.values()) { @@ -1193,25 +1193,25 @@ public class ViewFacade { heartRate = String.valueOf(a); } fetalPresentation += placenta.get("fetalPresentation") == null ? "" : placenta.get("fetalPresentation"); - join = placenta.get("join"); + join = String.valueOf(placenta.get("join")); - if (StringUtils.isNotEmpty(placenta.get("xlwz"))) { - placetaMap.put("xlwz", GongJingEnums.getXLWeiZhiNameById(placenta.get("xlwz"))); + if (placenta.get("xlwz")!=null) { + placetaMap.put("xlwz", GongJingEnums.getXLWeiZhiNameById(String.valueOf(placenta.get("xlwz")))); } - if (StringUtils.isNotEmpty(placenta.get("gjwz"))) { - placetaMap.put("gjwz", GongJingEnums.getWeiZhiNameById(placenta.get("gjwz"))); + if (placenta.get("gjwz")!=null) { + placetaMap.put("gjwz", GongJingEnums.getWeiZhiNameById(String.valueOf(placenta.get("gjwz")))); } - if (StringUtils.isNotEmpty(placenta.get("gjyd"))) { - placetaMap.put("gjyd", GongJingEnums.getYinDuNameById(placenta.get("gjyd"))); + if (placenta.get("gjyd")!=null) { + placetaMap.put("gjyd", GongJingEnums.getYinDuNameById(String.valueOf(placenta.get("gjyd")))); } - if (StringUtils.isNotEmpty(placenta.get("ydjc"))) { - placetaMap.put("tm", TaiShuEnums.getTmNameById(placenta.get("ydjc"))); + if (placenta.get("tm")!=null) { + placetaMap.put("tm", TaiShuEnums.getTmNameById(String.valueOf(placenta.get("tm")))); } - if (StringUtils.isNotEmpty(placenta.get("ydjc"))) { - placetaMap.put("ydjc", GongJingEnums.getYDJianCeNameById(placenta.get("ydjc"))); + if (placenta.get("ydjc")!=null) { + placetaMap.put("ydjc", GongJingEnums.getYDJianCeNameById(String.valueOf(placenta.get("ydjc")))); } if (placenta.get("gjkd") != null) { @@ -1222,11 +1222,11 @@ public class ViewFacade { placetaMap.put("gjrs", UnitUtils.unitSplice(placenta.get("gjrs"), UnitConstants.BF)); } - if (StringUtils.isNotEmpty(placenta.get("gjwzOther"))) { + if (placenta.get("gjwzOther")!=null) { placetaMap.put("gjwzOther", placenta.get("gjwzOther ")); } - if (StringUtils.isNotEmpty(placenta.get("gjydOther"))) { + if (placenta.get("gjydOther")!=null) { placetaMap.put("gjydOther", placenta.get("gjydOther")); } -- 1.8.3.1