Commit c98463f3f07222333e40e325e12e8dd7e8f70efc
1 parent
378b5d64bf
Exists in
master
区域
Showing 2 changed files with 8 additions and 5 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
View file @
c98463f
| ... | ... | @@ -156,11 +156,13 @@ |
| 156 | 156 | |
| 157 | 157 | // 根据查询规则构造返回bean |
| 158 | 158 | List<Object> objectList = new ArrayList<>(); |
| 159 | - for (Object temp : childbirthManagerResult.getData()) { | |
| 160 | - for (String key : query.keySet()) { | |
| 161 | - query.put(key, BeanUtils.objectToStringMap(temp).get(key)); | |
| 159 | + if (childbirthManagerResult.getData() != null) { | |
| 160 | + for (Object temp : childbirthManagerResult.getData()) { | |
| 161 | + for (String key : query.keySet()) { | |
| 162 | + query.put(key, BeanUtils.objectToStringMap(temp).get(key)); | |
| 163 | + } | |
| 164 | + objectList.add(BeanUtils.createStringBean(query)); | |
| 162 | 165 | } |
| 163 | - objectList.add(BeanUtils.createStringBean(query)); | |
| 164 | 166 | } |
| 165 | 167 | |
| 166 | 168 | baseListResponse = new BaseListResponse().setErrorcode(childbirthManagerResult.getErrorcode()).setErrormsg(childbirthManagerResult.getErrormsg()).setData(objectList).setPageInfo(childbirthManagerResult.getPageInfo()); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
c98463f
| ... | ... | @@ -1026,6 +1026,8 @@ |
| 1026 | 1026 | patientsQuery.setFmWeekEnd(StringUtils.isEmpty(childbirthManagerRequest.getEndDueWeek()) ? null : Integer.valueOf(childbirthManagerRequest.getEndDueWeek()) * 7); |
| 1027 | 1027 | // 分娩方式去另外一张表查 |
| 1028 | 1028 | List<Patients> patientsList = patientsService.queryPatient(patientsQuery); |
| 1029 | + // 这里就设置分页内容 | |
| 1030 | + childbirthManagerResult.setPageInfo(patientsQuery.getPageInfo()); | |
| 1029 | 1031 | List<String> parentIdList = new ArrayList<>(); |
| 1030 | 1032 | if (CollectionUtils.isEmpty(patientsList)) { |
| 1031 | 1033 | // 没有查到，直接抛出 |
| ... | ... | @@ -1412,7 +1414,6 @@ |
| 1412 | 1414 | |
| 1413 | 1415 | |
| 1414 | 1416 | childbirthManagerResult.setData(childbirthManagerQueryModelList); |
| 1415 | - childbirthManagerResult.setPageInfo(patientsQuery.getPageInfo()); | |
| 1416 | 1417 | childbirthManagerResult.setErrorcode(ErrorCodeConstants.SUCCESS); |
| 1417 | 1418 | childbirthManagerResult.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION); |
| 1418 | 1419 | return childbirthManagerResult; |