diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BookbuildingController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BookbuildingController.java
index efca323..67ed2ec 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BookbuildingController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BookbuildingController.java
@@ -134,8 +134,10 @@ public class BookbuildingController extends BaseController{
      */
     @RequestMapping(value = "/queryYunBuildInfo", method = RequestMethod.GET)
     @ResponseBody
-    public BaseObjectResponse queryYunBuildInfo(@RequestParam(required = false) String cardNo,@RequestParam(required = false) String phone){
-        BaseObjectResponse objectResponse = bookbuildingFacade.queryYunBuildInfo(cardNo,phone);
+    @TokenRequired
+    public BaseObjectResponse queryYunBuildInfo(HttpServletRequest request,@RequestParam(required = false) String cardNo,@RequestParam(required = false) String vcCardNo){
+        LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
+        BaseObjectResponse objectResponse = bookbuildingFacade.queryYunBuildInfo(cardNo,vcCardNo,loginState.getId());
         return objectResponse;
     }
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
index 5d78f33..17e1afc 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
@@ -16,7 +16,9 @@ import com.lyms.platform.operate.web.result.BookbuildingRecordResult;
 import com.lyms.platform.operate.web.result.PregnantInfoResult;
 import com.lyms.platform.permission.model.Organization;
 import com.lyms.platform.permission.model.OrganizationQuery;
+import com.lyms.platform.permission.model.Users;
 import com.lyms.platform.permission.service.OrganizationService;
+import com.lyms.platform.permission.service.UsersService;
 import com.lyms.platform.pojo.*;
 import com.lyms.platform.query.*;
 import org.apache.commons.collections.CollectionUtils;
@@ -59,6 +61,9 @@ public class BookbuildingFacade {
 	@Autowired
 	private SmsConfigService smsConfigService;
 
+	@Autowired
+	private UsersService usersService;
+
 	/**
 	 * 添加孕妇建档
 	 * @param yunRequest
@@ -727,20 +732,39 @@ public class BookbuildingFacade {
 	}
 
 	/**
-	 * 查询孕妇基本信息 通过手机号码或者身份证
+	 * 查询孕妇基本信息 通过就诊卡号或者身份证
 	 * @param cardNo
-	 * @param phone
+	 * @param vcCardNo
 	 * @return
 	 */
-	public BaseObjectResponse queryYunBuildInfo(String cardNo, String phone) {
+	public BaseObjectResponse queryYunBuildInfo(String cardNo, String vcCardNo,Integer userId) {
 		Patients  pat = null;
-		if (StringUtils.isNotEmpty(cardNo) || StringUtils.isNotEmpty(phone))
+		PatientsQuery patientsQuery = new PatientsQuery();
+		patientsQuery.setYn(YnEnums.YES.getId());
+		if (StringUtils.isNotEmpty(cardNo))
 		{
-			PatientsQuery patientsQuery = new PatientsQuery();
-			patientsQuery.setYn(YnEnums.YES.getId());
 			patientsQuery.setCardNo(cardNo);
-			patientsQuery.setPhone(phone);
+			List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
+			if (CollectionUtils.isNotEmpty(patients))
+			{
+				pat = patients.get(0);
+			}
+		}
 
+		String hospitalId = "";
+		//得到当前登录的医院id
+		if (userId != null)
+		{
+			Users dbuser = usersService.getUsers(userId);
+			if (dbuser != null) {
+				hospitalId = String.valueOf(dbuser.getOrgId());
+			}
+		}
+
+		if (StringUtils.isNotEmpty(vcCardNo) && StringUtils.isNotEmpty(hospitalId))
+		{
+			patientsQuery.setVcCardNo(vcCardNo);
+			patientsQuery.setHospitalId(hospitalId);
 			List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
 			if (CollectionUtils.isNotEmpty(patients))
 			{