From 4fcea70b3957489c56abd131f18ac4cc7b87cff6 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 2 Jul 2019 14:28:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java | 12 +++++++++--- .../lyms/platform/operate/web/facade/MeasureInfoFacade.java | 3 ++- 2 files changed, 11 insertions(+), 4 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 7c1d7ba..18d8c92 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 @@ -441,8 +441,14 @@ public class QhdJbgwInterface { map.put("ALB",antExChuModel.getAlbumin()); map.put("TBI",antExChuModel.getTotalBilirubin()); 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).substring(0,4)); + try { + double jh = Double.parseDouble(antExChuModel.getTotalBilirubin()) - Double.parseDouble(antExChuModel.getJhBilirubin()); + map.put("DBIL",String.valueOf(jh).substring(0,4)); + }catch (Exception e) + { + map.put("DBIL",""); + } + } map.put("BUN",antExChuModel.getXnsd()); map.put("SCR",antExChuModel.getXqjq()); @@ -1072,7 +1078,7 @@ public class QhdJbgwInterface { map.put("BABYCHEST",null); map.put("BABYHEIGHT",babyModel.getBabyHeight()); map.put("BABYHEADSIZE",babyModel.getBabyHead()); - if(1 == babyModel.getMalformation()){ + if(babyModel.getMalformation() != null && 1 == babyModel.getMalformation()){ map.put("BABYMALFORMATION","2"); } if(babyModel.getApgarScore() != null){ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java index d582eff..1a431fa 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java @@ -839,7 +839,8 @@ public class MeasureInfoFacade { patientsQuery.setVcCardNo(certNo); } - patientsQuery.setHospitalId(hospitalId); + //patientsQuery.setHospitalId(hospitalId); + patientsQuery.setType(1); patientsQuery.setYn(YnEnums.YES.getId()); List patientses = patientsService.queryPatient(patientsQuery); if (CollectionUtils.isEmpty(patientses)) { -- 1.8.3.1