diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index a22395b..2b08061 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -836,18 +836,20 @@ public class PatientFacade { List idsMd = new ArrayList<>(); List idsPW = new ArrayList<>(); if (CollectionUtils.isNotEmpty(patientses)) { + List pis = new ArrayList<>(); for (Patients patients : patientses) { - //儿童体重大于等于4000克 - if(com.lyms.platform.common.utils.StringUtils.isNotEmpty(patients.getId())){ - Query querymd = Query.query(Criteria.where("parentId").is(patients.getId()).and("yn").ne("0") - .and("baby").elemMatch(Criteria.where("babyWeight").gte("4000"))); - List deliverModels = mongoTemplate.find(querymd, MaternalDeliverModel.class); - if(CollectionUtils.isNotEmpty(deliverModels)){ - MaternalDeliverModel maternalDeliverModel = deliverModels.get(0); - idsMd.add(maternalDeliverModel.getParentId()); + pis.add(patients.getId()); + } + if(CollectionUtils.isNotEmpty(pis)){ + Query querymd = Query.query(Criteria.where("parentId").in(pis).and("yn").ne("0").and("baby").elemMatch(Criteria.where("babyWeight").gte("4000"))); + List deliverModels = mongoTemplate.find(querymd, MaternalDeliverModel.class); + if(CollectionUtils.isNotEmpty(deliverModels)){ + for (MaternalDeliverModel m: deliverModels ) { + idsMd.add(m.getParentId()); } } } + boolean bmiSta = true; //孕妇体重 if(StringUtils.isNotEmpty(riskPatientsQueryRequest.getBmiStart()) && StringUtils.isNotEmpty(riskPatientsQueryRequest.getBmiEnd()) && CollectionUtils.isNotEmpty(idsMd)){