Commit c5d160520695155d2f425defb7200622921dadf3
1 parent
19ed65dcc0
Exists in
master
and in
6 other branches
孕产妇管理-产妇分娩-分娩管理查询分页问题bug
Showing 1 changed file with 6 additions and 9 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
c5d1605
| ... | ... | @@ -2651,7 +2651,6 @@ |
| 2651 | 2651 | String deliveryModeQueryJson = "fmfs\\\":\\\"" + childbirthManagerRequest.getDeliveryMode(); |
| 2652 | 2652 | matDeliverQuery.setDeliveryModeQueryJson(StringUtils.isEmpty(childbirthManagerRequest.getDeliveryMode()) ? null : deliveryModeQueryJson); |
| 2653 | 2653 | // matDeliverQuery.setWeight(childbirthManagerRequest.getWeight()); |
| 2654 | - | |
| 2655 | 2654 | if (childbirthManagerRequest.getWeight() != null) { |
| 2656 | 2655 | BabyModelQuery babyModelQuery = new BabyModelQuery(); |
| 2657 | 2656 | // babyModelQuery.setDataStatus(false); |
| ... | ... | @@ -2754,6 +2753,10 @@ |
| 2754 | 2753 | } |
| 2755 | 2754 | } |
| 2756 | 2755 | } |
| 2756 | + //隆化需求按接诊医生查询 | |
| 2757 | + if (StringUtils.isNotEmpty(childbirthManagerRequest.getDeliverDoctor())) { | |
| 2758 | + matDeliverQuery.setDeliverDoctor(childbirthManagerRequest.getDeliverDoctor()); | |
| 2759 | + } | |
| 2757 | 2760 | /**********增加完毕***********/ |
| 2758 | 2761 | |
| 2759 | 2762 | |
| ... | ... | @@ -2761,7 +2764,8 @@ |
| 2761 | 2764 | List <MaternalDeliverModel> maternalDeliverModelList; |
| 2762 | 2765 | if (!childbirthManagerRequest.isExcel() && (childbirthManagerRequest.getHloseBloodType() != null |
| 2763 | 2766 | || StringUtils.isNotEmpty(childbirthManagerRequest.getDeliveryMode()) || childbirthManagerRequest.getWeight() != null) |
| 2764 | - || StringUtils.isNotEmpty(childbirthManagerRequest.getGcStatus())) {//根据出血量查询继续分页 | |
| 2767 | + || StringUtils.isNotEmpty(childbirthManagerRequest.getGcStatus()) | |
| 2768 | + || StringUtils.isNotEmpty(childbirthManagerRequest.getDeliverDoctor())) {//根据出血量查询继续分页 | |
| 2765 | 2769 | matDeliverQuery.setLimit(childbirthManagerRequest.getLimit()); |
| 2766 | 2770 | matDeliverQuery.setPage(childbirthManagerRequest.getPage()); |
| 2767 | 2771 | matDeliverQuery.setNeed("need"); |
| 2768 | 2772 | |
| ... | ... | @@ -2851,14 +2855,7 @@ |
| 2851 | 2855 | // 这里就设置分页内容 |
| 2852 | 2856 | childbirthManagerResult.setPageInfo(matDeliverQuery.getPageInfo()); |
| 2853 | 2857 | }else {//否则按常规查询 |
| 2854 | - //隆化需求按接诊医生查询 | |
| 2855 | - matDeliverQuery.setLimit(null!=childbirthManagerRequest.getLimit()?childbirthManagerRequest.getLimit():20); | |
| 2856 | - matDeliverQuery.setPage(null!=childbirthManagerRequest.getPage()?childbirthManagerRequest.getPage():1); | |
| 2857 | - matDeliverQuery.setNeed("need"); | |
| 2858 | - matDeliverQuery.setDeliverDoctor(StringUtils.isNotEmpty(childbirthManagerRequest.getDeliverDoctor())?childbirthManagerRequest.getDeliverDoctor():null); | |
| 2859 | 2858 | maternalDeliverModelList = matDeliverService.pageQuery(matDeliverQuery); |
| 2860 | - // 这里就设置分页内容 | |
| 2861 | - childbirthManagerResult.setPageInfo(matDeliverQuery.getPageInfo()); | |
| 2862 | 2859 | } |
| 2863 | 2860 | } |
| 2864 | 2861 |