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 dca09be..185ad76 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,11 +192,11 @@ public class PremaritalCheckupFacade { String spouseCode = ""; //当婚检ID为空,用证件号或者就诊卡去查询居民建档的信息 - if (StringUtils.isNotEmpty(archiveModel.getSpouseCardNo())) { + if (StringUtils.isNotEmpty(archiveModel.getSpouseCardNo()) || StringUtils.isNotEmpty(result.getSpouseCertificateNum())) { ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery(); archiveQuery.setYn(YnEnums.YES.getId()); archiveQuery.setHospitalId(requestParam.getHospitalId()); - archiveQuery.setCertificateNum(archiveModel.getSpouseCardNo()); + archiveQuery.setCertificateNum(StringUtils.isNotEmpty(archiveModel.getSpouseCardNo()) ? archiveModel.getSpouseCardNo() : result.getSpouseCertificateNum()); List modelList = residentsArchiveService.queryResident(archiveQuery); if (CollectionUtils.isNotEmpty(modelList)) { @@ -208,8 +208,18 @@ public class PremaritalCheckupFacade { checkupResult.setSpouseCertificateNum(model.getCertificateNum()); } } - archiveMap.put("spouseCode", spouseCode); + } +// +// PremaritalCheckupQuery query = new PremaritalCheckupQuery(); +// query.setYn(YnEnums.YES.getId()); +// query.setHospitalId(requestParam.getHospitalId()); +// query.setSpouseCertificateNum(archiveModel.getCertificateNum()); +// List checkupList = premaritalCheckupService.queryPremaritalCheckup(query); +// if (CollectionUtils.isNotEmpty(checkupList)) { +// +// +// } resultMap.put("archiveResult", archiveMap); resultMap.put("checkupResult", checkupResult);