Commit a66cceac01a16805c88f1f78191de3a94bab0776
1 parent
47278d3e0f
Exists in
master
and in
6 other branches
update
Showing 2 changed files with 67 additions and 47 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java
View file @
a66ccea
| ... | ... | @@ -12,7 +12,6 @@ |
| 12 | 12 | import com.lyms.platform.operate.web.request.ResidentsArchiveAddRequest; |
| 13 | 13 | import com.lyms.platform.operate.web.request.ResidentsArchiveQueryRequest; |
| 14 | 14 | import com.lyms.platform.operate.web.request.WomenGuideSmsRequest; |
| 15 | -import com.lyms.platform.operate.web.request.YunBookbuildingAddRequest; | |
| 16 | 15 | import com.lyms.platform.operate.web.result.BasicConfigResult; |
| 17 | 16 | import com.lyms.platform.operate.web.result.ResidentsArchiveHistoryResult; |
| 18 | 17 | import com.lyms.platform.operate.web.result.ResidentsArchiveResult; |
| ... | ... | @@ -241,7 +240,8 @@ |
| 241 | 240 | mapData.put("firstBuildData", getResult(newModel)); |
| 242 | 241 | mapData.put("archiveHistory", resultList); |
| 243 | 242 | mapData.put("initBuildDate", DateUtil.getyyyy_MM_dd(new Date())); |
| 244 | - mapData.put("premaritalCheckup", getPremaritalCheckup(newModel));//婚检信息 | |
| 243 | + PremaritalCheckup checkup = getPremaritalCheckup(newModel); | |
| 244 | + mapData.put("premaritalCheckup", checkup);//婚检信息 | |
| 245 | 245 | list.add(mapData); |
| 246 | 246 | |
| 247 | 247 | BaseListResponse listResponse = new BaseListResponse(); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java
View file @
a66ccea
| ... | ... | @@ -112,68 +112,88 @@ |
| 112 | 112 | PreEugenicsBaseModel one = new PreEugenicsBaseModel(); |
| 113 | 113 | |
| 114 | 114 | if (StringUtils.isNotEmpty(cardNo)) { |
| 115 | + | |
| 116 | + ResidentsArchiveModel wmodel = null; | |
| 117 | + ResidentsArchiveModel hmodel = null; | |
| 118 | + | |
| 115 | 119 | ResidentsArchiveModel model = mongoTemplate.findOne(Query.query(Criteria.where("certificateNum").is(cardNo).and("hospitalId").is(hospitalId)), ResidentsArchiveModel.class); |
| 120 | + | |
| 121 | + ////男 | |
| 122 | + if (model != null && "5d0b782f-b61b-441b-b8c5-4bf55eece273".equals(model.getSex())) { | |
| 123 | + hmodel = model; | |
| 124 | + } | |
| 125 | + | |
| 116 | 126 | if (model == null) { |
| 117 | 127 | |
| 118 | 128 | return new BaseObjectResponse().setData(list); |
| 119 | 129 | } |
| 120 | 130 | |
| 131 | + PremaritalCheckupQuery checkupQuery = new PremaritalCheckupQuery(); | |
| 132 | + checkupQuery.setYn(YnEnums.YES.getId()); | |
| 133 | + checkupQuery.setParentId(model.getId()); | |
| 134 | + List<PremaritalCheckup> datas = premaritalCheckupService.queryPremaritalCheckupWithSort(checkupQuery, "created", Sort.Direction.DESC); | |
| 135 | + if (CollectionUtils.isNotEmpty(datas) && StringUtils.isNotEmpty(datas.get(0).getSpouseCertificateNum())) | |
| 136 | + { | |
| 137 | + ResidentsArchiveModel model1 = mongoTemplate.findOne(Query.query(Criteria.where("certificateNum").is(datas.get(0).getSpouseCertificateNum()).and("hospitalId").is(hospitalId)), ResidentsArchiveModel.class); | |
| 138 | + if (model1 != null && !"5d0b782f-b61b-441b-b8c5-4bf55eece273".equals(model1.getSex())) { | |
| 139 | + wmodel = model1; | |
| 140 | + } | |
| 141 | + } | |
| 121 | 142 | ////男 |
| 122 | - if (model != null && "5d0b782f-b61b-441b-b8c5-4bf55eece273".equals(model.getSex())) { | |
| 143 | + if (hmodel != null) { | |
| 123 | 144 | //男性基本信息 |
| 124 | - one.setHusbandName(model.getUsername()); | |
| 125 | - one.setHusbandNation(model.getNationId()); | |
| 126 | - one.setHusbandBirthday(model.getBirthday()); | |
| 127 | - one.setHusbandAge(DateUtil.getAge(model.getBirthday()).toString()); | |
| 128 | - one.setHusbandEducational(model.getLevelTypeId()); | |
| 129 | - one.setHusbandCardType(model.getCertificateTypeId()); | |
| 130 | - one.setHusbandCardNo(model.getCertificateNum()); | |
| 131 | - one.setHusbandCareer(model.getProfessionTypeId()); | |
| 132 | - one.setHusbandPhone(model.getPhone()); | |
| 133 | - one.setHusbandAccountNature(model.getCensusTypeId()); | |
| 145 | + one.setHusbandName(hmodel.getUsername()); | |
| 146 | + one.setHusbandNation(hmodel.getNationId()); | |
| 147 | + one.setHusbandBirthday(hmodel.getBirthday()); | |
| 148 | + one.setHusbandAge(DateUtil.getAge(hmodel.getBirthday()).toString()); | |
| 149 | + one.setHusbandEducational(hmodel.getLevelTypeId()); | |
| 150 | + one.setHusbandCardType(hmodel.getCertificateTypeId()); | |
| 151 | + one.setHusbandCardNo(hmodel.getCertificateNum()); | |
| 152 | + one.setHusbandCareer(hmodel.getProfessionTypeId()); | |
| 153 | + one.setHusbandPhone(hmodel.getPhone()); | |
| 154 | + one.setHusbandAccountNature(hmodel.getCensusTypeId()); | |
| 134 | 155 | |
| 135 | 156 | // 男性户口地址 |
| 136 | - one.setHusbandAccountProvince(model.getProvinceRegisterId()); | |
| 137 | - one.setHusbandAccountCity(model.getCityRegisterId()); | |
| 138 | - one.setHusbandAccountArea(model.getAreaRegisterId()); | |
| 139 | - one.setHusbandAccountStreet(model.getStreetRegisterId()); | |
| 140 | - one.setHusbandAccountAddress(model.getAddressRegister()); | |
| 141 | - | |
| 142 | - | |
| 157 | + one.setHusbandAccountProvince(hmodel.getProvinceRegisterId()); | |
| 158 | + one.setHusbandAccountCity(hmodel.getCityRegisterId()); | |
| 159 | + one.setHusbandAccountArea(hmodel.getAreaRegisterId()); | |
| 160 | + one.setHusbandAccountStreet(hmodel.getStreetRegisterId()); | |
| 161 | + one.setHusbandAccountAddress(hmodel.getAddressRegister()); | |
| 143 | 162 | // 男性居住地 |
| 144 | - one.setHusbandCurrentProvince(model.getProvinceId()); | |
| 145 | - one.setHusbandCurrentCity(model.getCityId()); | |
| 146 | - one.setHusbandCurrentArea(model.getAreaId()); | |
| 147 | - one.setHusbandCurrentStreet(model.getStreetId()); | |
| 148 | - one.setHusbandCurrentAddress(model.getAddress()); | |
| 163 | + one.setHusbandCurrentProvince(hmodel.getProvinceId()); | |
| 164 | + one.setHusbandCurrentCity(hmodel.getCityId()); | |
| 165 | + one.setHusbandCurrentArea(hmodel.getAreaId()); | |
| 166 | + one.setHusbandCurrentStreet(hmodel.getStreetId()); | |
| 167 | + one.setHusbandCurrentAddress(hmodel.getAddress()); | |
| 149 | 168 | |
| 150 | - } else if (model != null) { | |
| 169 | + } | |
| 170 | + if (wmodel != null) { | |
| 151 | 171 | |
| 152 | 172 | //女性性基本信息 |
| 153 | - one.setWifeName(model.getUsername()); | |
| 154 | - one.setWifeNation(model.getNationId()); | |
| 155 | - one.setWifeBirthday(model.getBirthday()); | |
| 156 | - one.setWifeAge(DateUtil.getAge(model.getBirthday()).toString()); | |
| 157 | - one.setWifeEducational(model.getLevelTypeId()); | |
| 158 | - one.setWifeCardType(model.getCertificateTypeId()); | |
| 159 | - one.setWifeCardNo(model.getCertificateNum()); | |
| 160 | - one.setWifeCareer(model.getProfessionTypeId()); | |
| 161 | - one.setWifePhone(model.getPhone()); | |
| 162 | - one.setWifeAccountNature(model.getCensusTypeId()); | |
| 173 | + one.setWifeName(wmodel.getUsername()); | |
| 174 | + one.setWifeNation(wmodel.getNationId()); | |
| 175 | + one.setWifeBirthday(wmodel.getBirthday()); | |
| 176 | + one.setWifeAge(DateUtil.getAge(wmodel.getBirthday()).toString()); | |
| 177 | + one.setWifeEducational(wmodel.getLevelTypeId()); | |
| 178 | + one.setWifeCardType(wmodel.getCertificateTypeId()); | |
| 179 | + one.setWifeCardNo(wmodel.getCertificateNum()); | |
| 180 | + one.setWifeCareer(wmodel.getProfessionTypeId()); | |
| 181 | + one.setWifePhone(wmodel.getPhone()); | |
| 182 | + one.setWifeAccountNature(wmodel.getCensusTypeId()); | |
| 163 | 183 | |
| 164 | 184 | // 妇女户口地址 |
| 165 | - one.setWifeAccountProvince(model.getProvinceRegisterId()); | |
| 166 | - one.setWifeAccountCity(model.getCityRegisterId()); | |
| 167 | - one.setWifeAccountArea(model.getAreaRegisterId()); | |
| 168 | - one.setWifeAccountStreet(model.getStreetRegisterId()); | |
| 169 | - one.setWifeAccountAddress(model.getAddressRegister()); | |
| 185 | + one.setWifeAccountProvince(wmodel.getProvinceRegisterId()); | |
| 186 | + one.setWifeAccountCity(wmodel.getCityRegisterId()); | |
| 187 | + one.setWifeAccountArea(wmodel.getAreaRegisterId()); | |
| 188 | + one.setWifeAccountStreet(wmodel.getStreetRegisterId()); | |
| 189 | + one.setWifeAccountAddress(wmodel.getAddressRegister()); | |
| 170 | 190 | |
| 171 | 191 | // 妇女居住地 |
| 172 | - one.setWifeCurrentProvince(model.getProvinceId()); | |
| 173 | - one.setWifeCurrentCity(model.getCityId()); | |
| 174 | - one.setWifeCurrentArea(model.getAreaId()); | |
| 175 | - one.setWifeCurrentStreet(model.getStreetId()); | |
| 176 | - one.setWifeCurrentAddress(model.getAddress()); | |
| 192 | + one.setWifeCurrentProvince(wmodel.getProvinceId()); | |
| 193 | + one.setWifeCurrentCity(wmodel.getCityId()); | |
| 194 | + one.setWifeCurrentArea(wmodel.getAreaId()); | |
| 195 | + one.setWifeCurrentStreet(wmodel.getStreetId()); | |
| 196 | + one.setWifeCurrentAddress(wmodel.getAddress()); | |
| 177 | 197 | } |
| 178 | 198 | list.add(one); |
| 179 | 199 | BaseResponse baseResponse = new BaseResponse(); |
| ... | ... | @@ -183,7 +203,7 @@ |
| 183 | 203 | list.add(one); |
| 184 | 204 | } |
| 185 | 205 | |
| 186 | - BaseResponse baseResponse = new BaseResponse(); | |
| 206 | + BaseResponse baseResponse = new BaseResponse(); | |
| 187 | 207 | baseResponse.setObject(list); |
| 188 | 208 | return baseResponse; |
| 189 | 209 | } |