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);