From 8f33209fa28b18c5c1860e65c644701f4ef07b81 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Fri, 2 Dec 2016 12:57:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A7=E6=A3=80=E5=88=A0?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/AntExRecordFacade.java | 24 ++++++++++++---------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java index 02de01e..3178720 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java @@ -114,9 +114,9 @@ public class AntExRecordFacade { Patients patients = patientsService.findOnePatientById(record.getParentId()); String dueWeek = ""; if (null != patients) { - if (patients.getDueStatus() == 1&&patients.getType()==3) { + if (patients.getDueStatus()!=null&&patients.getDueStatus() == 1&&patients.getType()==3) { dueWeek = "终止妊娠"; - } else if (patients.getType()==3&&patients.getDueStatus() == 0) { + } else if (patients.getType()==3) { dueWeek = "已分娩"; } else { int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); @@ -153,16 +153,18 @@ public class AntExRecordFacade { List level = new ArrayList(); try { for (Object str : record.gethLevel()) { - BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(str.toString()); - if (null != basicConfig) { - Map map = new HashMap(); - String name = basicConfig.getName(); - if (name.indexOf("预警") > -1) { - name = name.replace("预警", ""); + if(null!=str&&StringUtils.isNotEmpty(str.toString())){ + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(str.toString()); + if (null != basicConfig) { + Map map = new HashMap(); + String name = basicConfig.getName(); + if (name.indexOf("预警") > -1) { + name = name.replace("预警", ""); + } + map.put("name", name); + map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); + level.add(map); } - map.put("name", name); - map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); - level.add(map); } } } catch (Exception e) { -- 1.8.3.1