From 2420892a9cdaf58a8f8d7abdf3d3711cdc25f112 Mon Sep 17 00:00:00 2001
From: wtt <1872109740@qq.com>
Date: Mon, 18 Jan 2021 10:33:19 +0800
Subject: [PATCH] update

---
 .../platform/operate/web/facade/PatientFacade.java | 37 +++++++---------------
 1 file changed, 11 insertions(+), 26 deletions(-)

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 1a4e451..a22395b 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
@@ -835,7 +835,6 @@ public class PatientFacade {
         List<Map> data = new ArrayList<>();
         List<String> idsMd = new ArrayList<>();
         List<String> idsPW = new ArrayList<>();
-        List<String> gteList = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(patientses)) {
             for (Patients patients : patientses) {
                 //儿童体重大于等于4000克
@@ -854,34 +853,20 @@ public class PatientFacade {
             if(StringUtils.isNotEmpty(riskPatientsQueryRequest.getBmiStart()) && StringUtils.isNotEmpty(riskPatientsQueryRequest.getBmiEnd()) && CollectionUtils.isNotEmpty(idsMd)){
                 bmiSta = false;
                 for (String id : idsMd) {
-
-                    Query gtequery = Query.query(Criteria.where("patientId").is(id).and("yn").ne("0").and("$where").is("(this.bmi >= "+riskPatientsQueryRequest.getBmiStart()+" )"));
-                    Query ltequery = null;
-                    List<PatientWeight> gteWeightList = mongoTemplate.find(gtequery, PatientWeight.class);
-                    if(CollectionUtils.isNotEmpty(gteWeightList)){
-                        for (PatientWeight p:gteWeightList) {
-                            if(StringUtils.isEmpty(p.getId())){
-                                continue;
-                            }
-                            gteList.add(p.getId());
-                        }
-                        ltequery= Query.query(Criteria.where("patientId").is(id).and("yn").ne("0").and("id").in(gteList)
-                                .and("$where").is("(this.bmi <= " + riskPatientsQueryRequest.getBmiEnd() + " )"));
-                    }else {
-                        ltequery= Query.query(Criteria.where("patientId").is(id).and("yn").ne("0")
-                                .and("$where").is("(this.bmi <= " + riskPatientsQueryRequest.getBmiEnd() + " )"));
-                    }
-                    List<PatientWeight> lteWeightList = mongoTemplate.find(ltequery, PatientWeight.class);
-//                    Query query = Query.query(Criteria.where("patientId").is(id).and("yn").ne("0").and("bmi").gte(riskPatientsQueryRequest.getBmiStart()).lte(riskPatientsQueryRequest.getBmiEnd()));
-//                    List<PatientWeight> patientWeightList = mongoTemplate.find(query, PatientWeight.class);
-                    if(CollectionUtils.isNotEmpty(lteWeightList)){
-                        PatientWeight patientWeight = lteWeightList.get(0);
+                    Query query = Query.query(Criteria.where("patientId").is(id).and("yn").ne("0"));
+                    List<PatientWeight> patientWeightList = mongoTemplate.find(query, PatientWeight.class);
+                    if(CollectionUtils.isNotEmpty(patientWeightList)){
+                        PatientWeight patientWeight = patientWeightList.get(0);
                         if(patientWeight!=null && com.lyms.platform.common.utils.StringUtils.isNotEmpty(patientWeight.getBmi())){
-                            idsPW.add(id);
-                            bmiSta = true;
+                            double bmid = Double.parseDouble(patientWeight.getBmi());
+                            double bmidStart = Double.parseDouble(riskPatientsQueryRequest.getBmiStart());
+                            double bmidEnd = Double.parseDouble(riskPatientsQueryRequest.getBmiEnd());
+                            if(bmid >= bmidStart && bmid < bmidEnd){
+                                idsPW.add(id);
+                                bmiSta = true;
+                            }
                         }
                     }
-
                 }
             }
             if((CollectionUtils.isNotEmpty(idsMd) || CollectionUtils.isNotEmpty(idsPW)) && bmiSta){
-- 
1.8.3.1