diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
index 289bb84..cddf909 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
@@ -5862,6 +5862,9 @@ public class AntenatalExaminationFacade {
                     map.put("name", pat.getUsername());
                     map.put("cardNo", pat.getCardNo());
                     map.put("phone", pat.getPhone());
+
+                    map.put("fid", model.getFid() == null ? "" :  model.getFid());
+
                     map.put("autoTime", DateUtil.getyyyy_MM_dd(model.getCreated()));
                     map.put("week", DateUtil.getWeekDesc(pat.getLastMenses(), model.getCreated()));
                     map.put("riskLevel", commonService.findRiskLevel(model.gethLevel()));
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java
index 2ae20c2..739f8b0 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java
@@ -400,9 +400,12 @@ public class DischargeAbstractFacade extends BaseServiceImpl {
     }
 
     public BaseResponse list(Integer page, Integer limit, Integer userId, String leaveHospitalDate, Integer postpartumDays, Integer endPostpartumDays, String fmDate, String queryNo) {
-        List<String> hospital = groupsFacade.findGroupHospital(userId, false);
-        Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital);
-        Criteria pCriteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital);
+        //List<String> hospital = groupsFacade.findGroupHospital(userId, false);
+//        Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital);
+//        Criteria pCriteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital);
+        String hospitalId = autoMatchFacade.getHospitalId(userId);
+        Criteria criteria = Criteria.where("yn").is("1").and("hospitalId").is(hospitalId);
+        Criteria pCriteria = Criteria.where("yn").is("1");
         boolean flag = false;
         if (StringUtils.isNotEmpty(queryNo)) {
             pCriteria.orOperator(Criteria.where("cardNo").regex(queryNo),
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
index 9a96f29..a578be8 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
@@ -4988,15 +4988,15 @@ public class ViewFacade {
                 if (temp.getpId() == null) {
                     continue;
                 }
-                BabyModelQuery babyModelQuery = new BabyModelQuery();
-                babyModelQuery.setDataStatus(false);
-                //babyModelQuery.setYn(YnEnums.YES.getId());
-                babyModelQuery.setPid(temp.getpId());
-                babyModelQuery.setPregnancyOut(RenShenJieJuEnums.O.getId());
-                List <BabyModel> babyModels = babyService.queryBabyWithQuery(babyModelQuery);
-                if (CollectionUtils.isEmpty(babyModels)) {
-                    continue;
-                }
+//                BabyModelQuery babyModelQuery = new BabyModelQuery();
+//                babyModelQuery.setDataStatus(false);
+//                //babyModelQuery.setYn(YnEnums.YES.getId());
+//                babyModelQuery.setPid(temp.getpId());
+//                babyModelQuery.setPregnancyOut(RenShenJieJuEnums.O.getId());
+//                List <BabyModel> babyModels = babyService.queryBabyWithQuery(babyModelQuery);
+//                if (CollectionUtils.isEmpty(babyModels)) {
+//                    continue;
+//                }
 
                 Map <String, Object> babyMap = new HashMap <>();