diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
index 1b48018..4c02eef 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
@@ -122,6 +122,8 @@ public class AntExRecordFacade {
 
         AntExRecordQuery antExRecordQuery = new AntExRecordQuery();
 
+        antExRecordQuery.setStatus(antExManagerQueryRequest.getDeuStatus());
+
         antExRecordQuery.setZyzlState(antExManagerQueryRequest.getZyzlState());
         antExRecordQuery.setZywzzlState(antExManagerQueryRequest.getZywzzlState());
         antExRecordQuery.setZyatzlState(antExManagerQueryRequest.getZyatzlState());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java
index 2a8dc42..c5a91ff 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java
@@ -102,6 +102,9 @@ public class AreaCountFacade {
 
     public static ExpiryMap<String, BaseResponse> cacheGetServiceList = new ExpiryMap<>(1000 * 60 * 3);
 
+    @Autowired
+    private AutoMatchFacade autoMatchFacade;
+
     /**
      * 获取当前用户拥有的医院权限列表并和查询条件取交集
      *
@@ -303,6 +306,8 @@ public class AreaCountFacade {
         Date startTime = null;
         Date endTime = null;
 
+        String currentHospitalId = autoMatchFacade.getHospitalId(userId);
+
         Date checkStartTime = null;
         Date checkEndTime = null;
         if (StringUtils.isNotEmpty(time)) {
@@ -328,6 +333,14 @@ public class AreaCountFacade {
         List<Integer> num36 = new ArrayList<>();
         List<Integer> num40 = new ArrayList<>();
 
+
+
+        //衡水区域并且不是衡水市第六人民医院
+        if(!"2100002324".equals(currentHospitalId))
+        {
+            hospitalIds.remove("2100002324");//衡水市第六人民医院
+        }
+
         List<Map<String, Object>> checkPointtList = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(hospitalIds)) {
             int batchSize = 2;
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 8a57662..5a1cbf4 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
@@ -495,6 +495,7 @@ public class PatientFacade {
                 if(!"2100002324".equals(hospital))
                 {
                     hospitalList.remove("2100002324");//衡水六院登陆
+                    hospitalList.add("5100002324");//查询一个空的
                 }
 
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java
index 8149a16..e15b06b 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java
@@ -112,6 +112,16 @@ public class AntExManagerQueryRequest extends BasePageQueryRequest {
     private boolean isCurrent;
 
     private String nextTime;
+    //状态  1 已分娩  2未分娩
+    private Integer deuStatus;
+
+    public Integer getDeuStatus() {
+        return deuStatus;
+    }
+
+    public void setDeuStatus(Integer deuStatus) {
+        this.deuStatus = deuStatus;
+    }
 
     public String getNextTime() {
         return nextTime;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java
index 2ce0abb..45aa770 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java
@@ -595,6 +595,7 @@ public class ChildbirthManagerRequest extends BasePageQueryRequest {
         areaQueryMap.put("tireNumber", "胎数");
         areaQueryMap.put("livingNumber", "活产数");
         areaQueryMap.put("address", "居住地");
+        areaQueryMap.put("registerAddress", "户籍地址");
         areaQueryMap.put("fmHospital", "分娩机构");
         areaQueryMap.put("gcStatus", "产后观察");
         areaQueryMap.put("recordsNum", "记录条数");
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
index 0a08bab..aa09cf9 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
@@ -341,7 +341,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
             List<Map<String, Object>> infos = new ArrayList<>();
             for (Patients patient : patients) {
                 for (Map<String, Object> map : hospitals) {
-                    if (patient.getHospitalId().equals(map.get("id").toString())) {
+                    if (patient.getHospitalId().equals(map.get("id").toString()) && !"2100002324".equals(patient.getHospitalId())) {
                         boolean flag = true;
                         for (Map<String, Object> info : infos) {
                             if (map.get((StringUtils.isNotEmpty(cityId) ? "areaId" : "cityId")).equals(info.get("id"))) {