From e8a25441d07a34121258a26f91f2af8328ccd54e Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Wed, 28 Dec 2016 10:41:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A7=E6=A3=80=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/facade/AntenatalExaminationFacade.java     | 31 +++++++++++++---------
 1 file changed, 19 insertions(+), 12 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 d88c98b..44e4763 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
@@ -1042,6 +1042,7 @@ public class AntenatalExaminationFacade {
         Organization organization = null;
         String pid = "";
         List listData = new ArrayList();
+
         while (iterator.hasNext()) {
             Patients patients = iterator.next();
 
@@ -1084,6 +1085,7 @@ public class AntenatalExaminationFacade {
                         if (null != an.getHospitalId()) {
                             organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId()));
                         }
+
                         listData.add(new AntData(an, null != organization ? organization.getName() : "", patientses.get(0).getLastMenses()));
                     }
                 }
@@ -1105,6 +1107,7 @@ public class AntenatalExaminationFacade {
                         if (null != an.getHospitalId()) {
                             organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId()));
                         }
+
                         listData.add(new AntData(an, null != organization ? organization.getName() : "", patientses.get(0).getLastMenses()));
                     }
                 }
@@ -1117,12 +1120,13 @@ public class AntenatalExaminationFacade {
                         if (null != model.getHospitalId()) {
                             organization = organizationService.getOrganization(Integer.valueOf(model.getHospitalId()));
                         }
+
                         listData.add(new AntData((MaternalDeliverModel) obj, patientses.get(0).getLastMenses(), null != organization ? organization.getName() : ""));
                     }
                 }
 
                 PostReviewQuery postReviewQuery = new PostReviewQuery();
-                if (list.size() - 1 > i) {
+                if (list.size() - 1 >i) {
                     postReviewQuery.setStart(dueDate);
                     if (CollectionUtils.isNotEmpty(listDate)) {
                         //下次建档记录前都是产后复查,如果没有下个产程的数据就直接显示
@@ -1137,22 +1141,25 @@ public class AntenatalExaminationFacade {
                 //产后复查记录
                 List<PostReviewModel> reviewModels = postReviewService.findWithList(postReviewQuery);
                 if (CollectionUtils.isNotEmpty(reviewModels)) {
-                    for (PostReviewModel postReviewModel : reviewModels) {
-                        if (postReviewModel.getYn() == YnEnums.YES.getId()) {
-                            if (null != postReviewModel.getHospitalId()) {
-                                organization = organizationService.getOrganization(Integer.valueOf(postReviewModel.getHospitalId()));
-                            }
+                    if(CollectionUtils.isNotEmpty(listData)){
+                        for (PostReviewModel postReviewModel : reviewModels) {
+                            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() : "", dueDate));
+                                listData.add(new AntData(postReviewModel, null != organization ? organization.getName() : "", dueDate));
+                            }
                         }
-
                     }
                 }
                 iterator.remove();
-                sort(listData);
-                updateEditEnable(listData, sortList);
-                sortList.add(listData);
-                listData = new ArrayList();
+                if(CollectionUtils.isNotEmpty(listData)){
+                    sort(listData);
+                    updateEditEnable(listData, sortList);
+                    sortList.add(listData);
+                    listData = new ArrayList();
+                }
             }
         }
     }
-- 
1.8.3.1