Commit 9d7f4ff536c9919a65968b7a161cc17d0e0dfd50
1 parent
fb2540529b
Exists in
master
and in
6 other branches
儿童服务数据查询
Showing 1 changed file with 11 additions and 5 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
View file @
9d7f4ff
| ... | ... | @@ -391,11 +391,15 @@ |
| 391 | 391 | result.setId(ps.getId()); |
| 392 | 392 | if (ps.getPerType() != null && ps.getPerType() == 2) {//儿童 |
| 393 | 393 | BabyModel model = babyService.getOneBabyById(ps.getParentid()); |
| 394 | - result.setSex(model.getSex() == null ? "" : StringUtils.emptyDeal(SexEnum.getTextById(model.getSex()))); | |
| 395 | - result.setBabyName(StringUtils.emptyDeal(model.getName())); | |
| 396 | - result.setBirthday(StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(model.getBirth()))); | |
| 397 | - result.setName(StringUtils.emptyDeal(model.getMname())); | |
| 398 | - result.setMonthAge(StringUtils.emptyDeal(DateUtil.getBabyMonthAge(model.getBirth(), new Date()))); | |
| 394 | + if(model!=null){ | |
| 395 | + result.setSex(model.getSex() == null ? "" : StringUtils.emptyDeal(SexEnum.getTextById(model.getSex()))); | |
| 396 | + result.setBabyName(StringUtils.emptyDeal(model.getName())); | |
| 397 | + result.setBirthday(StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(model.getBirth()))); | |
| 398 | + result.setName(StringUtils.emptyDeal(model.getMname())); | |
| 399 | + result.setMonthAge(StringUtils.emptyDeal(DateUtil.getBabyMonthAge(model.getBirth(), new Date()))); | |
| 400 | + }else { | |
| 401 | + System.out.println("根据儿童Id没有找到儿童："+ps.getParentid()); | |
| 402 | + } | |
| 399 | 403 | } else { |
| 400 | 404 | Patients patients = patientsService.findOnePatientById(ps.getParentid()); |
| 401 | 405 | if (null != patients) { |
| ... | ... | @@ -413,6 +417,8 @@ |
| 413 | 417 | result.setRiskFactor(commonService.resloveFactor(patients.getRiskFactorId())); |
| 414 | 418 | //高危等级颜色 |
| 415 | 419 | result.setrLevel(commonService.findRiskLevel(patients.getRiskLevelId())); |
| 420 | + }else{ | |
| 421 | + System.out.println("根据孕妇id没有找到孕妇建档："+ps.getParentid()); | |
| 416 | 422 | } |
| 417 | 423 | } |
| 418 | 424 | if (StringUtils.isNotEmpty(ps.getHospitalId())) {//查询医院名称 |