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 a1713b9..068b163 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 @@ -841,13 +841,8 @@ public class PatientFacade { //孕妇体重 if(StringUtils.isNotEmpty(riskPatientsQueryRequest.getBmiStart()) && StringUtils.isNotEmpty(riskPatientsQueryRequest.getBmiEnd()) && CollectionUtils.isNotEmpty(idsMd)){ for (String id : idsMd) { - Query query = new Query(); - if(StringUtils.isNotEmpty(riskPatientsQueryRequest.getBmiStart()) && StringUtils.isNotEmpty(riskPatientsQueryRequest.getBmiEnd())){ - query = Query.query(Criteria.where("patientId").is(id) - .and("yn").ne("0").and("bmi").gte(riskPatientsQueryRequest.getBmiStart()).lte(riskPatientsQueryRequest.getBmiEnd())); - }else if(StringUtils.isEmpty(riskPatientsQueryRequest.getBmiStart()) && StringUtils.isEmpty(riskPatientsQueryRequest.getBmiEnd())){ - query = Query.query(Criteria.where("patientId").is(id) .and("yn").ne("0")); - } + Query query = Query.query(Criteria.where("patientId").is(id) + .and("yn").ne("0").and("bmi").gte(riskPatientsQueryRequest.getBmiStart()).lte(riskPatientsQueryRequest.getBmiEnd())); List patientWeightList = mongoTemplate.find(query, PatientWeight.class); if(CollectionUtils.isNotEmpty(patientWeightList)){ PatientWeight patientWeight = patientWeightList.get(0); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanWeightWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanWeightWorker.java index ef8b3ba..ce55e08 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanWeightWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanWeightWorker.java @@ -45,18 +45,12 @@ public class QuanWeightWorker implements Callable> { @Override public List call() throws Exception { List data = new ArrayList<>(); - AntExQuery antExQuery = new AntExQuery(); - antExQuery.setYn(YnEnums.YES.getId()); - AntExChuQuery antExChuQuery1 = new AntExChuQuery(); - - antExChuQuery1.setYn(YnEnums.YES.getId()); for (Patients patients : patientses) { if(com.lyms.platform.common.utils.StringUtils.isNotEmpty(patients.getId())){ List patientWeightList = mongoTemplate.find(Query.query(Criteria.where("patientId").is(patients.getId()).and("yn").ne("0")), PatientWeight.class); if(CollectionUtils.isNotEmpty(patientWeightList)){ PatientWeight patientWeight = patientWeightList.get(0); if(patientWeight!=null && com.lyms.platform.common.utils.StringUtils.isNotEmpty(patientWeight.getBmi())){ - double bmid = Double.parseDouble(patientWeight.getBmi()); Map map = new HashMap(); map.put("username", patients.getUsername()); map.put("age", patients.getAge());