Commit 7f9a79531b2c76d7e4d0e6f751ebacf6924f85d8

Authored by wtt
1 parent 2420892a9c

update

Showing 1 changed file with 10 additions and 8 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ 7f9a795
... ... @@ -836,18 +836,20 @@
836 836 List<String> idsMd = new ArrayList<>();
837 837 List<String> idsPW = new ArrayList<>();
838 838 if (CollectionUtils.isNotEmpty(patientses)) {
  839 + List<String> pis = new ArrayList<>();
839 840 for (Patients patients : patientses) {
840   - //儿童体重大于等于4000克
841   - if(com.lyms.platform.common.utils.StringUtils.isNotEmpty(patients.getId())){
842   - Query querymd = Query.query(Criteria.where("parentId").is(patients.getId()).and("yn").ne("0")
843   - .and("baby").elemMatch(Criteria.where("babyWeight").gte("4000")));
844   - List<MaternalDeliverModel> deliverModels = mongoTemplate.find(querymd, MaternalDeliverModel.class);
845   - if(CollectionUtils.isNotEmpty(deliverModels)){
846   - MaternalDeliverModel maternalDeliverModel = deliverModels.get(0);
847   - idsMd.add(maternalDeliverModel.getParentId());
  841 + pis.add(patients.getId());
  842 + }
  843 + if(CollectionUtils.isNotEmpty(pis)){
  844 + Query querymd = Query.query(Criteria.where("parentId").in(pis).and("yn").ne("0").and("baby").elemMatch(Criteria.where("babyWeight").gte("4000")));
  845 + List<MaternalDeliverModel> deliverModels = mongoTemplate.find(querymd, MaternalDeliverModel.class);
  846 + if(CollectionUtils.isNotEmpty(deliverModels)){
  847 + for (MaternalDeliverModel m: deliverModels ) {
  848 + idsMd.add(m.getParentId());
848 849 }
849 850 }
850 851 }
  852 +
851 853 boolean bmiSta = true;
852 854 //孕妇体重
853 855 if(StringUtils.isNotEmpty(riskPatientsQueryRequest.getBmiStart()) && StringUtils.isNotEmpty(riskPatientsQueryRequest.getBmiEnd()) && CollectionUtils.isNotEmpty(idsMd)){