diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java index 788f4b9..ed2c357 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java @@ -391,11 +391,15 @@ public class PatientServiceFacade { result.setId(ps.getId()); if (ps.getPerType() != null && ps.getPerType() == 2) {//儿童 BabyModel model = babyService.getOneBabyById(ps.getParentid()); - result.setSex(model.getSex() == null ? "" : StringUtils.emptyDeal(SexEnum.getTextById(model.getSex()))); - result.setBabyName(StringUtils.emptyDeal(model.getName())); - result.setBirthday(StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(model.getBirth()))); - result.setName(StringUtils.emptyDeal(model.getMname())); - result.setMonthAge(StringUtils.emptyDeal(DateUtil.getBabyMonthAge(model.getBirth(), new Date()))); + if(model!=null){ + result.setSex(model.getSex() == null ? "" : StringUtils.emptyDeal(SexEnum.getTextById(model.getSex()))); + result.setBabyName(StringUtils.emptyDeal(model.getName())); + result.setBirthday(StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(model.getBirth()))); + result.setName(StringUtils.emptyDeal(model.getMname())); + result.setMonthAge(StringUtils.emptyDeal(DateUtil.getBabyMonthAge(model.getBirth(), new Date()))); + }else { + System.out.println("根据儿童Id没有找到儿童:"+ps.getParentid()); + } } else { Patients patients = patientsService.findOnePatientById(ps.getParentid()); if (null != patients) { @@ -413,6 +417,8 @@ public class PatientServiceFacade { result.setRiskFactor(commonService.resloveFactor(patients.getRiskFactorId())); //高危等级颜色 result.setrLevel(commonService.findRiskLevel(patients.getRiskLevelId())); + }else{ + System.out.println("根据孕妇id没有找到孕妇建档:"+ps.getParentid()); } } if (StringUtils.isNotEmpty(ps.getHospitalId())) {//查询医院名称