Commit 090200d1bfcb69b28e0cec88204e8f528bede907
1 parent
e0eedd2b36
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 1 additions and 1 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
View file @
090200d
| ... | ... | @@ -192,7 +192,7 @@ |
| 192 | 192 | |
| 193 | 193 | String spouseCode = ""; |
| 194 | 194 | //当婚检ID为空,用证件号或者就诊卡去查询居民建档的信息 |
| 195 | - if (StringUtils.isNotEmpty(archiveModel.getSpouseCardNo()) || StringUtils.isNotEmpty(result.getSpouseCertificateNum())) { | |
| 195 | + if (StringUtils.isNotEmpty(archiveModel.getSpouseCardNo()) || (result != null && StringUtils.isNotEmpty(result.getSpouseCertificateNum()))) { | |
| 196 | 196 | ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery(); |
| 197 | 197 | archiveQuery.setYn(YnEnums.YES.getId()); |
| 198 | 198 | archiveQuery.setHospitalId(requestParam.getHospitalId()); |