Commit 84e337d20db9fc394de436544726651dcae8beba
1 parent
c5be15adea
Exists in
master
and in
6 other branches
update
Showing 2 changed files with 64 additions and 64 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java
View file @
84e337d
| ... | ... | @@ -763,9 +763,25 @@ |
| 763 | 763 | map.put("phone", FunvCommonUtil.getXingPhone(model.getPhone())); |
| 764 | 764 | map.put("buildDoctor", model.getPublishName()); |
| 765 | 765 | |
| 766 | - map.put("spouseName", model.getSpouseName()); | |
| 767 | - map.put("spouseCardNo", com.lyms.platform.common.utils.StringUtils.encryCardNo(model.getSpouseCardNo())); | |
| 768 | - map.put("spousePhone", FunvCommonUtil.getId(model.getSpousePhone())); | |
| 766 | + | |
| 767 | + //查询婚检中最后异常婚检的配偶信息呈现在档案管理列表中 | |
| 768 | + PremaritalCheckupQuery checkupQuery = new PremaritalCheckupQuery(); | |
| 769 | + checkupQuery.setYn(YnEnums.YES.getId()); | |
| 770 | + checkupQuery.setParentId(model.getId()); | |
| 771 | + List<PremaritalCheckup> checkups = premaritalCheckupService.queryPremaritalCheckup(checkupQuery); | |
| 772 | + if (CollectionUtils.isNotEmpty(checkups)) | |
| 773 | + { | |
| 774 | + PremaritalCheckup checkup = checkups.get(0); | |
| 775 | + map.put("spouseName", checkup.getSpouseName()); | |
| 776 | + map.put("spouseCardNo", com.lyms.platform.common.utils.StringUtils.encryCardNo(checkup.getSpouseCertificateNum())); | |
| 777 | + map.put("spousePhone", ""); | |
| 778 | + } | |
| 779 | + | |
| 780 | +// map.put("spouseName", model.getSpouseName()); | |
| 781 | +// map.put("spouseCardNo", com.lyms.platform.common.utils.StringUtils.encryCardNo(model.getSpouseCardNo())); | |
| 782 | +// map.put("spousePhone", FunvCommonUtil.getId(model.getSpousePhone())); | |
| 783 | + | |
| 784 | + | |
| 769 | 785 | data.add(map); |
| 770 | 786 | } |
| 771 | 787 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java
View file @
84e337d
| ... | ... | @@ -106,83 +106,67 @@ |
| 106 | 106 | if (StringUtils.isNotEmpty(cardNo)) { |
| 107 | 107 | ResidentsArchiveModel model = mongoTemplate.findOne(Query.query(Criteria.where("certificateNum").is(cardNo).and("hospitalId").is(hospitalId)), ResidentsArchiveModel.class); |
| 108 | 108 | if (model == null) { |
| 109 | - return new BaseResponse(); | |
| 110 | - } | |
| 111 | - ResidentsArchiveModel model1 = mongoTemplate.findOne(Query.query(Criteria.where("certificateNum").is(model.getSpouseCardNo()).and("hospitalId").is(hospitalId)), ResidentsArchiveModel.class); | |
| 112 | 109 | |
| 113 | - ResidentsArchiveModel manModel = null; | |
| 114 | - ResidentsArchiveModel wamenModel = null; | |
| 115 | - | |
| 116 | - //男 | |
| 117 | - if ("5d0b782f-b61b-441b-b8c5-4bf55eece273".equals(model.getSex())) | |
| 118 | - { | |
| 119 | - manModel = model; | |
| 120 | - wamenModel = model1; | |
| 110 | + return new BaseObjectResponse().setData(list); | |
| 121 | 111 | } |
| 122 | - else | |
| 123 | - { | |
| 124 | - wamenModel= model; | |
| 125 | - manModel = model1; | |
| 126 | - } | |
| 127 | - one = new PreEugenicsBaseModel(); | |
| 112 | + | |
| 128 | 113 | ////男 |
| 129 | - if (manModel != null) | |
| 114 | + if (model != null && "5d0b782f-b61b-441b-b8c5-4bf55eece273".equals(model.getSex())) | |
| 130 | 115 | { |
| 131 | 116 | //男性基本信息 |
| 132 | - one.setHusbandName(manModel.getUsername()); | |
| 133 | - one.setHusbandNation(manModel.getNationId()); | |
| 134 | - one.setHusbandBirthday(manModel.getBirthday()); | |
| 135 | - one.setHusbandAge(DateUtil.getAge(manModel.getBirthday()).toString()); | |
| 136 | - one.setHusbandEducational(manModel.getLevelTypeId()); | |
| 137 | - one.setHusbandCardType(manModel.getCertificateTypeId()); | |
| 138 | - one.setHusbandCardNo(manModel.getCertificateNum()); | |
| 139 | - one.setHusbandCareer(manModel.getProfessionTypeId()); | |
| 140 | - one.setHusbandPhone(manModel.getPhone()); | |
| 141 | - one.setHusbandAccountNature(manModel.getCensusTypeId()); | |
| 117 | + one.setHusbandName(model.getUsername()); | |
| 118 | + one.setHusbandNation(model.getNationId()); | |
| 119 | + one.setHusbandBirthday(model.getBirthday()); | |
| 120 | + one.setHusbandAge(DateUtil.getAge(model.getBirthday()).toString()); | |
| 121 | + one.setHusbandEducational(model.getLevelTypeId()); | |
| 122 | + one.setHusbandCardType(model.getCertificateTypeId()); | |
| 123 | + one.setHusbandCardNo(model.getCertificateNum()); | |
| 124 | + one.setHusbandCareer(model.getProfessionTypeId()); | |
| 125 | + one.setHusbandPhone(model.getPhone()); | |
| 126 | + one.setHusbandAccountNature(model.getCensusTypeId()); | |
| 142 | 127 | |
| 143 | 128 | // 男性户口地址 |
| 144 | - one.setHusbandAccountProvince(manModel.getProvinceRegisterId()); | |
| 145 | - one.setHusbandAccountCity(manModel.getCityRegisterId()); | |
| 146 | - one.setHusbandAccountArea(manModel.getAreaRegisterId()); | |
| 147 | - one.setHusbandAccountStreet(manModel.getStreetRegisterId()); | |
| 148 | - one.setHusbandAccountAddress(manModel.getAddressRegister()); | |
| 129 | + one.setHusbandAccountProvince(model.getProvinceRegisterId()); | |
| 130 | + one.setHusbandAccountCity(model.getCityRegisterId()); | |
| 131 | + one.setHusbandAccountArea(model.getAreaRegisterId()); | |
| 132 | + one.setHusbandAccountStreet(model.getStreetRegisterId()); | |
| 133 | + one.setHusbandAccountAddress(model.getAddressRegister()); | |
| 149 | 134 | |
| 150 | 135 | |
| 151 | 136 | // 男性居住地 |
| 152 | - one.setHusbandCurrentProvince(manModel.getProvinceId()); | |
| 153 | - one.setHusbandCurrentCity(manModel.getCityId()); | |
| 154 | - one.setHusbandCurrentArea(manModel.getAreaId()); | |
| 155 | - one.setHusbandCurrentStreet(manModel.getStreetId()); | |
| 156 | - one.setHusbandCurrentAddress(manModel.getAddress()); | |
| 137 | + one.setHusbandCurrentProvince(model.getProvinceId()); | |
| 138 | + one.setHusbandCurrentCity(model.getCityId()); | |
| 139 | + one.setHusbandCurrentArea(model.getAreaId()); | |
| 140 | + one.setHusbandCurrentStreet(model.getStreetId()); | |
| 141 | + one.setHusbandCurrentAddress(model.getAddress()); | |
| 157 | 142 | |
| 158 | - } | |
| 159 | - if (wamenModel != null) | |
| 160 | - { | |
| 143 | + } else if (model != null){ | |
| 144 | + | |
| 161 | 145 | //女性性基本信息 |
| 162 | - one.setWifeName(wamenModel.getUsername()); | |
| 163 | - one.setWifeNation(wamenModel.getNationId()); | |
| 164 | - one.setWifeBirthday(wamenModel.getBirthday()); | |
| 165 | - one.setWifeAge(DateUtil.getAge(wamenModel.getBirthday()).toString()); | |
| 166 | - one.setWifeEducational(wamenModel.getLevelTypeId()); | |
| 167 | - one.setWifeCardType(wamenModel.getCertificateTypeId()); | |
| 168 | - one.setWifeCardNo(wamenModel.getCertificateNum()); | |
| 169 | - one.setWifeCareer(wamenModel.getProfessionTypeId()); | |
| 170 | - one.setWifePhone(wamenModel.getPhone()); | |
| 171 | - one.setWifeAccountNature(wamenModel.getCensusTypeId()); | |
| 146 | + one.setWifeName(model.getUsername()); | |
| 147 | + one.setWifeNation(model.getNationId()); | |
| 148 | + one.setWifeBirthday(model.getBirthday()); | |
| 149 | + one.setWifeAge(DateUtil.getAge(model.getBirthday()).toString()); | |
| 150 | + one.setWifeEducational(model.getLevelTypeId()); | |
| 151 | + one.setWifeCardType(model.getCertificateTypeId()); | |
| 152 | + one.setWifeCardNo(model.getCertificateNum()); | |
| 153 | + one.setWifeCareer(model.getProfessionTypeId()); | |
| 154 | + one.setWifePhone(model.getPhone()); | |
| 155 | + one.setWifeAccountNature(model.getCensusTypeId()); | |
| 172 | 156 | |
| 173 | 157 | // 妇女户口地址 |
| 174 | - one.setWifeAccountProvince(wamenModel.getProvinceRegisterId()); | |
| 175 | - one.setWifeAccountCity(wamenModel.getCityRegisterId()); | |
| 176 | - one.setWifeAccountArea(wamenModel.getAreaRegisterId()); | |
| 177 | - one.setWifeAccountStreet(wamenModel.getStreetRegisterId()); | |
| 178 | - one.setWifeAccountAddress(wamenModel.getAddressRegister()); | |
| 158 | + one.setWifeAccountProvince(model.getProvinceRegisterId()); | |
| 159 | + one.setWifeAccountCity(model.getCityRegisterId()); | |
| 160 | + one.setWifeAccountArea(model.getAreaRegisterId()); | |
| 161 | + one.setWifeAccountStreet(model.getStreetRegisterId()); | |
| 162 | + one.setWifeAccountAddress(model.getAddressRegister()); | |
| 179 | 163 | |
| 180 | 164 | // 妇女居住地 |
| 181 | - one.setWifeCurrentProvince(wamenModel.getProvinceId()); | |
| 182 | - one.setWifeCurrentCity(wamenModel.getCityId()); | |
| 183 | - one.setWifeCurrentArea(wamenModel.getAreaId()); | |
| 184 | - one.setWifeCurrentStreet(wamenModel.getStreetId()); | |
| 185 | - one.setWifeCurrentAddress(wamenModel.getAddress()); | |
| 165 | + one.setWifeCurrentProvince(model.getProvinceId()); | |
| 166 | + one.setWifeCurrentCity(model.getCityId()); | |
| 167 | + one.setWifeCurrentArea(model.getAreaId()); | |
| 168 | + one.setWifeCurrentStreet(model.getStreetId()); | |
| 169 | + one.setWifeCurrentAddress(model.getAddress()); | |
| 186 | 170 | } |
| 187 | 171 | list.add(one); |
| 188 | 172 | BaseResponse baseResponse = new BaseResponse(); |