diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
index 6feb49d..b4a75a7 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
@@ -438,7 +438,7 @@ public class BookbuildingFacade {
 						List<MessageRequest> messages = new ArrayList<>();
 						MessageRequest mr = new MessageRequest();
 						Date  dueDate = DateUtil.addDay(patient.getLastMenses(), 7);
-						dueDate = DateUtil.addMonth(patient.getLastMenses(), 9);
+						dueDate = DateUtil.addMonth(dueDate, 9);
 						String content = StringUtils.replaceEL(patient.getUsername(),dueDate,templateModel.getContent());
 
 						mr.setContent("【"+messagePrefix+"】"+content);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
index 3e641e4..8fdbde6 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
@@ -580,12 +580,13 @@ public class PatientFacade {
         try {
             BaseListResponse listResponse = null;
             List<Map<String,Object>> datas = new ArrayList<>();
+            Map<String,String> cnames = new HashMap<>();
             if (patientsQueryRequest.getQueryType() != null)
             {
                 // 0 高危孕妇 1 全部孕妇 2全部产妇
                 if (patientsQueryRequest.getQueryType() == 0)
                 {
-                    listResponse =  (BaseListResponse)queryHighRisk(patientsQueryRequest, Boolean.TRUE, 1, userId,"true");
+                    listResponse =  (BaseListResponse)queryHighRisk(patientsQueryRequest, Boolean.TRUE, 1, userId,null);
                     List list = listResponse.getData();
                     for (Object obj : list)
                     {
@@ -605,8 +606,6 @@ public class PatientFacade {
                         data.put("lName",rp.getlName());
                         data.put("phone",rp.getPhone());
                     }
-
-                    Map<String,String> cnames = new HashMap<>();
                     cnames.put("name", "姓名");
                     cnames.put("age","当前年龄");
                     cnames.put("dueWeek","当前孕周");
@@ -619,20 +618,77 @@ public class PatientFacade {
                     cnames.put("dueDate","预产期");
                     cnames.put("checkDoctor","产检医生");
                     cnames.put("lName","登记人");
-                    cnames.put("phone","联系方式");
+                    cnames.put("phone", "联系方式");
 
-                    OutputStream out = response.getOutputStream();
-                    ExcelUtil.toExcel(out, datas, cnames);
                 }
                 else if (patientsQueryRequest.getQueryType() == 1)
                 {
-                    listResponse =  (BaseListResponse)queryHighRisk(patientsQueryRequest,null,1,userId,"true");
+                    listResponse =  (BaseListResponse)queryHighRisk(patientsQueryRequest,null,1,userId,null);
+                    List list = listResponse.getData();
+                    for (Object obj : list)
+                    {
+                        Map<String,Object> data = new HashMap<>();
+                        QuanPatientsResult rp = (QuanPatientsResult)obj;
+                        data.put("name", rp.getName());
+                        data.put("age",rp.getAge());
+                        data.put("dueWeek",rp.getDueWeek());
+                        data.put("rLevel", rp.getrLevel());
+                        data.put("cTimes", rp.getcTime());
+                        data.put("cHTimes",rp.getcHTimes());
+                        data.put("cTime",rp.getcTime());
+                        data.put("dueDate",rp.getDueDate());
+                        data.put("checkDoctor",rp.getCheckDoctor());
+                        data.put("lName",rp.getlName());
+                        data.put("phone",rp.getPhone());
+                    }
+                    cnames.put("name", "姓名");
+                    cnames.put("age","当前年龄");
+                    cnames.put("dueWeek","当前孕周");
+                    cnames.put("rLevel", "高危等级");
+                    cnames.put("cTimes", "总产检次数");
+                    cnames.put("cHTimes","本院产检次数");
+                    cnames.put("cTime","预约产检日期");
+                    cnames.put("dueDate","预产期");
+                    cnames.put("checkDoctor","产检医生");
+                    cnames.put("lName","登记人");
+                    cnames.put("phone", "联系方式");
+                    cnames.put("serviceType", "服务类型");
                 }
                 else if (patientsQueryRequest.getQueryType() == 2)
                 {
-                    listResponse =  (BaseListResponse)queryHighRisk(patientsQueryRequest, null, 3,userId,"true");
+                    listResponse =  (BaseListResponse)queryHighRisk(patientsQueryRequest, null, 3,userId,null);
+                    List list = listResponse.getData();
+                    for (Object obj : list)
+                    {
+                        Map<String,Object> data = new HashMap<>();
+                        QuanChanResult rp = (QuanChanResult)obj;
+                        data.put("name", rp.getName());
+                        data.put("age",rp.getAge());
+                        data.put("dueWeek",rp.getDueWeek());
+                        data.put("cTime",rp.getcTime());
+                        data.put("nextCheckTime", rp.getNextCheckTime());
+                        data.put("cTimes", rp.getcTime());
+                        data.put("cHTimes",rp.getcHTimes());
+                        data.put("checkDoctor",rp.getCheckDoctor());
+                        data.put("lName",rp.getlName());
+                        data.put("phone",rp.getPhone());
+                    }
+                    cnames.put("name", "姓名");
+                    cnames.put("age","分娩年龄");
+                    cnames.put("dueWeek","分娩日期");
+                    cnames.put("cTime", "产后时间");
+                    cnames.put("nextCheckTime", "预约下次复查");
+                    cnames.put("cTimes", "总复查次数");
+                    cnames.put("cHTimes", "本院复查次数");
+                    cnames.put("checkDoctor","检查医生");
+                    cnames.put("phone","联系方式");
+                    cnames.put("lName","登记人");
                 }
             }
+
+
+            OutputStream out = response.getOutputStream();
+            ExcelUtil.toExcel(out, datas, cnames);
         }catch (IOException e) {
             e.printStackTrace();
         }