From f2c945d2fcfa6655c111ed1f1b43b4a19b814fc8 Mon Sep 17 00:00:00 2001 From: shiyang <316555390@qq.com> Date: Fri, 5 Nov 2021 16:06:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=95=E6=9C=9F-=E5=9C=A8=E5=88=86=E5=A8=A9?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=B8=AD=EF=BC=8C=E5=8A=A0=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E4=BE=9D=E6=8D=AE=E6=8E=A5=E7=94=9F=E5=8C=BB=E7=94=9F=E7=9A=84?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=A1=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/operate/web/facade/MatDeliverFacade.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) 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()); } } -- 1.8.3.1