From a19c0c4dc271821f27a26e2c8e803578297e715a Mon Sep 17 00:00:00 2001
From: Administrator <www.184677810@qq.com>
Date: Fri, 28 Jun 2019 15:08:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=84=BF=E4=BF=9D=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/BabyCheckFacade.java        | 43 ++++++++--------------
 1 file changed, 15 insertions(+), 28 deletions(-)

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 2f73cb7..2a2d6cc 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
@@ -762,7 +762,7 @@ public class BabyCheckFacade extends BaseServiceImpl {
         Criteria pCriteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital);
         if (org.apache.commons.lang.StringUtils.isNotBlank(queryNo)) {
             pCriteria.orOperator(Criteria.where("mcertNo").regex(queryNo), Criteria.where("name").regex(queryNo),
-                    Criteria.where("fphone").regex(queryNo), Criteria.where("vcCardNo").regex(queryNo));
+                    Criteria.where("fphone").regex(queryNo), Criteria.where("vcCardNo").regex(queryNo), Criteria.where("mname").regex(queryNo));
             flag = true;
         }
         if (flag) {
@@ -798,6 +798,9 @@ public class BabyCheckFacade extends BaseServiceImpl {
         if (null != waskSon) {
             criteria.and("waskSon").is(waskSon);
         }
+        if (null != checkMonthAge && null != endCheckMonthAge) {
+            criteria.and("checkMonth").gte(checkMonthAge).lte(endCheckMonthAge);
+        }
         PageResult pageResult = findMongoPage(BabyCheckModel.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "created")), page, limit);
         List<BabyCheckModel> babyCheckModelList = (List<BabyCheckModel>) pageResult.getGrid();
         List<Map<String, Object>> list = new ArrayList();
@@ -829,19 +832,9 @@ public class BabyCheckFacade extends BaseServiceImpl {
             map.put("weight", babyCheckModel.getWeight());
             list.add(map);
         }
-        if (null != checkMonthAge && null != endCheckMonthAge) {
-            List<Map<String, Object>> list1 = new ArrayList<>();
-            for (Map<String, Object> mapList : list) {
-                if ((int) mapList.get("monthAge") >= checkMonthAge && (int) mapList.get("monthAge") <= endCheckMonthAge) {
-                    list1.add(mapList);
-                }
-            }
-            pageResult.setGrid(list1);
-            return RespBuilder.buildSuccess(pageResult);
-        } else {
-            pageResult.setGrid(list);
-            return RespBuilder.buildSuccess(pageResult);
-        }
+        pageResult.setGrid(list);
+        return RespBuilder.buildSuccess(pageResult);
+
 
     }
 
@@ -864,7 +857,7 @@ public class BabyCheckFacade extends BaseServiceImpl {
         Criteria pCriteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospitalIds);
         if (org.apache.commons.lang.StringUtils.isNotBlank(queryNo)) {
             pCriteria.orOperator(Criteria.where("mcertNo").regex(queryNo), Criteria.where("name").regex(queryNo),
-                    Criteria.where("fphone").regex(queryNo), Criteria.where("vcCardNo").regex(queryNo));
+                    Criteria.where("fphone").regex(queryNo), Criteria.where("vcCardNo").regex(queryNo), Criteria.where("mname").regex(queryNo));
             flag = true;
         }
         if (flag) {
@@ -899,6 +892,9 @@ public class BabyCheckFacade extends BaseServiceImpl {
         if (null != waskSon) {
             criteria.and("waskSon").is(waskSon);
         }
+        if (null != checkMonthAge && null != endCheckMonthAge) {
+            criteria.and("checkMonth").gte(checkMonthAge).lte(endCheckMonthAge);
+        }
         PageResult pageResult = findMongoPage(BabyCheckModel.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "created")), page, limit);
         List<BabyCheckModel> babyCheckModelList = (List<BabyCheckModel>) pageResult.getGrid();
         List<Map<String, Object>> list = new ArrayList();
@@ -930,19 +926,10 @@ public class BabyCheckFacade extends BaseServiceImpl {
             map.put("weight", babyCheckModel.getWeight());
             list.add(map);
         }
-        if (null != checkMonthAge && null != endCheckMonthAge) {
-            List<Map<String, Object>> list1 = new ArrayList<>();
-            for (Map<String, Object> mapList : list) {
-                if ((int) mapList.get("monthAge") >= checkMonthAge && (int) mapList.get("monthAge") <= endCheckMonthAge) {
-                    list1.add(mapList);
-                }
-            }
-            pageResult.setGrid(list1);
-            return RespBuilder.buildSuccess(pageResult);
-        } else {
-            pageResult.setGrid(list);
-            return RespBuilder.buildSuccess(pageResult);
-        }
+
+        pageResult.setGrid(list);
+        return RespBuilder.buildSuccess(pageResult);
+
 
     }
 
-- 
1.8.3.1