From 54cf10341b63c6a9a8b7b94410ce01cf31a63f63 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Tue, 27 Sep 2016 10:27:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=B5=E5=AD=90?= =?UTF-8?q?=E7=97=85=E5=8E=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/AntenatalExaminationFacade.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 85770a6..e92eb2b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -1594,7 +1594,9 @@ public class AntenatalExaminationFacade { if (null != antExChuModel1.getHospitalId()) { organization = organizationService.getOrganization(Integer.valueOf(antExChuModel1.getHospitalId())); } - dataList.add(new AntData(antExChuModel1, null != organization ? organization.getName() : "", patients.getLastMenses())); + if(null!=patients){ + dataList.add(new AntData(antExChuModel1, null != organization ? organization.getName() : "", patients.getLastMenses())); + } } } if (CollectionUtils.isNotEmpty(list)) { @@ -1603,7 +1605,9 @@ public class AntenatalExaminationFacade { organization = organizationService.getOrganization(Integer.valueOf(model.getHospitalId())); } Patients patients = patientsService.findOnePatientById(model.getParentId()); - dataList.add(new AntData(model, null != organization ? organization.getName() : "", patients.getLastMenses())); + if(null!=patients) { + dataList.add(new AntData(model, null != organization ? organization.getName() : "", patients.getLastMenses())); + } } } sort(dataList); -- 1.8.3.1