Commit 8e7882393b289cdcbf4e3e15e71c47064490fac1

Authored by liquanyu
1 parent 94f104af24

工位统计

Showing 1 changed file with 8 additions and 4 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyAfterVisitServiceImpl.java View file @ 8e78823
... ... @@ -179,17 +179,19 @@
179 179 highRiskType = exists ? -1 : highRiskType;
180 180 }
181 181 objectMap.put("highRiskType", highRiskType);
  182 + BabyModel babyModel = babyBookbuildingService.queryBabyById(model.getBabyId());
  183 + objectMap.put("babyCardNo", babyModel.getCardNo());
182 184 if (request.isArea())
183 185 {
184 186 objectMap.put("hospitalName", CommonsHelper.getHospitalName(model.getHospitalId(), organizationService));
185   - BabyModel babyModel = babyBookbuildingService.queryBabyById(model.getBabyId());
  187 +
186 188 String address = "";
187 189 if (babyModel != null)
188 190 {
189 191 address = CommonsHelper.getResidence(babyModel.getProvinceId(), babyModel.getCityId(),
190 192 babyModel.getAreaId(), babyModel.getStreetId(), babyModel.getAddress(), basicConfigService);
191 193 }
192   - objectMap.put("babyCardNo", babyModel.getCardNo());
  194 +
193 195 objectMap.put("address", address);
194 196 }
195 197  
196 198  
... ... @@ -505,13 +507,15 @@
505 507 objectMap.put("sexStr", SexEnum.getTextById(model.getSex()));
506 508 objectMap.put("birthStr", DateUtil.getyyyy_MM_dd(model.getBirth()));
507 509 objectMap.put("monthsAge", DateUtil.getBabyMonthAge(model.getBirth(), new Date()));
  510 + BabyModel babyModel = babyBookbuildingService.queryBabyById(model.getBabyId());
  511 + objectMap.put("babyCardNo",babyModel.getCardNo() );
508 512 // 脱敏处理
509 513 objectMap.put("mphone", "1".equals(request.getIsEncrypt()) ? EncryptUtil.numberEncrypt(model.getMphone()) : model.getMphone());
510 514  
511 515 if (request.isArea())
512 516 {
513 517 objectMap.put("hospitalName", CommonsHelper.getHospitalName(model.getHospitalId(), organizationService));
514   - BabyModel babyModel = babyBookbuildingService.queryBabyById(model.getBabyId());
  518 +
515 519 String address = "";
516 520 if (babyModel != null)
517 521 {
... ... @@ -519,7 +523,7 @@
519 523 babyModel.getAreaId(), babyModel.getStreetId(), babyModel.getAddress(), basicConfigService);
520 524 }
521 525 objectMap.put("address",address );
522   - objectMap.put("babyCardNo",babyModel.getCardNo() );
  526 +
523 527 }
524 528  
525 529 // 预约时间