From c5d160520695155d2f425defb7200622921dadf3 Mon Sep 17 00:00:00 2001 From: shiyang <316555390@qq.com> Date: Fri, 26 Nov 2021 11:13:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=95=E4=BA=A7=E5=A6=87=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E4=BA=A7=E5=A6=87=E5=88=86=E5=A8=A9-=E5=88=86=E5=A8=A9?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=9F=A5=E8=AF=A2=E5=88=86=E9=A1=B5=E9=97=AE?= =?UTF-8?q?=E9=A2=98bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/MatDeliverFacade.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 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 7c0b5a4..6e56dd4 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 @@ -2651,7 +2651,6 @@ public class MatDeliverFacade { String deliveryModeQueryJson = "fmfs\\\":\\\"" + childbirthManagerRequest.getDeliveryMode(); matDeliverQuery.setDeliveryModeQueryJson(StringUtils.isEmpty(childbirthManagerRequest.getDeliveryMode()) ? null : deliveryModeQueryJson); // matDeliverQuery.setWeight(childbirthManagerRequest.getWeight()); - if (childbirthManagerRequest.getWeight() != null) { BabyModelQuery babyModelQuery = new BabyModelQuery(); // babyModelQuery.setDataStatus(false); @@ -2754,6 +2753,10 @@ public class MatDeliverFacade { } } } + //隆化需求按接诊医生查询 + if (StringUtils.isNotEmpty(childbirthManagerRequest.getDeliverDoctor())) { + matDeliverQuery.setDeliverDoctor(childbirthManagerRequest.getDeliverDoctor()); + } /**********增加完毕***********/ @@ -2761,7 +2764,8 @@ public class MatDeliverFacade { List maternalDeliverModelList; if (!childbirthManagerRequest.isExcel() && (childbirthManagerRequest.getHloseBloodType() != null || StringUtils.isNotEmpty(childbirthManagerRequest.getDeliveryMode()) || childbirthManagerRequest.getWeight() != null) - || StringUtils.isNotEmpty(childbirthManagerRequest.getGcStatus())) {//根据出血量查询继续分页 + || StringUtils.isNotEmpty(childbirthManagerRequest.getGcStatus()) + || StringUtils.isNotEmpty(childbirthManagerRequest.getDeliverDoctor())) {//根据出血量查询继续分页 matDeliverQuery.setLimit(childbirthManagerRequest.getLimit()); matDeliverQuery.setPage(childbirthManagerRequest.getPage()); matDeliverQuery.setNeed("need"); @@ -2851,14 +2855,7 @@ public class MatDeliverFacade { // 这里就设置分页内容 childbirthManagerResult.setPageInfo(matDeliverQuery.getPageInfo()); }else {//否则按常规查询 - //隆化需求按接诊医生查询 - matDeliverQuery.setLimit(null!=childbirthManagerRequest.getLimit()?childbirthManagerRequest.getLimit():20); - matDeliverQuery.setPage(null!=childbirthManagerRequest.getPage()?childbirthManagerRequest.getPage():1); - matDeliverQuery.setNeed("need"); - matDeliverQuery.setDeliverDoctor(StringUtils.isNotEmpty(childbirthManagerRequest.getDeliverDoctor())?childbirthManagerRequest.getDeliverDoctor():null); maternalDeliverModelList = matDeliverService.pageQuery(matDeliverQuery); - // 这里就设置分页内容 - childbirthManagerResult.setPageInfo(matDeliverQuery.getPageInfo()); } } -- 1.8.3.1