diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java index 8d18e39..55536d5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java @@ -839,6 +839,19 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen query.setHospitalId(hospitalId); query.setCertificateNum(cardNo); List hjList = premaritalCheckupService.queryPremaritalCheckup(query); + if(CollectionUtils.isEmpty(hjList)) + { + Query yquery = new Query(); + yquery.addCriteria(Criteria.where("hospitalId").is(hospitalId)); + yquery.addCriteria(Criteria.where("husbandCardNo").is(cardNo)); + List yjList = mongoTemplate.find(yquery, PreEugenicsBaseModel.class); + if (CollectionUtils.isNotEmpty(yjList) && StringUtils.isNotEmpty(yjList.get(0).getWifeCardNo())) + { + query.setCertificateNum(yjList.get(0).getWifeCardNo()); + hjList = premaritalCheckupService.queryPremaritalCheckup(query); + } + } + if(CollectionUtils.isNotEmpty(hjList)){ PremaritalCheckup premaritalCheckup = hjList.get(0); map.put("menarcheAge", premaritalCheckup.getMenarcheAge());//初潮年龄