diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 98e08c6..0c8a26b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -102,12 +102,18 @@ public class BabyBookbuildingFacade { babyQuery.setPid(builds.get(0).getPid()); } - + String[] buildIds = null; List> list = new ArrayList<>(); //查询建档记录 List models = babyBookbuildingService.queryBabyBuildByCond(babyQuery); if(CollectionUtils.isNotEmpty(models)){ - for(BabyModel babyModel:models){ + int len = models.size(); + buildIds = new String[len]; + + for(int i = 0 ;i < len ;i++){ + + BabyModel babyModel =models.get(i); + buildIds[i] = babyModel.getId(); Map checkRecord = new HashMap<>(); checkRecord.put("id", babyModel.getId()); checkRecord.put("pid",babyModel.getPid()); @@ -128,20 +134,30 @@ public class BabyBookbuildingFacade { list.add(checkRecord); } + PersonModelQuery personModelQuery = new PersonModelQuery(); + personModelQuery.setYn(YnEnums.YES.getId()); + personModelQuery.setId(builds.get(0).getPid()); Collections.reverse(list); - } - //查询儿童的基本信息 - BabyModel model = babyCheckFacade.getBabyModel(babyId, base); - + List personModels = personService.queryPersons(personModelQuery); - List> tempList = new ArrayList<>(); - if(CollectionUtils.isNotEmpty(models)){ - for(BabyModel babyModel:models){ - babyCheckFacade.getBabyCheckList(babyModel.getId(), babyModel, tempList); - } + List> tempList = new ArrayList<>(); + babyCheckFacade.getBabyCheckList(buildIds, personModels.get(0), tempList); + list.addAll(tempList); } +// //查询儿童的基本信息 +// BabyModel model = babyCheckFacade.getBabyModel(babyId, base); +// +// +// List> tempList = new ArrayList<>(); +// if(CollectionUtils.isNotEmpty(models)){ +// for(BabyModel babyModel:models){ +// babyCheckFacade.getBabyCheckList(babyModel.getId(), babyModel, tempList); +// } +// } +// +// list.addAll(tempList); + - list.addAll(tempList); resMap.put("baseInfo", base); resMap.put("checkList", list);