From 1c4b22109cc2c75b2e0753ea65f7672f59bb8265 Mon Sep 17 00:00:00 2001
From: shiyang <316555390@qq.com>
Date: Fri, 26 Nov 2021 15:01:59 +0800
Subject: [PATCH] update

---
 .../com/lyms/platform/operate/web/facade/MatDeliverFacade.java    | 8 +++-----
 1 file changed, 3 insertions(+), 5 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 a047a04..a2254d2 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
@@ -2645,8 +2645,6 @@ public class MatDeliverFacade {
         }
 
         MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
-        matDeliverQuery.setLimit(childbirthManagerRequest.getLimit());
-        matDeliverQuery.setPage(childbirthManagerRequest.getPage());
         matDeliverQuery.setParentIdList(parentIdList);
         matDeliverQuery.setYn(YnEnums.YES.getId());
         matDeliverQuery.setHloseBloodType(childbirthManagerRequest.getHloseBloodType());
@@ -2756,7 +2754,7 @@ public class MatDeliverFacade {
             }
         }
         //隆化需求按接诊医生查询
-        if (StringUtils.isNotEmpty(childbirthManagerRequest.getDeliverDoctor())) {
+        if (StringUtils.isNotEmpty(childbirthManagerRequest.getDeliverDoctor())&&"2100001605".equals(childbirthManagerRequest.getHospitalId())) {
             matDeliverQuery.setDeliverDoctor(childbirthManagerRequest.getDeliverDoctor());
         }
         /**********增加完毕***********/
@@ -2766,8 +2764,7 @@ public class MatDeliverFacade {
         List <MaternalDeliverModel> maternalDeliverModelList;
         if (!childbirthManagerRequest.isExcel() && (childbirthManagerRequest.getHloseBloodType() != null
                 || StringUtils.isNotEmpty(childbirthManagerRequest.getDeliveryMode()) || childbirthManagerRequest.getWeight() != null)
-                || StringUtils.isNotEmpty(childbirthManagerRequest.getGcStatus())
-                || StringUtils.isNotEmpty(childbirthManagerRequest.getDeliverDoctor())) {//根据出血量查询继续分页
+                || StringUtils.isNotEmpty(childbirthManagerRequest.getGcStatus())) {//根据出血量查询继续分页
             matDeliverQuery.setLimit(childbirthManagerRequest.getLimit());
             matDeliverQuery.setPage(childbirthManagerRequest.getPage());
             matDeliverQuery.setNeed("need");
@@ -2857,6 +2854,7 @@ public class MatDeliverFacade {
                 // 这里就设置分页内容
                 childbirthManagerResult.setPageInfo(matDeliverQuery.getPageInfo());
             }else {//否则按常规查询
+                matDeliverQuery.setLimit(childbirthManagerRequest.getLimit());
                 maternalDeliverModelList = matDeliverService.pageQuery(matDeliverQuery);
             }
         }
-- 
1.8.3.1