From f399facefa37bcecd33fdb6d20a84df5e71f2770 Mon Sep 17 00:00:00 2001 From: hujiaqi Date: Fri, 30 Dec 2016 16:35:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E4=BD=8F=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/operate/web/facade/MatDeliverFacade.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 1b5c530..1f0ae31 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -1086,7 +1086,9 @@ public class MatDeliverFacade { // 居住类型 if (childbirthManagerRequest.getInitQuery().contains("pliveTypeId")) { try { - childbirthManagerQueryModel.setPliveTypeId(basicConfigService.getOneBasicConfigById("pliveTypeId").getName()); + if(StringUtils.isNotEmpty(patients.getPliveTypeId())) { + childbirthManagerQueryModel.setPliveTypeId(basicConfigService.getOneBasicConfigById(patients.getPliveTypeId()).getName()); + } } catch (Exception e) { // 什么都不干 } @@ -1095,7 +1097,9 @@ public class MatDeliverFacade { // 户口类型 if (childbirthManagerRequest.getInitQuery().contains("pcensusTypeId")) { try { - childbirthManagerQueryModel.setPcensusTypeId(basicConfigService.getOneBasicConfigById("pcensusTypeId").getName()); + if(StringUtils.isNotEmpty(patients.getPcensusTypeId())) { + childbirthManagerQueryModel.setPcensusTypeId(basicConfigService.getOneBasicConfigById(patients.getPcensusTypeId()).getName()); + } } catch (Exception e) { // 什么都不干 } -- 1.8.3.1