From 6886acd33afd7082c592ef5afa757625e47dfdf4 Mon Sep 17 00:00:00 2001
From: dongqin <123456>
Date: Sun, 2 Jun 2019 22:12:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/lyms/platform/query/BabyNutritionQuery.java    | 13 +++++++++++++
 .../platform/operate/web/facade/BabyNutritionFacade.java    |  8 ++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyNutritionQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyNutritionQuery.java
index 71c21ac..5689f54 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/BabyNutritionQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyNutritionQuery.java
@@ -38,6 +38,15 @@ public class BabyNutritionQuery extends BaseQuery implements IConvertToNativeQue
 
     private String interpretDoctorId;
 
+    private String status;
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
 
     @Override
     public MongoQuery convertToQuery() {
@@ -67,6 +76,10 @@ public class BabyNutritionQuery extends BaseQuery implements IConvertToNativeQue
             condition = condition.and("doctorId", doctorId, MongoOper.IS);
         }
 
+        if (null != status) {
+            condition = condition.and("status", status, MongoOper.IS);
+        }
+
 
         Criteria c = null;
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java
index cf7269f..d9fe42e 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java
@@ -242,8 +242,12 @@ public class BabyNutritionFacade {
         babyQuery.setBabyIds(babyIds);
         babyQuery.setLimit(limit);
         babyQuery.setPage(page);
-        babyQuery.setInterpretDoctorId(interpretDoctorId);
-
+        if (StringUtils.isNotEmpty(interpretDoctorId)) {
+            babyQuery.setInterpretDoctorId(interpretDoctorId);
+        }
+        if (StringUtils.isNotEmpty(settleStatus)) {
+            babyQuery.setStatus(settleStatus);
+        }
 
         if (StringUtils.isNotEmpty(recordTime)) {
             String[] dates = recordTime.split(" - ");
-- 
1.8.3.1