diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 5c451ed..fe65b54 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -2615,7 +2615,6 @@ public class MatDeliverFacade { // 分娩方式去另外一张表查 patientsQuery.setDesc("fmDate"); patientsQuery.setSort("fmDate"); - patientsQuery.setBookbuildingDoctor(StringUtils.isNotEmpty(childbirthManagerRequest.getDeliverDoctor())?childbirthManagerRequest.getDeliverDoctor():null); List patientsList = patientsService.queryPatient(patientsQuery); // 这里就设置分页内容 @@ -2838,7 +2837,14 @@ public class MatDeliverFacade { // 这里就设置分页内容 childbirthManagerResult.setPageInfo(matDeliverQuery.getPageInfo()); }else {//否则按常规查询 - maternalDeliverModelList = matDeliverService.query(matDeliverQuery); + //隆化需求按接诊医生查询 + matDeliverQuery.setLimit(childbirthManagerRequest.getLimit()); + matDeliverQuery.setPage(childbirthManagerRequest.getPage()); + matDeliverQuery.setNeed("need"); + matDeliverQuery.setDeliverDoctor(StringUtils.isNotEmpty(childbirthManagerRequest.getDeliverDoctor())?childbirthManagerRequest.getDeliverDoctor():null); + maternalDeliverModelList = matDeliverService.pageQuery(matDeliverQuery); + // 这里就设置分页内容 + childbirthManagerResult.setPageInfo(matDeliverQuery.getPageInfo()); } }