Commit f8c47b3e17e78200e12fd12f055784b7dceabc1f
1 parent
cc32d04fbe
Exists in
master
and in
7 other branches
添加排序
Showing 1 changed file with 3 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
f8c47b3
| ... | ... | @@ -1473,6 +1473,7 @@ |
| 1473 | 1473 | } |
| 1474 | 1474 | babyModelQuery.setHospitalId(autoMatchFacade.getHospitalId(newBabyManagerRequest.getOperatorId())); |
| 1475 | 1475 | babyModelQuery.setBuildType(2); |
| 1476 | + babyModelQuery.setOrder("birth"); | |
| 1476 | 1477 | List<BabyModel> babyModelList = babyService.queryBabyWithQuery(babyModelQuery); |
| 1477 | 1478 | if (CollectionUtils.isEmpty(babyModelList)) { |
| 1478 | 1479 | newBabyManagerResult.setPageInfo(babyModelQuery.getPageInfo()); |
| ... | ... | @@ -1489,8 +1490,8 @@ |
| 1489 | 1490 | matDeliverQuery.setParentIdList(parentIdList); |
| 1490 | 1491 | List<MaternalDeliverModel> maternalDeliverModelList = matDeliverService.query(matDeliverQuery); |
| 1491 | 1492 | List<NewBabyManagerQueryModel> newBabyManagerQueryModelList = new ArrayList<>(); |
| 1492 | - for (MaternalDeliverModel maternalDeliverModel : maternalDeliverModelList) { | |
| 1493 | - for (BabyModel babyModel : babyModelList) { | |
| 1493 | + for (BabyModel babyModel : babyModelList) { | |
| 1494 | + for (MaternalDeliverModel maternalDeliverModel : maternalDeliverModelList) { | |
| 1494 | 1495 | if (maternalDeliverModel.getParentId().equals(babyModel.getParentId())) { |
| 1495 | 1496 | NewBabyManagerQueryModel newBabyManagerQueryModel = new NewBabyManagerQueryModel(); |
| 1496 | 1497 | BeanUtils.copy(babyModel, newBabyManagerQueryModel); |