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 cc6517a..2f4f69c 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
@@ -27,6 +27,7 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
     private String keyword;
 
     private String mphone;
+    private String mphoneOrFphone;
     private String mname;
     private String communityId;
 
@@ -57,6 +58,14 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
 
     private String phoneOrcardNo;
 
+    public String getMphoneOrFphone() {
+        return mphoneOrFphone;
+    }
+
+    public void setMphoneOrFphone(String mphoneOrFphone) {
+        this.mphoneOrFphone = mphoneOrFphone;
+    }
+
     public String getPhoneOrcardNo() {
         return phoneOrcardNo;
     }
@@ -613,6 +622,11 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
             MongoCondition con = MongoCondition.newInstance("cardId", cardId, MongoOper.LIKE);
             condition = condition.orCondition(new MongoCondition[]{con1, con});
         }
+        if (!StringUtils.isEmpty(mphoneOrFphone)) {
+            MongoCondition con1 = MongoCondition.newInstance("mphone", mphoneOrFphone, MongoOper.IS);
+            MongoCondition con = MongoCondition.newInstance("fphone", mphoneOrFphone, MongoOper.IS);
+            condition = condition.orCondition(new MongoCondition[]{con1, con});
+        }
 
         if (null != buildTypeList) {
             MongoCondition mongoCondition = MongoCondition.newInstance("buildType", 3, MongoOper.IS);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java
index d59ec27..a02ce43 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java
@@ -198,6 +198,7 @@ public class BabyBuildController extends BaseController {
                                           @RequestParam(value = "highRiskType", required = false) Integer highRiskType,
                                           @RequestParam(value = "diagnose", required = false) String diagnose,
                                           @RequestParam(value = "dateRange", required = false) String dateRange,
+                                          @RequestParam(value = "vcCardNo", required = false) String vcCardNo,
                                           @RequestParam("page") Integer page,
                                           @RequestParam("limit") Integer limit,
 
@@ -227,6 +228,7 @@ public class BabyBuildController extends BaseController {
         request.setPage(page);
         request.setServiceStatus(serviceStatus);
         request.setDateRange(dateRange);
+        request.setVcCardNo(vcCardNo);
 
         // 省
         request.setProvinceId(provinceId);
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 6e388b5..a0d2877 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
@@ -1461,7 +1461,7 @@ public class BabyBookbuildingFacade {
                             System.out.println("hisPatient phone = " + babyHis.get("phone").toString());
                             BabyModelQuery babyModelQuery = new BabyModelQuery();
                             babyModelQuery.setYn(YnEnums.YES.getId());
-                            babyModelQuery.setMphone(babyHis.get("phone").toString());
+                            babyModelQuery.setMphoneOrFphone(babyHis.get("phone").toString());
                             if (org.apache.commons.lang.StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(autoMatchFacade.getHospitalId(userId)))){
                                 List list = new ArrayList();
                                 list.add("1");
@@ -1916,6 +1916,7 @@ public class BabyBookbuildingFacade {
         babyQuery.setCardNo(request.getBcardNo());
         babyQuery.setName(request.getName());
         babyQuery.setMphone(request.getMphone());
+        babyQuery.setVcCardNo(request.getVcCardNo());
         Date currentDate = DateUtil.formatDate(new Date());
 
 
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 cdb8c67..796dc5b 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
@@ -805,7 +805,8 @@ public class BabyCheckFacade {
                          if (babyHis != null && babyHis.get("phone") != null && StringUtils.isNotEmpty(babyHis.get("phone").toString())) {
                              babyQuery.setPhoneOrcardNo(null); //手机号码或者身份证号码
                              babyQuery.setVcCardNo(null);
-                             babyQuery.setMphone(babyHis.get("phone").toString());
+                             //babyQuery.setMphone(babyHis.get("phone").toString());
+                             babyQuery.setMphoneOrFphone(babyHis.get("phone").toString());
                              models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
                          }
                      }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java
index 4423625..9d581c6 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java
@@ -56,6 +56,9 @@ public class BabyManageRequest  extends BaseQuery {
     //诊断
     private String diagnose;
 
+    //就诊卡号
+    private String vcCardNo;
+
     private String dateRange;
 
     private String provinceId;
@@ -80,6 +83,14 @@ public class BabyManageRequest  extends BaseQuery {
     //评价
     private String evaluate;
 
+    public String getVcCardNo() {
+        return vcCardNo;
+    }
+
+    public void setVcCardNo(String vcCardNo) {
+        this.vcCardNo = vcCardNo;
+    }
+
     public String getItemType() {
         return itemType;
     }