From a66cceac01a16805c88f1f78191de3a94bab0776 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 24 Jun 2021 17:06:02 +0800 Subject: [PATCH] update --- .../operate/web/facade/ResidentsArchiveFacade.java | 4 +- .../web/service/impl/PreEugebicsServiceImpl.java | 110 ++++++++++++--------- 2 files changed, 67 insertions(+), 47 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 70ff858..e199863 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 @@ -12,7 +12,6 @@ import com.lyms.platform.common.utils.*; import com.lyms.platform.operate.web.request.ResidentsArchiveAddRequest; import com.lyms.platform.operate.web.request.ResidentsArchiveQueryRequest; import com.lyms.platform.operate.web.request.WomenGuideSmsRequest; -import com.lyms.platform.operate.web.request.YunBookbuildingAddRequest; import com.lyms.platform.operate.web.result.BasicConfigResult; import com.lyms.platform.operate.web.result.ResidentsArchiveHistoryResult; import com.lyms.platform.operate.web.result.ResidentsArchiveResult; @@ -241,7 +240,8 @@ public class ResidentsArchiveFacade { mapData.put("firstBuildData", getResult(newModel)); mapData.put("archiveHistory", resultList); mapData.put("initBuildDate", DateUtil.getyyyy_MM_dd(new Date())); - mapData.put("premaritalCheckup", getPremaritalCheckup(newModel));//婚检信息 + PremaritalCheckup checkup = getPremaritalCheckup(newModel); + mapData.put("premaritalCheckup", checkup);//婚检信息 list.add(mapData); BaseListResponse listResponse = new BaseListResponse(); 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 3b4b604..32624fb 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 @@ -112,68 +112,88 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen PreEugenicsBaseModel one = new PreEugenicsBaseModel(); if (StringUtils.isNotEmpty(cardNo)) { + + ResidentsArchiveModel wmodel = null; + ResidentsArchiveModel hmodel = null; + ResidentsArchiveModel model = mongoTemplate.findOne(Query.query(Criteria.where("certificateNum").is(cardNo).and("hospitalId").is(hospitalId)), ResidentsArchiveModel.class); + + ////男 + if (model != null && "5d0b782f-b61b-441b-b8c5-4bf55eece273".equals(model.getSex())) { + hmodel = model; + } + if (model == null) { return new BaseObjectResponse().setData(list); } + PremaritalCheckupQuery checkupQuery = new PremaritalCheckupQuery(); + checkupQuery.setYn(YnEnums.YES.getId()); + checkupQuery.setParentId(model.getId()); + List datas = premaritalCheckupService.queryPremaritalCheckupWithSort(checkupQuery, "created", Sort.Direction.DESC); + if (CollectionUtils.isNotEmpty(datas) && StringUtils.isNotEmpty(datas.get(0).getSpouseCertificateNum())) + { + ResidentsArchiveModel model1 = mongoTemplate.findOne(Query.query(Criteria.where("certificateNum").is(datas.get(0).getSpouseCertificateNum()).and("hospitalId").is(hospitalId)), ResidentsArchiveModel.class); + if (model1 != null && !"5d0b782f-b61b-441b-b8c5-4bf55eece273".equals(model1.getSex())) { + wmodel = model1; + } + } ////男 - if (model != null && "5d0b782f-b61b-441b-b8c5-4bf55eece273".equals(model.getSex())) { + if (hmodel != null) { //男性基本信息 - 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.setHusbandName(hmodel.getUsername()); + one.setHusbandNation(hmodel.getNationId()); + one.setHusbandBirthday(hmodel.getBirthday()); + one.setHusbandAge(DateUtil.getAge(hmodel.getBirthday()).toString()); + one.setHusbandEducational(hmodel.getLevelTypeId()); + one.setHusbandCardType(hmodel.getCertificateTypeId()); + one.setHusbandCardNo(hmodel.getCertificateNum()); + one.setHusbandCareer(hmodel.getProfessionTypeId()); + one.setHusbandPhone(hmodel.getPhone()); + one.setHusbandAccountNature(hmodel.getCensusTypeId()); // 男性户口地址 - one.setHusbandAccountProvince(model.getProvinceRegisterId()); - one.setHusbandAccountCity(model.getCityRegisterId()); - one.setHusbandAccountArea(model.getAreaRegisterId()); - one.setHusbandAccountStreet(model.getStreetRegisterId()); - one.setHusbandAccountAddress(model.getAddressRegister()); - - + one.setHusbandAccountProvince(hmodel.getProvinceRegisterId()); + one.setHusbandAccountCity(hmodel.getCityRegisterId()); + one.setHusbandAccountArea(hmodel.getAreaRegisterId()); + one.setHusbandAccountStreet(hmodel.getStreetRegisterId()); + one.setHusbandAccountAddress(hmodel.getAddressRegister()); // 男性居住地 - one.setHusbandCurrentProvince(model.getProvinceId()); - one.setHusbandCurrentCity(model.getCityId()); - one.setHusbandCurrentArea(model.getAreaId()); - one.setHusbandCurrentStreet(model.getStreetId()); - one.setHusbandCurrentAddress(model.getAddress()); + one.setHusbandCurrentProvince(hmodel.getProvinceId()); + one.setHusbandCurrentCity(hmodel.getCityId()); + one.setHusbandCurrentArea(hmodel.getAreaId()); + one.setHusbandCurrentStreet(hmodel.getStreetId()); + one.setHusbandCurrentAddress(hmodel.getAddress()); - } else if (model != null) { + } + if (wmodel != null) { //女性性基本信息 - 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.setWifeName(wmodel.getUsername()); + one.setWifeNation(wmodel.getNationId()); + one.setWifeBirthday(wmodel.getBirthday()); + one.setWifeAge(DateUtil.getAge(wmodel.getBirthday()).toString()); + one.setWifeEducational(wmodel.getLevelTypeId()); + one.setWifeCardType(wmodel.getCertificateTypeId()); + one.setWifeCardNo(wmodel.getCertificateNum()); + one.setWifeCareer(wmodel.getProfessionTypeId()); + one.setWifePhone(wmodel.getPhone()); + one.setWifeAccountNature(wmodel.getCensusTypeId()); // 妇女户口地址 - one.setWifeAccountProvince(model.getProvinceRegisterId()); - one.setWifeAccountCity(model.getCityRegisterId()); - one.setWifeAccountArea(model.getAreaRegisterId()); - one.setWifeAccountStreet(model.getStreetRegisterId()); - one.setWifeAccountAddress(model.getAddressRegister()); + one.setWifeAccountProvince(wmodel.getProvinceRegisterId()); + one.setWifeAccountCity(wmodel.getCityRegisterId()); + one.setWifeAccountArea(wmodel.getAreaRegisterId()); + one.setWifeAccountStreet(wmodel.getStreetRegisterId()); + one.setWifeAccountAddress(wmodel.getAddressRegister()); // 妇女居住地 - one.setWifeCurrentProvince(model.getProvinceId()); - one.setWifeCurrentCity(model.getCityId()); - one.setWifeCurrentArea(model.getAreaId()); - one.setWifeCurrentStreet(model.getStreetId()); - one.setWifeCurrentAddress(model.getAddress()); + one.setWifeCurrentProvince(wmodel.getProvinceId()); + one.setWifeCurrentCity(wmodel.getCityId()); + one.setWifeCurrentArea(wmodel.getAreaId()); + one.setWifeCurrentStreet(wmodel.getStreetId()); + one.setWifeCurrentAddress(wmodel.getAddress()); } list.add(one); BaseResponse baseResponse = new BaseResponse(); @@ -183,7 +203,7 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen list.add(one); } - BaseResponse baseResponse = new BaseResponse(); + BaseResponse baseResponse = new BaseResponse(); baseResponse.setObject(list); return baseResponse; } -- 1.8.3.1