From 7c3843aa26a610152e074e5480ab7e60105d1ef2 Mon Sep 17 00:00:00 2001
From: shiyang <316555390@qq.com>
Date: Wed, 29 Dec 2021 18:32:14 +0800
Subject: [PATCH] update

---
 .../java/com/lyms/platform/query/BabyCheckModelQuery.java   | 13 +++++++++----
 .../lyms/platform/operate/web/facade/BabyCheckFacade.java   |  5 ++++-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyCheckModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyCheckModelQuery.java
index ab70507..cd54ea8 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/BabyCheckModelQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyCheckModelQuery.java
@@ -208,9 +208,6 @@ public class BabyCheckModelQuery extends BaseQuery implements IConvertToNativeQu
             MongoCondition condition2 = new MongoCondition("created", gteCreated, MongoOper.GTE);
             condition = condition.orCondition(new MongoCondition[]{mongoCondition, condition2});
         }
-        if(StringUtils.isNotEmpty(hemoglobinLt)){
-            condition=condition.and("hemoglobin", hemoglobinLt, MongoOper.LT);
-        }
 
         Criteria c = null;
         if (null != birthStart) {
@@ -273,7 +270,7 @@ public class BabyCheckModelQuery extends BaseQuery implements IConvertToNativeQu
             }
         }
 
-        if(null != hemoglobinStart && hemoglobinEnd != null){
+        if(StringUtils.isNotEmpty(hemoglobinStart) && StringUtils.isNotEmpty(hemoglobinEnd)){
             if(null != c){
                 c = c.and("hemoglobin").gte(hemoglobinStart).lte(hemoglobinEnd);
             }else{
@@ -281,6 +278,14 @@ public class BabyCheckModelQuery extends BaseQuery implements IConvertToNativeQu
             }
         }
 
+        if(StringUtils.isNotEmpty(hemoglobinLt)){
+            if(null != c){
+                c = c.and("hemoglobin").gte("0").lt(hemoglobinLt);
+            }else{
+                c = Criteria.where("hemoglobin").gte("0").lt(hemoglobinLt);
+            }
+        }
+
         if (c != null) {
             return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery();
         }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
index da85054..74a10e2 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
@@ -4722,24 +4722,27 @@ public class BabyCheckFacade extends BaseServiceImpl {
             query.setCheckMonthStart(cms);
             query.setCheckMonthEnd(cme);
             //轻度贫血
+            query.setHemoglobinLt(null);
             query.setHemoglobinStart(lightHls);
             query.setHemoglobinEnd(lightHln);
             int light =babyCheckService.queryBabyCheckCount(query);
             map.put("light"+i,light);
             //中度贫血
+            query.setHemoglobinLt(null);
             query.setHemoglobinStart(middleHls);
             query.setHemoglobinEnd(middleHln);
             int middle =babyCheckService.queryBabyCheckCount(query);
             map.put("middle"+i,middle);
             //重度贫血
+            query.setHemoglobinLt(null);
             query.setHemoglobinStart(matterHls);
             query.setHemoglobinEnd(matterHls);
             int matter =babyCheckService.queryBabyCheckCount(query);
             map.put("matter"+i,matter);
             //极重度贫血
-            query.setHemoglobinLt(severityHll);
             query.setHemoglobinStart(null);
             query.setHemoglobinEnd(null);
+            query.setHemoglobinLt(severityHll);
             int severity =babyCheckService.queryBabyCheckCount(query);
             map.put("severity"+i,severity);
             //月龄区间总数
-- 
1.8.3.1