diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java
index 616a6c3..e39e6c7 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java
@@ -347,7 +347,8 @@ public class PuerperaManageController extends BaseController {
         BaseListResponse baseListResponse;
         try {
             patientManagerRequest.setOperatorId(((LoginContext) httpServletRequest.getAttribute("loginContext")).getId());
-            PatientManagerResult patientManagerResult = patientFacade.patientManager(patientManagerRequest);
+//            PatientManagerResult patientManagerResult = patientFacade.patientManager(patientManagerRequest);
+            PatientManagerResult patientManagerResult = patientFacade.patientManager2(patientManagerRequest);
             if (patientManagerResult.getErrorcode() != ErrorCodeConstants.SUCCESS) {
                 baseListResponse = new BaseListResponse().setErrorcode(patientManagerResult.getErrorcode()).setErrormsg(patientManagerResult.getErrormsg());
                 return baseListResponse;
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 1a1a934..b027d75 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
@@ -1106,6 +1106,116 @@ public class PatientFacade {
         return patientManagerResult;
     }
 
+    public PatientManagerResult patientManager2(PatientManagerRequest patientManagerRequest) {
+        PatientManagerResult patientManagerResult = new PatientManagerResult();
+
+        PatientsQuery patientsQuery = new PatientsQuery();
+
+        if (patientManagerRequest.getBuildWeekStart() != null) {
+            patientsQuery.setBuildDaysStart(patientManagerRequest.getBuildWeekStart() * 7);
+        }
+
+        if (patientManagerRequest.getBuildWeekEnd() != null) {
+            patientsQuery.setBuildDaysEnd((patientManagerRequest.getBuildWeekEnd() + 1) * 7 - 1);
+        }
+
+        patientsQuery.setYn(YnEnums.YES.getId());
+        if (!patientManagerRequest.isExcel()) {
+            patientsQuery.setNeed("need");
+            patientsQuery.setLimit(patientManagerRequest.getLimit());
+            patientsQuery.setPage(patientManagerRequest.getPage());
+        }
+        //排查本院隐藏建档
+        patientsQuery.setExtEnable(false);
+        patientsQuery.setBuildTypeNot(1);
+        patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(patientManagerRequest.getOperatorId()));
+        patientsQuery.setProvinceId(StringUtils.isEmpty(patientManagerRequest.getProvinceRegisterId()) ? null : patientManagerRequest.getProvinceRegisterId());
+        patientsQuery.setCityId(StringUtils.isEmpty(patientManagerRequest.getCityRegisterId()) ? null : patientManagerRequest.getCityRegisterId());
+        patientsQuery.setAreaId(StringUtils.isEmpty(patientManagerRequest.getAreaRegisterId()) ? null : patientManagerRequest.getAreaRegisterId());
+        patientsQuery.setStreetId(StringUtils.isEmpty(patientManagerRequest.getStreetRegisterId()) ? null : patientManagerRequest.getStreetRegisterId());
+        patientsQuery.setStreetRegisterId(StringUtils.isEmpty(patientManagerRequest.getStreetId()) ? null : patientManagerRequest.getStreetId());
+        // UsersQuery usersQuery = new UsersQuery();
+        // usersQuery.setName(patientManagerRequest.getBookbuildingDoctor());
+        // usersQuery.setYn(YnEnums.YES.getId());
+        // List<Users> usersList = usersService.queryUsers(usersQuery);
+        // if (CollectionUtils.isNotEmpty(usersList)) {
+        //     List<String> bookbuildingDoctorList = new ArrayList<>();
+        //     for (Users users : usersList) {
+        //         bookbuildingDoctorList.add(users.getId().toString());
+        //     }
+        //     patientsQuery.setBookbuildingDoctorList(bookbuildingDoctorList);
+        // }
+        patientsQuery.setBookbuildingDoctor(StringUtils.isEmpty(patientManagerRequest.getBookbuildingDoctor()) ? null : patientManagerRequest.getBookbuildingDoctor());
+        patientsQuery.setProvinceRegisterId(StringUtils.isEmpty(patientManagerRequest.getProvinceId()) ? null : patientManagerRequest.getProvinceId());
+        patientsQuery.setCityRegisterId(StringUtils.isEmpty(patientManagerRequest.getCityId()) ? null : patientManagerRequest.getCityId());
+        patientsQuery.setAreaRegisterId(StringUtils.isEmpty(patientManagerRequest.getAreaId()) ? null : patientManagerRequest.getAreaId());
+        if (StringUtils.isNotEmpty(patientManagerRequest.getBookBuildingDate())) {
+            try {
+                patientsQuery.setBookbuildingDateStart(DateUtil.getSNDate(patientManagerRequest.getBookBuildingDate())[0]);
+                patientsQuery.setBookbuildingDateEnd(DateUtil.getSNDate(patientManagerRequest.getBookBuildingDate())[1]);
+            } catch (Exception e) {
+                // 什么都不做，这里是数据传入错误了
+            }
+        }
+        patientsQuery.setQueryNo(StringUtils.isEmpty(patientManagerRequest.getQueryNo()) ? null : patientManagerRequest.getQueryNo());
+
+        List<Patients> patientsList = patientsService.queryPatient(patientsQuery);
+        List<PatientManagerQueryModel> patientManagerQueryModelList = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(patientsList)) {
+            for (Patients patients : patientsList) {
+                PatientManagerQueryModel patientManagerQueryModel = new PatientManagerQueryModel();
+                BeanUtils.copy(patients, patientManagerQueryModel);
+                patientManagerQueryModel.setAge(DateUtil.getAge(patients.getBirth()));
+                patientManagerQueryModel.setpId(patients.getPid());
+                String dueWeek = "";
+                try {
+//                     && patients.getBuildType() == 2
+                    if (patients.getBookbuildingDate().getTime() - patients.getDueDate().getTime() > 0) {
+                        dueWeek = "已分娩";
+                    } else {
+                        int days = DateUtil.daysBetween(patients.getLastMenses(), patients.getBookbuildingDate());
+                        if (days > 7 * 42 - 1) {
+                            dueWeek = "已分娩";
+                        } else {
+                            String week = (days / 7) + "";
+                            int day = (days % 7);
+                            dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : "");
+                        }
+                    }
+                } catch (Exception e) {
+                    // 什么都不干
+                }
+                patientManagerQueryModel.setPhone(DefenceUtils.getPhone(patients.getPhone()));
+                patientManagerQueryModel.setCardNo(DefenceUtils.getCardNo(patients.getCardNo()));
+                patientManagerQueryModel.setBuildWeek(dueWeek);
+
+                String bookbuildingDoctor = "";
+                if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(patients.getBookbuildingDoctor())) {
+                    Users user = usersService.getUsers(Integer.valueOf(patients.getBookbuildingDoctor()));
+                    if (user != null) {
+                        bookbuildingDoctor = user.getName();
+                    } else {
+                        System.out.println(patients.getId() + ";no user bookbuildingDoctor" + patients.getBookbuildingDoctor());
+                    }
+                }
+
+
+                patientManagerQueryModel.setBookbuildingDoctor(bookbuildingDoctor);
+                patientManagerQueryModel.setBookbuildingDate(DateUtil.getyyyy_MM_dd(patients.getBookbuildingDate()));
+                patientManagerQueryModel.setAddressRegister(CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(), patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService));
+                patientManagerQueryModel.setAddress(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService));
+                patientManagerQueryModel.setId(patients.getId());
+                patientManagerQueryModelList.add(patientManagerQueryModel);
+            }
+        }
+
+        patientManagerResult.setPageInfo(patientsQuery.getPageInfo());
+        patientManagerResult.setData(patientManagerQueryModelList);
+        patientManagerResult.setErrorcode(ErrorCodeConstants.SUCCESS);
+        patientManagerResult.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION);
+        return patientManagerResult;
+    }
+
     public BaseResponse findPatient2(PatientQueryRequest patientQueryRequest, Integer userId) {
         PatientsQuery patientsQuery = new PatientsQuery();
         patientsQuery.setPid(patientQueryRequest.getPid());