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 1c212b9..b1e3066 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
@@ -465,12 +465,6 @@ public class AntenatalExaminationFacade {
                                     postReviewQuery.setEnd(patientses.get(0).getBookbuildingDate());
                                 }
                                 postReviewQuery.setPid(pid);
-//                            Object obj = map.get(listDate.get(i).getId());
-                        /*    if (obj instanceof MaternalDeliverModel) {
-                                listData.add(new AntData((MaternalDeliverModel) obj, patientses.get(0).getLastMenses(), null != organization ? organization.getName() : ""));
-                            } else if (obj instanceof StopPregModel) {
-                                listData.add(new AntData(stopPregs.get(0), patientses.get(0).getLastMenses(), null != organization ? organization.getName() : ""));
-                            }*/
 
                                 //产后复查记录
                                 List<PostReviewModel> reviewModels = postReviewService.findWithList(postReviewQuery);
@@ -489,7 +483,7 @@ public class AntenatalExaminationFacade {
                     }
 
                     if(CollectionUtils.isNotEmpty(patientses)){
-                        buildPatientList(dueDate,patientses,listData,null);
+                        buildPatientList(dueDate,patientses,listData,null,false);
 
                         PostReviewQuery postReviewQuery = new PostReviewQuery();
                         if (list.size() - 1 > i) {
@@ -537,7 +531,7 @@ public class AntenatalExaminationFacade {
                 if(!tmp.isEmpty()){
                     min=tmp.get(tmp.size()-1).getDate();
                 }
-                List l= buildPatientList(dueDate, patientsList, list1,min);
+                List l= buildPatientList(dueDate, patientsList, list1,min,false);
                 if(!l.isEmpty()){
                     sort(l);
                     sortList.add(l);
@@ -553,7 +547,7 @@ public class AntenatalExaminationFacade {
                 if(!tmp.isEmpty()){
                     min=tmp.get(tmp.size()-1).getDate();
                 }
-                List l=buildPatientList(dueDate, list, list1,min);
+                List l=buildPatientList(dueDate, list, list1,min,true);
                 if(!l.isEmpty()){
                     sort(l);
                     sortList.add(l);
@@ -580,7 +574,7 @@ public class AntenatalExaminationFacade {
 
 
 
-    private List buildPatientList(Date dueDate, List<Patients> patientses,List listData,Date min) {
+    private List buildPatientList(Date dueDate, List<Patients> patientses,List listData,Date min,boolean f) {
         if(CollectionUtils.isEmpty(patientses)){
             return listData;
         }
@@ -600,13 +594,15 @@ public class AntenatalExaminationFacade {
             //初诊记录
             AntExChuQuery antExChuQuery = new AntExChuQuery();
             antExChuQuery.setYn(YnEnums.YES.getId());
-            if(null==min){
-                antExChuQuery.setStart(patientses.get(0).getBookbuildingDate());
-                antExChuQuery.setEnd(new Date(dueDate.getTime()+86398000));
-            }else{
-                antExChuQuery.setStart(min);
-                if(min.before(patientses.get(0).getBookbuildingDate())){
-                    antExChuQuery.setEnd(new Date(patientses.get(0).getBookbuildingDate().getTime() + 86398000));
+            if(!f){
+                if(null==min){
+                    antExChuQuery.setStart(patientses.get(0).getBookbuildingDate());
+                    antExChuQuery.setEnd(new Date(dueDate.getTime()+86398000));
+                }else{
+                    antExChuQuery.setStart(min);
+                    if(min.before(patientses.get(0).getBookbuildingDate())&&min.before(dueDate)){
+                        antExChuQuery.setEnd(new Date(patientses.get(0).getBookbuildingDate().getTime() + 86398000));
+                    }
                 }
             }
             antExChuQuery.setPid(pid);
@@ -625,13 +621,15 @@ public class AntenatalExaminationFacade {
             AntExQuery antExQuery = new AntExQuery();
             antExQuery.setYn(YnEnums.YES.getId());
             antExQuery.setPid(pid);
-            if(null==min) {
-                antExQuery.setStart(patientses.get(0).getBookbuildingDate());
-                antExQuery.setEnd(new Date(dueDate.getTime() + 86398000));
-            }else{
-                antExQuery.setStart(min);
-                if(min.before(patientses.get(0).getBookbuildingDate())){
-                    antExQuery.setEnd(new Date(patientses.get(0).getBookbuildingDate().getTime() + 86398000));
+            if(!f) {
+                if (null == min) {
+                    antExQuery.setStart(patientses.get(0).getBookbuildingDate());
+                    antExQuery.setEnd(new Date(dueDate.getTime() + 86398000));
+                } else {
+                    antExQuery.setStart(min);
+                    if (min.before(patientses.get(0).getBookbuildingDate())) {
+                        antExQuery.setEnd(new Date(patientses.get(0).getBookbuildingDate().getTime() + 86398000));
+                    }
                 }
             }