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 015dd26..e9042cc 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
@@ -766,14 +766,6 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
             condition = condition.and("buildType", smsBuildTypeList, MongoOper.IN);
         }
 
-        if (StringUtils.isNotEmpty(queryNo)) {
-            MongoCondition c = MongoCondition.newInstance();
-            MongoCondition con1 = MongoCondition.newInstance("mname", queryNo, MongoOper.LIKE);
-            MongoCondition con2 = MongoCondition.newInstance("mcertNo", queryNo, MongoOper.IS);
-            MongoCondition con3 = MongoCondition.newInstance("mphone", queryNo, MongoOper.IS);
-            MongoCondition con4 = MongoCondition.newInstance("name", queryNo, MongoOper.LIKE);
-            condition = condition.andCondition(c.orCondition(new MongoCondition[]{con1, con2, con3, con4}));
-        }
 
         if (null != sex) {
             condition = condition.and("sex", sex, MongoOper.IS);
@@ -889,6 +881,19 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
             condition = condition.orCondition(new MongoCondition[]{mongoCondition, condition2});
         }
 
+        if (StringUtils.isNotEmpty(queryNo)) {
+            MongoCondition c1 = MongoCondition.newInstance();
+            MongoCondition con1 = MongoCondition.newInstance("mname", queryNo, MongoOper.LIKE);
+            MongoCondition con2 = MongoCondition.newInstance("mcertNo", queryNo, MongoOper.IS);
+            MongoCondition con3 = MongoCondition.newInstance("mphone", queryNo, MongoOper.IS);
+            MongoCondition con4 = MongoCondition.newInstance("name", queryNo, MongoOper.LIKE);
+            if (c != null) {
+                c = c.andOperator(c1.orCondition(new MongoCondition[]{con1, con2, con3, con4}).getCriteria());
+            } else {
+                c = c1.orCondition(new MongoCondition[]{con1, con2, con3, con4}).getCriteria();
+            }
+        }
+
 
         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/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
index 932b900..5527eb3 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
@@ -15,7 +15,6 @@ import com.lyms.platform.operate.web.result.*;
 import com.lyms.platform.operate.web.service.ITrackDownService;
 import com.lyms.platform.operate.web.utils.CommonsHelper;
 import com.lyms.platform.operate.web.utils.UnitConstants;
-import com.lyms.platform.operate.web.worker.CourseCountWorker;
 import com.lyms.platform.operate.web.worker.MaterDeliverWorker;
 import com.lyms.platform.permission.model.Organization;
 import com.lyms.platform.permission.model.OrganizationQuery;
@@ -2214,6 +2213,7 @@ public class MatDeliverFacade {
                 // 什么都不做，这里是数据传入错误了
             }
         }
+        babyModelQuery.setDataStatus(false);
         babyModelQuery.setDeformityKey(newBabyManagerRequest.getDeformityKey());
         babyModelQuery.setDueType(StringUtils.isEmpty(newBabyManagerRequest.getDueType()) ? null : newBabyManagerRequest.getDueType());
         babyModelQuery.setParentId(StringUtils.isEmpty(newBabyManagerRequest.getPatientId()) ? null : newBabyManagerRequest.getPatientId());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java
index 667a86f..7f42745 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java
@@ -10,23 +10,19 @@ import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.common.utils.EnumUtil;
 import com.lyms.platform.common.utils.MongoConvertHelper;
 import com.lyms.platform.common.utils.ReflectionUtils;
-import com.lyms.platform.operate.web.facade.AccessPermissionFacade;
 import com.lyms.platform.operate.web.facade.AutoMatchFacade;
 import com.lyms.platform.operate.web.facade.OperateLogFacade;
 import com.lyms.platform.operate.web.facade.OrganizationGroupsFacade;
 import com.lyms.platform.operate.web.service.INewbornVisitService;
 import com.lyms.platform.operate.web.utils.CollectionUtils;
-import com.lyms.platform.operate.web.utils.FunvCommonUtil;
 import com.lyms.platform.operate.web.utils.MongoUtil;
 import com.lyms.platform.operate.web.utils.ResponseUtil;
 import com.lyms.platform.permission.dao.master.CouponMapper;
-import com.lyms.platform.permission.dao.slave.OrganizationMapper;
-import com.lyms.platform.permission.dao.slave.UsersMapper;
-import com.lyms.platform.permission.model.Users;
 import com.lyms.platform.permission.service.CouponService;
-import com.lyms.platform.pojo.*;
-import com.lyms.platform.query.DataPermissionsModelQuery;
-import com.mongodb.WriteResult;
+import com.lyms.platform.pojo.BabyModel;
+import com.lyms.platform.pojo.NewbornVisit;
+import com.lyms.platform.pojo.Patients;
+import com.lyms.platform.pojo.PersonModel;
 import org.apache.commons.collections.map.HashedMap;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;