diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java index deb9b92..8c06c23 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java @@ -250,9 +250,16 @@ public class CancerScreeningFacade { result.put("phone",model.getPhone()); //居住地址 - String addressRegister = CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(), + String liveRegister = CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(), model.getAreaId(), model.getStreetId(), model.getAddress(), basicConfigService); - result.put("registAddress",addressRegister); + result.put("liveRegister",liveRegister); + + + //户籍地 + String addressRegister = CommonsHelper.getResidence(model.getProvinceRegisterId(), model.getCityRegisterId(), + model.getAreaRegisterId(), model.getStreetRegisterId(), model.getAddressRegister(), basicConfigService); + result.put("addressRegister",addressRegister); + result.put("levelType",FunvCommonUtil.getBaseicConfigByid(model.getLevelTypeId(), basicConfigService)); result.put("residentId", model.getId());