diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/AntenatalExaminationDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/AntenatalExaminationDaoImpl.java
index cedd601..e8f95bf 100644
--- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/AntenatalExaminationDaoImpl.java
+++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/AntenatalExaminationDaoImpl.java
@@ -74,7 +74,7 @@ public class AntenatalExaminationDaoImpl  extends BaseMongoDAOImpl<AntenatalExam
     public List<AntenatalExaminationModel> queryYuyueAntenatalExamination(Date yuYueDate,String hospitalId) {
 
         Criteria criteria = new Criteria();
-        Criteria criteria2=   Criteria.where("nextCheckTime").gte(yuYueDate).lte(yuYueDate);
+        Criteria criteria2=   Criteria.where("nextCheckTime").is(yuYueDate);
         Criteria criteria1= Criteria.where("nextCheckTime").exists(false);
         criteria.orOperator(criteria2,criteria1);
 
diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java
index 0e976c2..7feefcf 100644
--- a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java
+++ b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java
@@ -356,7 +356,7 @@ public class SmsServiceImpl implements SmsService{
         {
             System.out.println(DateUtil.getyyyy_MM_dd_hms(new Date())+"孕妇ams短信=======" + msg.getContent());
         }
-
+        allMsgs.clear();
     }
 
 
@@ -532,7 +532,7 @@ public class SmsServiceImpl implements SmsService{
             System.out.println(DateUtil.getyyyy_MM_dd_hms(new Date())+"儿童ams短信=======" + msg.getContent());
         }
 
-
+        allMsgs.clear();
     }
 
 
@@ -656,7 +656,7 @@ public class SmsServiceImpl implements SmsService{
         {
             System.out.println(DateUtil.getyyyy_MM_dd_hms(new Date())+"产妇ams短信=======" + msg.getContent());
         }
-
+        allMsgs.clear();
 
     }
 
@@ -709,7 +709,7 @@ public class SmsServiceImpl implements SmsService{
         SmsConfigQuery configQuery =  new SmsConfigQuery();
         configQuery.setYn(YnEnums.YES.getId());
         configQuery.setPrefixTypes(new Integer[]{0, 1});
-//        configQuery.setHospitalId(249 + "");
+//        configQuery.setHospitalId(221 + "");
 
         //查询出对应医院配置
         List<SmsConfigModel> configs =  smsConfigService.querySmsConfig(configQuery);
@@ -752,10 +752,6 @@ public class SmsServiceImpl implements SmsService{
                //循环每一个模板，根据模板条件查询到用户 发送短信
                for (SmsTemplateModel template : templates)
                {
-//                   if (!("57d605380cf2e638ab9a7036".equals(template.getId())) )
-//                   {
-//                       continue;
-//                   }
 
                    //模板属于的医院id
                    String tempHid = template.getHospitalId();
@@ -1147,7 +1143,6 @@ public class SmsServiceImpl implements SmsService{
                                            messages.add(request);
                                        }
                                    }
-                                   //messages.addAll(getBabyMessageRequestList( babyModelQuery, config, template));
                                }
                            }
                        }
@@ -1853,6 +1848,8 @@ public class SmsServiceImpl implements SmsService{
         {
             System.out.println(DateUtil.getyyyy_MM_dd_hms(new Date())+"模板短信=======" + msg.getContent());
         }
+
+        allMsgs.clear();
     }
 
 
@@ -2253,20 +2250,59 @@ public class SmsServiceImpl implements SmsService{
             if (CollectionUtils.isNotEmpty(patientses))
             {
                 //复诊不存在 才添加
-                List<AntenatalExaminationModel> list =  antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery());
+                List<AntenatalExaminationModel> list =  antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created"));
                 if (!CollectionUtils.isNotEmpty(list))
                 {
                     idset.add(chu.getParentId());
                 }
+
             }
 
         }
-        List<AntenatalExaminationModel> fuzs = antenatalExaminationService.queryYuyueAntenatalExamination(yuYueDate, tempHid);
 
-        for (AntenatalExaminationModel f : fuzs)
+        PatientsQuery patientQuery = new PatientsQuery();
+        patientQuery.setYn(YnEnums.YES.getId());
+        List buildType = new ArrayList();
+        buildType.add(0);
+        buildType.add(2);
+        patientQuery.setBuildTypeList(buildType);
+        //1孕妇  3 产妇
+        patientQuery.setType(1);
+        //分娩状态
+        patientQuery.setDueStatus(0);
+        patientQuery.setHospitalId(tempHid);
+
+        //末次月经必须大于当前时间减去42周视为未分娩孕妇
+        Date lastMensesMax =  DateUtil.getNewDate(-42, "周", 1);
+        patientQuery.setLastMensesStart(lastMensesMax);
+
+        List<Patients> patientses = patientsService.queryPatient(patientQuery);
+        if (CollectionUtils.isNotEmpty(patientses))
         {
-            idset.add(f.getId()); //这里的id就是parentid
+            for (Patients pat : patientses)
+            {
+                AntExQuery antExQuery = new AntExQuery();
+                antExQuery.setParentId(pat.getId());
+                antExQuery.setYn(YnEnums.YES.getId());
+                List<AntenatalExaminationModel> list =  antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created"));
+                if (CollectionUtils.isNotEmpty(list))
+                {
+                    AntenatalExaminationModel ae =  list.get(0);
+                    if (ae != null && ae.getNextCheckTime() != null)
+                    {
+                        if (DateUtil.getyyyy_MM_dd(yuYueDate).equals(DateUtil.getyyyy_MM_dd(ae.getNextCheckTime()))) {
+                            idset.add(ae.getParentId());
+                        }
+                    }
+                }
+            }
         }
+//        List<AntenatalExaminationModel> fuzs = antenatalExaminationService.queryYuyueAntenatalExamination(yuYueDate, tempHid);
+//
+//        for (AntenatalExaminationModel f : fuzs)
+//        {
+//            idset.add(f.getId()); //这里的id就是parentid
+//        }
         return idset;
     }
 
@@ -2306,7 +2342,7 @@ public class SmsServiceImpl implements SmsService{
                 antExQuery.setParentId(chu.getParentId());
                 antExQuery.setYn(YnEnums.YES.getId());
                 //复诊不存在 才添加
-                List<AntenatalExaminationModel> list =  antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery());
+                List<AntenatalExaminationModel> list =  antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created"));
                 if (!CollectionUtils.isNotEmpty(list))
                 {
                     idset.add(chu.getParentId());