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) { // 什么都不干 }