diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index fb4df1a..2fa5919 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -1473,6 +1473,7 @@ public class MatDeliverFacade { } babyModelQuery.setHospitalId(autoMatchFacade.getHospitalId(newBabyManagerRequest.getOperatorId())); babyModelQuery.setBuildType(2); + babyModelQuery.setOrder("birth"); List babyModelList = babyService.queryBabyWithQuery(babyModelQuery); if (CollectionUtils.isEmpty(babyModelList)) { newBabyManagerResult.setPageInfo(babyModelQuery.getPageInfo()); @@ -1489,8 +1490,8 @@ public class MatDeliverFacade { matDeliverQuery.setParentIdList(parentIdList); List maternalDeliverModelList = matDeliverService.query(matDeliverQuery); List newBabyManagerQueryModelList = new ArrayList<>(); - for (MaternalDeliverModel maternalDeliverModel : maternalDeliverModelList) { - for (BabyModel babyModel : babyModelList) { + for (BabyModel babyModel : babyModelList) { + for (MaternalDeliverModel maternalDeliverModel : maternalDeliverModelList) { if (maternalDeliverModel.getParentId().equals(babyModel.getParentId())) { NewBabyManagerQueryModel newBabyManagerQueryModel = new NewBabyManagerQueryModel(); BeanUtils.copy(babyModel, newBabyManagerQueryModel);