Commit 1c4b22109cc2c75b2e0753ea65f7672f59bb8265
1 parent
42a9439409
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 3 additions and 5 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
1c4b221
| ... | ... | @@ -2645,8 +2645,6 @@ |
| 2645 | 2645 | } |
| 2646 | 2646 | |
| 2647 | 2647 | MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); |
| 2648 | - matDeliverQuery.setLimit(childbirthManagerRequest.getLimit()); | |
| 2649 | - matDeliverQuery.setPage(childbirthManagerRequest.getPage()); | |
| 2650 | 2648 | matDeliverQuery.setParentIdList(parentIdList); |
| 2651 | 2649 | matDeliverQuery.setYn(YnEnums.YES.getId()); |
| 2652 | 2650 | matDeliverQuery.setHloseBloodType(childbirthManagerRequest.getHloseBloodType()); |
| ... | ... | @@ -2756,7 +2754,7 @@ |
| 2756 | 2754 | } |
| 2757 | 2755 | } |
| 2758 | 2756 | //隆化需求按接诊医生查询 |
| 2759 | - if (StringUtils.isNotEmpty(childbirthManagerRequest.getDeliverDoctor())) { | |
| 2757 | + if (StringUtils.isNotEmpty(childbirthManagerRequest.getDeliverDoctor())&&"2100001605".equals(childbirthManagerRequest.getHospitalId())) { | |
| 2760 | 2758 | matDeliverQuery.setDeliverDoctor(childbirthManagerRequest.getDeliverDoctor()); |
| 2761 | 2759 | } |
| 2762 | 2760 | /**********增加完毕***********/ |
| ... | ... | @@ -2766,8 +2764,7 @@ |
| 2766 | 2764 | List <MaternalDeliverModel> maternalDeliverModelList; |
| 2767 | 2765 | if (!childbirthManagerRequest.isExcel() && (childbirthManagerRequest.getHloseBloodType() != null |
| 2768 | 2766 | || StringUtils.isNotEmpty(childbirthManagerRequest.getDeliveryMode()) || childbirthManagerRequest.getWeight() != null) |
| 2769 | - || StringUtils.isNotEmpty(childbirthManagerRequest.getGcStatus()) | |
| 2770 | - || StringUtils.isNotEmpty(childbirthManagerRequest.getDeliverDoctor())) {//根据出血量查询继续分页 | |
| 2767 | + || StringUtils.isNotEmpty(childbirthManagerRequest.getGcStatus())) {//根据出血量查询继续分页 | |
| 2771 | 2768 | matDeliverQuery.setLimit(childbirthManagerRequest.getLimit()); |
| 2772 | 2769 | matDeliverQuery.setPage(childbirthManagerRequest.getPage()); |
| 2773 | 2770 | matDeliverQuery.setNeed("need"); |
| ... | ... | @@ -2857,6 +2854,7 @@ |
| 2857 | 2854 | // 这里就设置分页内容 |
| 2858 | 2855 | childbirthManagerResult.setPageInfo(matDeliverQuery.getPageInfo()); |
| 2859 | 2856 | }else {//否则按常规查询 |
| 2857 | + matDeliverQuery.setLimit(childbirthManagerRequest.getLimit()); | |
| 2860 | 2858 | maternalDeliverModelList = matDeliverService.pageQuery(matDeliverQuery); |
| 2861 | 2859 | } |
| 2862 | 2860 | } |