Commit f2c945d2fcfa6655c111ed1f1b43b4a19b814fc8
1 parent
a8735c3e23
Exists in
master
and in
6 other branches
孕期-在分娩管理中,加一个依据接生医生的搜索框bug
Showing 1 changed file with 8 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
f2c945d
... | ... | @@ -2615,7 +2615,6 @@ |
2615 | 2615 | // 分娩方式去另外一张表查 |
2616 | 2616 | patientsQuery.setDesc("fmDate"); |
2617 | 2617 | patientsQuery.setSort("fmDate"); |
2618 | - patientsQuery.setBookbuildingDoctor(StringUtils.isNotEmpty(childbirthManagerRequest.getDeliverDoctor())?childbirthManagerRequest.getDeliverDoctor():null); | |
2619 | 2618 | List <Patients> patientsList = patientsService.queryPatient(patientsQuery); |
2620 | 2619 | |
2621 | 2620 | // 这里就设置分页内容 |
... | ... | @@ -2838,7 +2837,14 @@ |
2838 | 2837 | // 这里就设置分页内容 |
2839 | 2838 | childbirthManagerResult.setPageInfo(matDeliverQuery.getPageInfo()); |
2840 | 2839 | }else {//否则按常规查询 |
2841 | - maternalDeliverModelList = matDeliverService.query(matDeliverQuery); | |
2840 | + //隆化需求按接诊医生查询 | |
2841 | + matDeliverQuery.setLimit(childbirthManagerRequest.getLimit()); | |
2842 | + matDeliverQuery.setPage(childbirthManagerRequest.getPage()); | |
2843 | + matDeliverQuery.setNeed("need"); | |
2844 | + matDeliverQuery.setDeliverDoctor(StringUtils.isNotEmpty(childbirthManagerRequest.getDeliverDoctor())?childbirthManagerRequest.getDeliverDoctor():null); | |
2845 | + maternalDeliverModelList = matDeliverService.pageQuery(matDeliverQuery); | |
2846 | + // 这里就设置分页内容 | |
2847 | + childbirthManagerResult.setPageInfo(matDeliverQuery.getPageInfo()); | |
2842 | 2848 | } |
2843 | 2849 | } |
2844 | 2850 |