From 090200d1bfcb69b28e0cec88204e8f528bede907 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 19 Mar 2020 15:24:33 +0800 Subject: [PATCH] update --- .../com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java index c2bd439..e86093f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java @@ -192,7 +192,7 @@ public class PremaritalCheckupFacade { String spouseCode = ""; //当婚检ID为空,用证件号或者就诊卡去查询居民建档的信息 - if (StringUtils.isNotEmpty(archiveModel.getSpouseCardNo()) || StringUtils.isNotEmpty(result.getSpouseCertificateNum())) { + if (StringUtils.isNotEmpty(archiveModel.getSpouseCardNo()) || (result != null && StringUtils.isNotEmpty(result.getSpouseCertificateNum()))) { ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery(); archiveQuery.setYn(YnEnums.YES.getId()); archiveQuery.setHospitalId(requestParam.getHospitalId()); -- 1.8.3.1