shiyang / regional-platform

Download as
Browse Code ยป

Commit f43f1030010bc9a8d55a24394df9ee370b6e4fad

Authored by zhangrui
2 parents a4719c78e8 46025fa8e8
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 1 changed file

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ f43f103
... ... @@ -684,10 +684,10 @@
684 684 List<PostReviewModel> reviewModels = postReviewService.findWithList(postReviewQuery);
685 685 if (CollectionUtils.isNotEmpty(reviewModels)) {
686 686 for (PostReviewModel postReviewModel : reviewModels) {
687   - if (null != postReviewModel.getHospitalId()) {
688   - organization = organizationService.getOrganization(Integer.valueOf(postReviewModel.getHospitalId()));
689   - }
690 687 if(postReviewModel.getYn()==YnEnums.YES.getId()){
  688 + if (null != postReviewModel.getHospitalId()) {
  689 + organization = organizationService.getOrganization(Integer.valueOf(postReviewModel.getHospitalId()));
  690 + }
691 691 listData.add(new AntData(postReviewModel, null != organization ? organization.getName() : "", patientses.get(patientses.size() - 1).getFmDate()));
692 692 }
693 693 }
694 694  
... ... @@ -795,10 +795,13 @@
795 795 List<PostReviewModel> reviewModels = postReviewService.findWithList(postReviewQuery);
796 796 if (CollectionUtils.isNotEmpty(reviewModels)) {
797 797 for (PostReviewModel postReviewModel : reviewModels) {
798   - if (null != postReviewModel.getHospitalId()) {
799   - organization = organizationService.getOrganization(Integer.valueOf(postReviewModel.getHospitalId()));
  798 + if(postReviewModel.getYn()==YnEnums.YES.getId()) {
  799 + if (null != postReviewModel.getHospitalId()) {
  800 + organization = organizationService.getOrganization(Integer.valueOf(postReviewModel.getHospitalId()));
  801 + }
  802 + listData.add(new AntData(postReviewModel, null != organization ? organization.getName() : "", patientses.get(patientses.size() - 1).getFmDate()));
800 803 }
801   - listData.add(new AntData(postReviewModel, null != organization ? organization.getName() : "", patientses.get(patientses.size() - 1).getFmDate()));
  804 +
802 805 }
803 806 }
804 807 updateEditEnable(listData, sortList);