fangcheng / regional-platform

Download as
Browse Code »

Commit 54cf10341b63c6a9a8b7b94410ce01cf31a63f63

Authored by jiangjiazhi
1 parent 36fc43800f
Exists in master and in 1 other branch nobuildprocess

修改新电子病历

Showing 1 changed file with 6 additions and 2 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ 54cf103
... ... @@ -1594,7 +1594,9 @@
1594 1594 if (null != antExChuModel1.getHospitalId()) {
1595 1595 organization = organizationService.getOrganization(Integer.valueOf(antExChuModel1.getHospitalId()));
1596 1596 }
1597   - dataList.add(new AntData(antExChuModel1, null != organization ? organization.getName() : "", patients.getLastMenses()));
  1597 + if(null!=patients){
  1598 + dataList.add(new AntData(antExChuModel1, null != organization ? organization.getName() : "", patients.getLastMenses()));
  1599 + }
1598 1600 }
1599 1601 }
1600 1602 if (CollectionUtils.isNotEmpty(list)) {
... ... @@ -1603,7 +1605,9 @@
1603 1605 organization = organizationService.getOrganization(Integer.valueOf(model.getHospitalId()));
1604 1606 }
1605 1607 Patients patients = patientsService.findOnePatientById(model.getParentId());
1606   - dataList.add(new AntData(model, null != organization ? organization.getName() : "", patients.getLastMenses()));
  1608 + if(null!=patients) {
  1609 + dataList.add(new AntData(model, null != organization ? organization.getName() : "", patients.getLastMenses()));
  1610 + }
1607 1611 }
1608 1612 }
1609 1613 sort(dataList);