From 84e337d20db9fc394de436544726651dcae8beba Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 29 Apr 2020 14:23:55 +0800 Subject: [PATCH] update --- .../operate/web/facade/ResidentsArchiveFacade.java | 22 ++++- .../web/service/impl/PreEugebicsServiceImpl.java | 106 +++++++++------------ 2 files changed, 64 insertions(+), 64 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java index ecb21f0..cf0c26d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java @@ -763,9 +763,25 @@ public class ResidentsArchiveFacade { map.put("phone", FunvCommonUtil.getXingPhone(model.getPhone())); map.put("buildDoctor", model.getPublishName()); - map.put("spouseName", model.getSpouseName()); - map.put("spouseCardNo", com.lyms.platform.common.utils.StringUtils.encryCardNo(model.getSpouseCardNo())); - map.put("spousePhone", FunvCommonUtil.getId(model.getSpousePhone())); + + //查询婚检中最后异常婚检的配偶信息呈现在档案管理列表中 + PremaritalCheckupQuery checkupQuery = new PremaritalCheckupQuery(); + checkupQuery.setYn(YnEnums.YES.getId()); + checkupQuery.setParentId(model.getId()); + List checkups = premaritalCheckupService.queryPremaritalCheckup(checkupQuery); + if (CollectionUtils.isNotEmpty(checkups)) + { + PremaritalCheckup checkup = checkups.get(0); + map.put("spouseName", checkup.getSpouseName()); + map.put("spouseCardNo", com.lyms.platform.common.utils.StringUtils.encryCardNo(checkup.getSpouseCertificateNum())); + map.put("spousePhone", ""); + } + +// map.put("spouseName", model.getSpouseName()); +// map.put("spouseCardNo", com.lyms.platform.common.utils.StringUtils.encryCardNo(model.getSpouseCardNo())); +// map.put("spousePhone", FunvCommonUtil.getId(model.getSpousePhone())); + + data.add(map); } } 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 4d5677e..9c02d63 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 @@ -106,83 +106,67 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen if (StringUtils.isNotEmpty(cardNo)) { ResidentsArchiveModel model = mongoTemplate.findOne(Query.query(Criteria.where("certificateNum").is(cardNo).and("hospitalId").is(hospitalId)), ResidentsArchiveModel.class); if (model == null) { - return new BaseResponse(); - } - ResidentsArchiveModel model1 = mongoTemplate.findOne(Query.query(Criteria.where("certificateNum").is(model.getSpouseCardNo()).and("hospitalId").is(hospitalId)), ResidentsArchiveModel.class); - - ResidentsArchiveModel manModel = null; - ResidentsArchiveModel wamenModel = null; - //男 - if ("5d0b782f-b61b-441b-b8c5-4bf55eece273".equals(model.getSex())) - { - manModel = model; - wamenModel = model1; - } - else - { - wamenModel= model; - manModel = model1; + return new BaseObjectResponse().setData(list); } - one = new PreEugenicsBaseModel(); + ////男 - if (manModel != null) + if (model != null && "5d0b782f-b61b-441b-b8c5-4bf55eece273".equals(model.getSex())) { //男性基本信息 - one.setHusbandName(manModel.getUsername()); - one.setHusbandNation(manModel.getNationId()); - one.setHusbandBirthday(manModel.getBirthday()); - one.setHusbandAge(DateUtil.getAge(manModel.getBirthday()).toString()); - one.setHusbandEducational(manModel.getLevelTypeId()); - one.setHusbandCardType(manModel.getCertificateTypeId()); - one.setHusbandCardNo(manModel.getCertificateNum()); - one.setHusbandCareer(manModel.getProfessionTypeId()); - one.setHusbandPhone(manModel.getPhone()); - one.setHusbandAccountNature(manModel.getCensusTypeId()); + one.setHusbandName(model.getUsername()); + one.setHusbandNation(model.getNationId()); + one.setHusbandBirthday(model.getBirthday()); + one.setHusbandAge(DateUtil.getAge(model.getBirthday()).toString()); + one.setHusbandEducational(model.getLevelTypeId()); + one.setHusbandCardType(model.getCertificateTypeId()); + one.setHusbandCardNo(model.getCertificateNum()); + one.setHusbandCareer(model.getProfessionTypeId()); + one.setHusbandPhone(model.getPhone()); + one.setHusbandAccountNature(model.getCensusTypeId()); // 男性户口地址 - one.setHusbandAccountProvince(manModel.getProvinceRegisterId()); - one.setHusbandAccountCity(manModel.getCityRegisterId()); - one.setHusbandAccountArea(manModel.getAreaRegisterId()); - one.setHusbandAccountStreet(manModel.getStreetRegisterId()); - one.setHusbandAccountAddress(manModel.getAddressRegister()); + one.setHusbandAccountProvince(model.getProvinceRegisterId()); + one.setHusbandAccountCity(model.getCityRegisterId()); + one.setHusbandAccountArea(model.getAreaRegisterId()); + one.setHusbandAccountStreet(model.getStreetRegisterId()); + one.setHusbandAccountAddress(model.getAddressRegister()); // 男性居住地 - one.setHusbandCurrentProvince(manModel.getProvinceId()); - one.setHusbandCurrentCity(manModel.getCityId()); - one.setHusbandCurrentArea(manModel.getAreaId()); - one.setHusbandCurrentStreet(manModel.getStreetId()); - one.setHusbandCurrentAddress(manModel.getAddress()); + one.setHusbandCurrentProvince(model.getProvinceId()); + one.setHusbandCurrentCity(model.getCityId()); + one.setHusbandCurrentArea(model.getAreaId()); + one.setHusbandCurrentStreet(model.getStreetId()); + one.setHusbandCurrentAddress(model.getAddress()); + + } else if (model != null){ - } - if (wamenModel != null) - { //女性性基本信息 - one.setWifeName(wamenModel.getUsername()); - one.setWifeNation(wamenModel.getNationId()); - one.setWifeBirthday(wamenModel.getBirthday()); - one.setWifeAge(DateUtil.getAge(wamenModel.getBirthday()).toString()); - one.setWifeEducational(wamenModel.getLevelTypeId()); - one.setWifeCardType(wamenModel.getCertificateTypeId()); - one.setWifeCardNo(wamenModel.getCertificateNum()); - one.setWifeCareer(wamenModel.getProfessionTypeId()); - one.setWifePhone(wamenModel.getPhone()); - one.setWifeAccountNature(wamenModel.getCensusTypeId()); + one.setWifeName(model.getUsername()); + one.setWifeNation(model.getNationId()); + one.setWifeBirthday(model.getBirthday()); + one.setWifeAge(DateUtil.getAge(model.getBirthday()).toString()); + one.setWifeEducational(model.getLevelTypeId()); + one.setWifeCardType(model.getCertificateTypeId()); + one.setWifeCardNo(model.getCertificateNum()); + one.setWifeCareer(model.getProfessionTypeId()); + one.setWifePhone(model.getPhone()); + one.setWifeAccountNature(model.getCensusTypeId()); // 妇女户口地址 - one.setWifeAccountProvince(wamenModel.getProvinceRegisterId()); - one.setWifeAccountCity(wamenModel.getCityRegisterId()); - one.setWifeAccountArea(wamenModel.getAreaRegisterId()); - one.setWifeAccountStreet(wamenModel.getStreetRegisterId()); - one.setWifeAccountAddress(wamenModel.getAddressRegister()); + one.setWifeAccountProvince(model.getProvinceRegisterId()); + one.setWifeAccountCity(model.getCityRegisterId()); + one.setWifeAccountArea(model.getAreaRegisterId()); + one.setWifeAccountStreet(model.getStreetRegisterId()); + one.setWifeAccountAddress(model.getAddressRegister()); // 妇女居住地 - one.setWifeCurrentProvince(wamenModel.getProvinceId()); - one.setWifeCurrentCity(wamenModel.getCityId()); - one.setWifeCurrentArea(wamenModel.getAreaId()); - one.setWifeCurrentStreet(wamenModel.getStreetId()); - one.setWifeCurrentAddress(wamenModel.getAddress()); + one.setWifeCurrentProvince(model.getProvinceId()); + one.setWifeCurrentCity(model.getCityId()); + one.setWifeCurrentArea(model.getAreaId()); + one.setWifeCurrentStreet(model.getStreetId()); + one.setWifeCurrentAddress(model.getAddress()); } list.add(one); BaseResponse baseResponse = new BaseResponse(); -- 1.8.3.1