From f17933b56bec4e30c022bf9731ef0cf5572312cf Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Wed, 6 Jul 2016 16:53:33 +0800
Subject: [PATCH] update code

---
 .../java/com/lyms/platform/query/BabyModelQuery.java    | 17 +++++++++--------
 .../web/controller/BabyBookbuildingController.java      |  1 -
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
index 31ea207..22c623c 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
@@ -5,6 +5,7 @@ import com.lyms.platform.common.dao.BaseQuery;
 import com.lyms.platform.common.dao.operator.MongoCondition;
 import com.lyms.platform.common.dao.operator.MongoOper;
 import com.lyms.platform.common.dao.operator.MongoQuery;
+import com.lyms.platform.common.utils.StringUtils;
 import org.bson.types.ObjectId;
 import org.springframework.data.mongodb.core.query.Criteria;
 
@@ -264,21 +265,21 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
             condition=condition.and("communityId", null, MongoOper.IS);
         }
 
-        if(null!=mcertNo){
+        if(StringUtils.isEmpty(name)){
             condition=condition.and("mcertNo", mcertNo, MongoOper.IS);
         }
-        if(null!=cardNo){
+        if(StringUtils.isEmpty(name)){
             condition=condition.and("cardNo", cardNo, MongoOper.IS);
         }
 
-        if(null!=vcCardNo){
+        if(StringUtils.isEmpty(name)){
             condition=condition.and("vcCardNo", vcCardNo, MongoOper.IS);
         }
 
         if(null!=hospitalId){
             condition=condition.and("hospitalId", hospitalId, MongoOper.IS);
         }
-        if(null!=diagnose){
+        if(StringUtils.isEmpty(name)){
             condition=condition.and("diagnose", diagnose, MongoOper.LIKE);
         }
 
@@ -305,17 +306,17 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
         }
 
 
-        if (null != parentId) {
+        if (StringUtils.isEmpty(name)) {
             condition = condition.and("parentid", parentId, MongoOper.IS);
         }
-        if (null != mphone) {
+        if (StringUtils.isEmpty(name)) {
             condition = condition.and("mphone", mphone, MongoOper.IS);
         }
-        if (null != mname) {
+        if (StringUtils.isEmpty(name)) {
             condition = condition.and("mname", mname, MongoOper.IS);
         }
 
-        if (null != name) {
+        if (StringUtils.isEmpty(name)) {
             condition = condition.and("name", name, MongoOper.IS);
         }
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java
index bb7b7f4..7e7ede1 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java
@@ -155,7 +155,6 @@ public class BabyBookbuildingController extends BaseController{
      * @param mcardNo 母亲身份证
      * @param page
      * @param limit
-     * @param serviceType 服务状态
      * @param name 儿童姓名
      * @param       highRiskType  0 非高危 1 高危 2/空 全部
      * @return
-- 
1.8.3.1