From 9d7f4ff536c9919a65968b7a161cc17d0e0dfd50 Mon Sep 17 00:00:00 2001 From: yangfei Date: Tue, 9 Jan 2018 22:10:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E6=9C=8D=E5=8A=A1=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/PatientServiceFacade.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) 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())) {//查询医院名称 -- 1.8.3.1