Commit a23518e86e3d284575e79d58f32f699a5b263750
1 parent
f39da36098
Exists in
master
and in
6 other branches
update
Showing 2 changed files with 2 additions and 13 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
View file @
a23518e
... | ... | @@ -841,13 +841,8 @@ |
841 | 841 | //孕妇体重 |
842 | 842 | if(StringUtils.isNotEmpty(riskPatientsQueryRequest.getBmiStart()) && StringUtils.isNotEmpty(riskPatientsQueryRequest.getBmiEnd()) && CollectionUtils.isNotEmpty(idsMd)){ |
843 | 843 | for (String id : idsMd) { |
844 | - Query query = new Query(); | |
845 | - if(StringUtils.isNotEmpty(riskPatientsQueryRequest.getBmiStart()) && StringUtils.isNotEmpty(riskPatientsQueryRequest.getBmiEnd())){ | |
846 | - query = Query.query(Criteria.where("patientId").is(id) | |
847 | - .and("yn").ne("0").and("bmi").gte(riskPatientsQueryRequest.getBmiStart()).lte(riskPatientsQueryRequest.getBmiEnd())); | |
848 | - }else if(StringUtils.isEmpty(riskPatientsQueryRequest.getBmiStart()) && StringUtils.isEmpty(riskPatientsQueryRequest.getBmiEnd())){ | |
849 | - query = Query.query(Criteria.where("patientId").is(id) .and("yn").ne("0")); | |
850 | - } | |
844 | + Query query = Query.query(Criteria.where("patientId").is(id) | |
845 | + .and("yn").ne("0").and("bmi").gte(riskPatientsQueryRequest.getBmiStart()).lte(riskPatientsQueryRequest.getBmiEnd())); | |
851 | 846 | List<PatientWeight> patientWeightList = mongoTemplate.find(query, PatientWeight.class); |
852 | 847 | if(CollectionUtils.isNotEmpty(patientWeightList)){ |
853 | 848 | PatientWeight patientWeight = patientWeightList.get(0); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanWeightWorker.java
View file @
a23518e
... | ... | @@ -45,18 +45,12 @@ |
45 | 45 | @Override |
46 | 46 | public List<Map> call() throws Exception { |
47 | 47 | List<Map> data = new ArrayList<>(); |
48 | - AntExQuery antExQuery = new AntExQuery(); | |
49 | - antExQuery.setYn(YnEnums.YES.getId()); | |
50 | - AntExChuQuery antExChuQuery1 = new AntExChuQuery(); | |
51 | - | |
52 | - antExChuQuery1.setYn(YnEnums.YES.getId()); | |
53 | 48 | for (Patients patients : patientses) { |
54 | 49 | if(com.lyms.platform.common.utils.StringUtils.isNotEmpty(patients.getId())){ |
55 | 50 | List<PatientWeight> patientWeightList = mongoTemplate.find(Query.query(Criteria.where("patientId").is(patients.getId()).and("yn").ne("0")), PatientWeight.class); |
56 | 51 | if(CollectionUtils.isNotEmpty(patientWeightList)){ |
57 | 52 | PatientWeight patientWeight = patientWeightList.get(0); |
58 | 53 | if(patientWeight!=null && com.lyms.platform.common.utils.StringUtils.isNotEmpty(patientWeight.getBmi())){ |
59 | - double bmid = Double.parseDouble(patientWeight.getBmi()); | |
60 | 54 | Map map = new HashMap(); |
61 | 55 | map.put("username", patients.getUsername()); |
62 | 56 | map.put("age", patients.getAge()); |