Commit f399facefa37bcecd33fdb6d20a84df5e71f2770
1 parent
68f0896879
Exists in
master
居住类型
Showing 1 changed file with 6 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
f399fac
| ... | ... | @@ -1086,7 +1086,9 @@ |
| 1086 | 1086 | // 居住类型 |
| 1087 | 1087 | if (childbirthManagerRequest.getInitQuery().contains("pliveTypeId")) { |
| 1088 | 1088 | try { |
| 1089 | - childbirthManagerQueryModel.setPliveTypeId(basicConfigService.getOneBasicConfigById("pliveTypeId").getName()); | |
| 1089 | + if(StringUtils.isNotEmpty(patients.getPliveTypeId())) { | |
| 1090 | + childbirthManagerQueryModel.setPliveTypeId(basicConfigService.getOneBasicConfigById(patients.getPliveTypeId()).getName()); | |
| 1091 | + } | |
| 1090 | 1092 | } catch (Exception e) { |
| 1091 | 1093 | // 什么都不干 |
| 1092 | 1094 | } |
| ... | ... | @@ -1095,7 +1097,9 @@ |
| 1095 | 1097 | // 户口类型 |
| 1096 | 1098 | if (childbirthManagerRequest.getInitQuery().contains("pcensusTypeId")) { |
| 1097 | 1099 | try { |
| 1098 | - childbirthManagerQueryModel.setPcensusTypeId(basicConfigService.getOneBasicConfigById("pcensusTypeId").getName()); | |
| 1100 | + if(StringUtils.isNotEmpty(patients.getPcensusTypeId())) { | |
| 1101 | + childbirthManagerQueryModel.setPcensusTypeId(basicConfigService.getOneBasicConfigById(patients.getPcensusTypeId()).getName()); | |
| 1102 | + } | |
| 1099 | 1103 | } catch (Exception e) { |
| 1100 | 1104 | // 什么都不干 |
| 1101 | 1105 | } |