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 689dec0..64dd863 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
@@ -2205,8 +2205,8 @@ public class PatientFacade extends BaseServiceImpl {
             List list = listResponse.getData();
             for (Object obj : list) {
                 Map <String, Object> data = new HashMap <>();
-                //孕妇
-                if(obj instanceof RiskPatientsResult){
+                //高危孕妇
+                if(patientsQueryRequest.getQueryType()==0){
                     RiskPatientsResult rp = (RiskPatientsResult) obj;
                     data.put("name", rp.getName());
                     data.put("age", rp.getAge());
@@ -2228,8 +2228,35 @@ public class PatientFacade extends BaseServiceImpl {
                     data.put("serviceType", rp.getServiceType());
                     data.put("serviceStatus", rp.getServiceStatus());
                     datas.add(data);
+                }else if(patientsQueryRequest.getQueryType()==1){
+                    //全部孕妇
+                    QuanPatientsResult rp = (QuanPatientsResult) obj;
+                    data.put("name", rp.getName());
+                    data.put("age", rp.getAge());
+                    if ("1000000115".equals(hospital)) {
+                        data.put("cardNo", rp.getCardNo());
+                        data.put("vcCardNo", rp.getVcCardNo());
+                    }
+                    data.put("cardNo", rp.getCardNo());
+                    data.put("dueWeek", rp.getDueWeek());
+                    data.put("bTime", rp.getbTime());
+                    data.put("cTimes", rp.getcTimes());
+                    data.put("createdWeek", rp.getCreatedWeek());
+                    data.put("dueDate", rp.getDueDate());
+                    data.put("registerAddr", rp.getRegisterAddr());
+                    data.put("addr", rp.getAddr());
+                    data.put("cHTimes", rp.getcHTimes());
+                    data.put("dueWeek", rp.getDueWeek());
+                    data.put("cTime", rp.getcTime());
+                    data.put("currentCh", rp.getCurrentCh());
+                    data.put("checkDoctor", rp.getCheckDoctor());
+                    data.put("lName", rp.getlName());
+                    data.put("phone", patientsQueryRequest.getIsEncry() == 0 ? rp.getRealPhone() : com.lyms.platform.common.utils.StringUtils.encryPhone(rp.getRealPhone()));
+                    data.put("serviceType", rp.getServiceType());
+                    data.put("serviceStatus", rp.getServiceStatus());
+                    datas.add(data);
                 }else {
-                    //产妇
+                    //全部产妇
                     QuanChanResult rp = (QuanChanResult) obj;
                     data.put("name", rp.getName());
                     data.put("age", rp.getAge());
@@ -2249,8 +2276,8 @@ public class PatientFacade extends BaseServiceImpl {
                     datas.add(data);
                 }
             }
-            //孕妇
-            if(patientsQueryRequest.getQueryType()==0||patientsQueryRequest.getQueryType()==1){
+            //高危孕妇
+            if(patientsQueryRequest.getQueryType()==0){
                 cnames.put("name", "姓名");
                 cnames.put("age", "当前年龄");
                 if ("1000000115".equals(hospital)) {
@@ -2270,8 +2297,32 @@ public class PatientFacade extends BaseServiceImpl {
                 cnames.put("phone", "联系方式");
                 cnames.put("serviceType", "服务类型");
                 cnames.put("serviceStatus", "服务状态");
+            }else if(patientsQueryRequest.getQueryType()==1){
+                //全部孕妇
+                cnames.put("name", "姓名");
+                cnames.put("age", "当前年龄");
+                if ("1000000115".equals(hospital)) {
+                    cnames.put("cardNo", "身份证");
+                    cnames.put("vcCardNo", "就诊卡号");
+                }
+                cnames.put("cardNo", "身份证");
+                cnames.put("dueWeek", "当前孕周");
+                cnames.put("bTime", "建档日期");
+                cnames.put("cTimes", "产检次数");
+                cnames.put("createdWeek", "建档孕周");
+                cnames.put("dueDate", "预产期");
+                cnames.put("registerAddr", "户籍地址");
+                cnames.put("addr", "居住地址");
+                cnames.put("cHTimes", "本院产检次数");
+                cnames.put("cTime", "预约产检日期");
+                cnames.put("currentCh", "当前产检医院");
+                cnames.put("checkDoctor", "产检医生");
+                cnames.put("lName", "登记人");
+                cnames.put("phone", "联系方式");
+                cnames.put("serviceType", "服务类型");
+                cnames.put("serviceStatus", "服务状态");
             }else {
-                //产妇
+                //全部产妇
                 cnames.put("name", "姓名");
                 cnames.put("age", "分娩年龄");
                 cnames.put("dueWeek", "分娩日期");
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java
index d917c07..37fe019 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java
@@ -72,6 +72,7 @@ public class QuanPatientsResult implements IBasicResultConvert<QuanPatientsResul
     //建档号
     private String fileCode;
 
+    //建档孕周
     private String createdWeek;