From 63acd847db6515ba75985375d8e031181fa0d52b Mon Sep 17 00:00:00 2001 From: gengxiaokai Date: Wed, 9 Jan 2019 09:53:17 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=A6=E7=9A=87=E5=B2=9B=E5=9F=BA=E6=9C=AC?= =?UTF-8?q?=E5=85=AC=E5=8D=AB=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java index eadd610..6f59af5 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java @@ -422,9 +422,9 @@ public class QhdJbgwInterface { map.put("AST",antExChuModel.getXqgczam()); map.put("ALB",antExChuModel.getAlbumin()); map.put("TBI",antExChuModel.getTotalBilirubin()); - if(antExChuModel.getJhBilirubin() != null && antExChuModel.getTotalBilirubin() != null){ + if(StringUtils.isNotEmpty(antExChuModel.getJhBilirubin()) && StringUtils.isNotEmpty(antExChuModel.getTotalBilirubin())){ double jh = Double.parseDouble(antExChuModel.getTotalBilirubin()) - Double.parseDouble(antExChuModel.getJhBilirubin()); - map.put("DBIL",String.valueOf(jh)); + map.put("DBIL",String.valueOf(jh).substring(0,4)); } map.put("BUN",antExChuModel.getXnsd()); map.put("SCR",antExChuModel.getXqjq()); @@ -511,6 +511,12 @@ public class QhdJbgwInterface { familyHistory = FunvCommonUtil.replace(map1, new StringBuilder(), basicConfigService); } map.put("REGISTERFAMILYHISTORY",familyHistory); + String personalHistory=""; + if(StringUtils.isNotEmpty(antExChuModel.getPersonalHistory())){ + Map map1 = JsonUtil.jkstr2Obj(antExChuModel.getFamilyHistory(), Map.class); + personalHistory = FunvCommonUtil.replace(map1, new StringBuilder(), basicConfigService); + } + map.put("personalHistory",personalHistory); String cestationInfo=""; if(StringUtils.isNotEmpty(antExChuModel.getCestationInfo())){ Map map1 = JsonUtil.jkstr2Obj(antExChuModel.getCestationInfo(), Map.class); -- 1.8.3.1