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 1ae3a92..b77cc8d 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
@@ -55,6 +55,16 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
     private String enable;
     private List<String> enableListNot;
 
+    private String phoneOrcardNo;
+
+    public String getPhoneOrcardNo() {
+        return phoneOrcardNo;
+    }
+
+    public void setPhoneOrcardNo(String phoneOrcardNo) {
+        this.phoneOrcardNo = phoneOrcardNo;
+    }
+
     public List<String> getEnableListNot() {
         return enableListNot;
     }
@@ -690,6 +700,19 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
 
         }
 
+
+        if (null != phoneOrcardNo) {
+            MongoCondition c1 = MongoCondition.newInstance();
+            MongoCondition con1 = MongoCondition.newInstance("phone",   phoneOrcardNo, MongoOper.IS);
+            MongoCondition con2 = MongoCondition.newInstance("mcertNo", phoneOrcardNo, MongoOper.IS);
+            if(c!=null) {
+                c = c.andOperator(c1.orCondition(new MongoCondition[]{con1, con2}).getCriteria());
+            }else {
+                c = c1.orCondition(new MongoCondition[]{con1, con2}).getCriteria();
+            }
+        }
+
+
         if (null != gteModified && null != gteCreated) {
             MongoCondition mongoCondition = new MongoCondition("modified", gteModified, MongoOper.GTE);
             MongoCondition condition2 = new MongoCondition("created", gteCreated, MongoOper.GTE);
diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PersonModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PersonModelQuery.java
index 0586964..786bbb8 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/PersonModelQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/PersonModelQuery.java
@@ -41,6 +41,9 @@ public class PersonModelQuery extends BaseQuery implements IConvertToNativeQuery
 
     private Integer yn;
 
+    private String phoneOrcardNo;
+
+
 
     @Override
     public MongoQuery convertToQuery() {
@@ -71,10 +74,34 @@ public class PersonModelQuery extends BaseQuery implements IConvertToNativeQuery
             Criteria c = Criteria.where("type").in(types[0],types[1]);
             return new MongoCondition(condition.getCriteria().andOperator(c)).toMongoQuery();
         }
+        Criteria c1 = null;
+
+        if (null != phoneOrcardNo) {
+            MongoCondition c = MongoCondition.newInstance();
+            MongoCondition con1 = MongoCondition.newInstance("phone",   phoneOrcardNo, MongoOper.IS);
+            MongoCondition con2 = MongoCondition.newInstance("cardNo", phoneOrcardNo, MongoOper.IS);
+            if(c1!=null) {
+                c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2}).getCriteria());
+            }else {
+                c1 = c.orCondition(new MongoCondition[]{con1, con2}).getCriteria();
+            }
+        }
+
+        if (null != c1) {
+            condition = condition.andCondition(new MongoCondition(c1));
+
+        }
 
         return condition.toMongoQuery();
     }
 
+    public String getPhoneOrcardNo() {
+        return phoneOrcardNo;
+    }
+
+    public void setPhoneOrcardNo(String phoneOrcardNo) {
+        this.phoneOrcardNo = phoneOrcardNo;
+    }
 
     public Integer[] getTypes() {
         return types;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
index 9b12505..c59f2e7 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
@@ -1232,7 +1232,7 @@ public class BabyBookbuildingFacade {
             PersonModelQuery personModelQuery = new PersonModelQuery();
             personModelQuery.setYn(YnEnums.YES.getId());
             personModelQuery.setType(2);
-            personModelQuery.setCardNo(param.getCardNo());
+            personModelQuery.setPhoneOrcardNo(param.getCardNo());
             List<PersonModel> personModels = personService.queryPersons(personModelQuery);
             if (CollectionUtils.isNotEmpty(personModels)) {
                 for (PersonModel babayPerson : personModels) {
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 3639e14..236c070 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
@@ -729,7 +729,7 @@ public class BabyCheckFacade {
 
         if (!StringUtils.isEmpty(vcCardNo) || !StringUtils.isEmpty(cardNo)) {
             BabyModelQuery babyQuery = new BabyModelQuery();
-            babyQuery.setMcertNo(StringUtils.isEmpty(cardNo) ? null : cardNo);
+            babyQuery.setPhoneOrcardNo(StringUtils.isEmpty(cardNo) ? null : cardNo); //手机号码或者身份证号码
             babyQuery.setVcCardNo(StringUtils.isEmpty(vcCardNo) ? null : vcCardNo);
             babyQuery.setYn(YnEnums.YES.getId());