Commit 43f7647684898d3604eaec6045795722c6617439
1 parent
05299aa557
Exists in
master
and in
1 other branch
update
Showing 1 changed file with 13 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
View file @
43f7647
| ... | ... | @@ -192,11 +192,11 @@ |
| 192 | 192 | |
| 193 | 193 | String spouseCode = ""; |
| 194 | 194 | //当婚检ID为空,用证件号或者就诊卡去查询居民建档的信息 |
| 195 | - if (StringUtils.isNotEmpty(archiveModel.getSpouseCardNo())) { | |
| 195 | + if (StringUtils.isNotEmpty(archiveModel.getSpouseCardNo()) || StringUtils.isNotEmpty(result.getSpouseCertificateNum())) { | |
| 196 | 196 | ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery(); |
| 197 | 197 | archiveQuery.setYn(YnEnums.YES.getId()); |
| 198 | 198 | archiveQuery.setHospitalId(requestParam.getHospitalId()); |
| 199 | - archiveQuery.setCertificateNum(archiveModel.getSpouseCardNo()); | |
| 199 | + archiveQuery.setCertificateNum(StringUtils.isNotEmpty(archiveModel.getSpouseCardNo()) ? archiveModel.getSpouseCardNo() : result.getSpouseCertificateNum()); | |
| 200 | 200 | List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResident(archiveQuery); |
| 201 | 201 | if (CollectionUtils.isNotEmpty(modelList)) |
| 202 | 202 | { |
| 203 | 203 | |
| ... | ... | @@ -208,8 +208,18 @@ |
| 208 | 208 | checkupResult.setSpouseCertificateNum(model.getCertificateNum()); |
| 209 | 209 | } |
| 210 | 210 | } |
| 211 | - archiveMap.put("spouseCode", spouseCode); | |
| 211 | + | |
| 212 | 212 | } |
| 213 | +// | |
| 214 | +// PremaritalCheckupQuery query = new PremaritalCheckupQuery(); | |
| 215 | +// query.setYn(YnEnums.YES.getId()); | |
| 216 | +// query.setHospitalId(requestParam.getHospitalId()); | |
| 217 | +// query.setSpouseCertificateNum(archiveModel.getCertificateNum()); | |
| 218 | +// List<PremaritalCheckup> checkupList = premaritalCheckupService.queryPremaritalCheckup(query); | |
| 219 | +// if (CollectionUtils.isNotEmpty(checkupList)) { | |
| 220 | +// | |
| 221 | +// | |
| 222 | +// } | |
| 213 | 223 | |
| 214 | 224 | resultMap.put("archiveResult", archiveMap); |
| 215 | 225 | resultMap.put("checkupResult", checkupResult); |