|
@@ -1069,7 +1069,40 @@ public class VaccineInfoServiceImpl implements IVaccineInfoService {
|
|
PageHelper.startPage(pageNum, pageSize, orderBy);
|
|
PageHelper.startPage(pageNum, pageSize, orderBy);
|
|
}
|
|
}
|
|
|
|
|
|
- return vaccineInfoMapper.listByRlry(vaccineInfoOperation);
|
|
|
|
|
|
+ List<VaccineInfoOperation> infoOperations = vaccineInfoMapper.listByRlry(vaccineInfoOperation);
|
|
|
|
+ for (VaccineInfoOperation infoOperation : infoOperations) {
|
|
|
|
+ String province = infoOperation.getProvince(); //省
|
|
|
|
+ String city = infoOperation.getCity(); //市
|
|
|
|
+ String region = infoOperation.getRegion(); //区
|
|
|
|
+ String domicile = infoOperation.getDomicile(); //户籍地
|
|
|
|
+ StringBuilder sbDomicile = new StringBuilder();
|
|
|
|
+ StringBuilder sbNowIn = new StringBuilder();
|
|
|
|
+ if (StringUtils.isNotBlank(province)) {
|
|
|
|
+ sbDomicile.append(province);
|
|
|
|
+ sbNowIn.append(province);
|
|
|
|
+ }
|
|
|
|
+ if (StringUtils.isNotBlank(city)) {
|
|
|
|
+ sbDomicile.append(city);
|
|
|
|
+ sbNowIn.append(city);
|
|
|
|
+ }
|
|
|
|
+ if (StringUtils.isNotBlank(region)) {
|
|
|
|
+ sbDomicile.append(region);
|
|
|
|
+ sbNowIn.append(region);
|
|
|
|
+ }
|
|
|
|
+ if (StringUtils.isNotBlank(domicile)) {
|
|
|
|
+ sbDomicile.append(domicile);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ String nowIn = infoOperation.getNowIn(); //现居地
|
|
|
|
+ if (StringUtils.isNotBlank(nowIn)) {
|
|
|
|
+ sbNowIn.append(nowIn);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ infoOperation.setDomicileSelect(sbDomicile.toString());
|
|
|
|
+ infoOperation.setNowInSelect(sbNowIn.toString());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return infoOperations;
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|