diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyAfterVisitServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyAfterVisitServiceImpl.java index 8ec84b1..9d77584 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyAfterVisitServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyAfterVisitServiceImpl.java @@ -179,17 +179,19 @@ public class BabyAfterVisitServiceImpl implements BabyAfterVisitService { highRiskType = exists ? -1 : highRiskType; } objectMap.put("highRiskType", highRiskType); + BabyModel babyModel = babyBookbuildingService.queryBabyById(model.getBabyId()); + objectMap.put("babyCardNo", babyModel.getCardNo()); if (request.isArea()) { objectMap.put("hospitalName", CommonsHelper.getHospitalName(model.getHospitalId(), organizationService)); - BabyModel babyModel = babyBookbuildingService.queryBabyById(model.getBabyId()); + String address = ""; if (babyModel != null) { address = CommonsHelper.getResidence(babyModel.getProvinceId(), babyModel.getCityId(), babyModel.getAreaId(), babyModel.getStreetId(), babyModel.getAddress(), basicConfigService); } - objectMap.put("babyCardNo", babyModel.getCardNo()); + objectMap.put("address", address); } @@ -505,13 +507,15 @@ public class BabyAfterVisitServiceImpl implements BabyAfterVisitService { objectMap.put("sexStr", SexEnum.getTextById(model.getSex())); objectMap.put("birthStr", DateUtil.getyyyy_MM_dd(model.getBirth())); objectMap.put("monthsAge", DateUtil.getBabyMonthAge(model.getBirth(), new Date())); + BabyModel babyModel = babyBookbuildingService.queryBabyById(model.getBabyId()); + objectMap.put("babyCardNo",babyModel.getCardNo() ); // 脱敏处理 objectMap.put("mphone", "1".equals(request.getIsEncrypt()) ? EncryptUtil.numberEncrypt(model.getMphone()) : model.getMphone()); if (request.isArea()) { objectMap.put("hospitalName", CommonsHelper.getHospitalName(model.getHospitalId(), organizationService)); - BabyModel babyModel = babyBookbuildingService.queryBabyById(model.getBabyId()); + String address = ""; if (babyModel != null) { @@ -519,7 +523,7 @@ public class BabyAfterVisitServiceImpl implements BabyAfterVisitService { babyModel.getAreaId(), babyModel.getStreetId(), babyModel.getAddress(), basicConfigService); } objectMap.put("address",address ); - objectMap.put("babyCardNo",babyModel.getCardNo() ); + } // 预约时间