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 4b54f38..d3ed25f 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 @@ -684,10 +684,10 @@ public class AntenatalExaminationFacade { List reviewModels = postReviewService.findWithList(postReviewQuery); if (CollectionUtils.isNotEmpty(reviewModels)) { for (PostReviewModel postReviewModel : reviewModels) { - if (null != postReviewModel.getHospitalId()) { - organization = organizationService.getOrganization(Integer.valueOf(postReviewModel.getHospitalId())); - } if(postReviewModel.getYn()==YnEnums.YES.getId()){ + if (null != postReviewModel.getHospitalId()) { + organization = organizationService.getOrganization(Integer.valueOf(postReviewModel.getHospitalId())); + } listData.add(new AntData(postReviewModel, null != organization ? organization.getName() : "", patientses.get(patientses.size() - 1).getFmDate())); } } @@ -795,10 +795,13 @@ public class AntenatalExaminationFacade { List reviewModels = postReviewService.findWithList(postReviewQuery); if (CollectionUtils.isNotEmpty(reviewModels)) { for (PostReviewModel postReviewModel : reviewModels) { - if (null != postReviewModel.getHospitalId()) { - organization = organizationService.getOrganization(Integer.valueOf(postReviewModel.getHospitalId())); + if(postReviewModel.getYn()==YnEnums.YES.getId()) { + if (null != postReviewModel.getHospitalId()) { + organization = organizationService.getOrganization(Integer.valueOf(postReviewModel.getHospitalId())); + } + listData.add(new AntData(postReviewModel, null != organization ? organization.getName() : "", patientses.get(patientses.size() - 1).getFmDate())); } - listData.add(new AntData(postReviewModel, null != organization ? organization.getName() : "", patientses.get(patientses.size() - 1).getFmDate())); + } } updateEditEnable(listData, sortList);