diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
index fbec734..cbdcf84 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
@@ -301,12 +301,14 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
      * 1:孕妇,2:儿童
      */
     private Integer type = -1;
+    private List<Integer> typeList;
 
     private String hospitalId;
 
     private String hcertificateNum;
 
     private Integer buildType = -1;
+    private Integer buildTypeNot = -1;
 
     private List<Integer> buildTypeList;
 
@@ -435,6 +437,13 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
         this.buildType = buildType;
     }
 
+    public Integer getBuildTypeNot() {
+        return buildTypeNot;
+    }
+
+    public void setBuildTypeNot(Integer buildTypeNot) {
+        this.buildTypeNot = buildTypeNot;
+    }
 
     public Integer getBuildTypeEq() {
         return buildTypeEq;
@@ -540,6 +549,14 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
         this.type = type;
     }
 
+    public List<Integer> getTypeList() {
+        return typeList;
+    }
+
+    public void setTypeList(List<Integer> typeList) {
+        this.typeList = typeList;
+    }
+
     public String getCardNo() {
         return cardNo;
     }
@@ -727,6 +744,10 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
             condition = condition.and("buildType", buildTypeEq, MongoOper.IS);
         }
 
+        if(buildTypeNot!=null){
+            condition = condition.and("buildType", buildTypeNot, MongoOper.NE);
+        }
+
 
         if (bookbuildingDoctor != null) {
             condition = condition.and("bookbuildingDoctor", bookbuildingDoctor, MongoOper.IS);
@@ -868,6 +889,9 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
         if (type != null && -1 != type) {
             condition = condition.and("type", type, MongoOper.IS);
         }
+        if(typeList!=null&&typeList.size()>0){
+            condition = condition.and("type",typeList,MongoOper.IN);
+        }
         if(null!=postViewTimes){
             if(gtePostTimes){
                 condition = condition.and("postViewTimes", postViewTimes, MongoOper.GTE);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java
index f18fdc5..847e128 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java
@@ -70,12 +70,16 @@ public class PredictedStatisticsFacade {
         patientsQuery.setNeed(YnEnums.YES.name());
         patientsQuery.setYn(YnEnums.YES.getId());
         patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(predictedStatisticsRequest.getOperatorId()));
-        patientsQuery.setType(1);
+        List<Integer> typeList = new ArrayList<>();
+        typeList.add(1);
+        typeList.add(3);
+        patientsQuery.setTypeList(typeList);
         patientsQuery.setSort("dueDate");
         String doctorId = predictedStatisticsRequest.getDoctorId();
         if (!StringUtils.isEmpty(doctorId)) {
             patientsQuery.setLastCheckEmployeeId(doctorId);
         }
+        patientsQuery.setBuildTypeNot(1);
         // 查列表
         List<Patients> patientsList = patientsService.queryPatient(patientsQuery);
         List<PredictedStatisticsQueryModel> predictedStatisticsQueryModelList = new ArrayList<>();
@@ -109,19 +113,23 @@ public class PredictedStatisticsFacade {
         // List<PredictedStatisticsCountModel> predictedStatisticsCountModelList = patientsService.predictedStatistics();
         List<PredictedStatisticsCountModel> predictedStatisticsCountModelList = new ArrayList<>();
         Date date = new Date();
+        PatientsQuery patientsQuery = new PatientsQuery();
+        patientsQuery.setYn(YnEnums.YES.getId());
+        List<Integer> typeList = new ArrayList<>();
+        typeList.add(1);
+        typeList.add(3);
+        patientsQuery.setTypeList(typeList);
+        patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(predictedStatisticsRequest.getOperatorId()));
+        String doctorId = predictedStatisticsRequest.getDoctorId();
+        if (!StringUtils.isEmpty(doctorId)) {
+            patientsQuery.setLastCheckEmployeeId(doctorId);
+        }
+        patientsQuery.setBuildTypeNot(1);
         for (int i = 0; i < 10; i++) {
             Date temp = DateUtil.addMonth(date, i);
             System.out.println(temp);
             Date startDate = DateUtil.getMonthStart(temp);
             Date endDate = DateUtil.getMonthEndTime(temp);
-            PatientsQuery patientsQuery = new PatientsQuery();
-            String doctorId = predictedStatisticsRequest.getDoctorId();
-            patientsQuery.setYn(YnEnums.YES.getId());
-            patientsQuery.setType(1);
-            patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(predictedStatisticsRequest.getOperatorId()));
-            if (!StringUtils.isEmpty(doctorId)) {
-                patientsQuery.setLastCheckEmployeeId(doctorId);
-            }
             patientsQuery.setDueDateStart(startDate);
             patientsQuery.setDueDateEnd(endDate);
             int count = patientsService.queryPatientCount(patientsQuery);