diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java
index 13a3970..eba8646 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java
@@ -2,7 +2,9 @@ package com.lyms.platform.operate.web.controller;
 
 
 import com.lyms.platform.biz.service.BabyCheckService;
+import com.lyms.platform.common.annotation.TokenRequired;
 import com.lyms.platform.common.base.BaseController;
+import com.lyms.platform.common.base.LoginContext;
 import com.lyms.platform.common.constants.ErrorCodeConstants;
 import com.lyms.platform.common.result.BaseObjectResponse;
 import com.lyms.platform.common.result.BaseResponse;
@@ -13,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 
 
@@ -87,8 +90,10 @@ public class BabyCheckController extends BaseController{
      */
     @RequestMapping(value = "/queryChooseBabys", method = RequestMethod.GET)
     @ResponseBody
-    public BaseObjectResponse queryChooseBabys(@RequestParam(required = false)String vcCardNo,@RequestParam(required = false)String cardNo){
-        return  babyCheckFacade.queryChooseBabys(vcCardNo, cardNo);
+    @TokenRequired
+    public BaseObjectResponse queryChooseBabys(HttpServletRequest request,@RequestParam(required = false)String vcCardNo,@RequestParam(required = false)String cardNo){
+        LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
+        return  babyCheckFacade.queryChooseBabys(vcCardNo, cardNo,loginState.getId());
     }
 
 
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 ebe88f5..f18d28b 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
@@ -14,6 +14,8 @@ import com.lyms.platform.operate.web.result.BabyBasicResult;
 import com.lyms.platform.operate.web.result.BabyCheckResult;
 import com.lyms.platform.operate.web.result.BabyChooseResult;
 import com.lyms.platform.operate.web.result.BasicConfigResult;
+import com.lyms.platform.permission.model.Users;
+import com.lyms.platform.permission.service.UsersService;
 import com.lyms.platform.pojo.*;
 import com.lyms.platform.query.*;
 import org.apache.commons.collections.CollectionUtils;
@@ -45,6 +47,9 @@ public class BabyCheckFacade {
     @Autowired
     private AntenatalExaminationFacade antenatalExaminationFacade;
 
+
+    @Autowired
+    private UsersService usersService;
     /**
      * 更新检查
      *
@@ -363,10 +368,24 @@ public class BabyCheckFacade {
      * @param cardNo
      * @return
      */
-    public BaseObjectResponse queryChooseBabys(String vcCardNo, String cardNo) {
+    public BaseObjectResponse queryChooseBabys(String vcCardNo, String cardNo,Integer userId) {
 
-        BaseObjectResponse br = new BaseObjectResponse();
 
+        Map map = new HashMap();
+
+        String hospitalId = "";
+
+        //得到当前登录的医院id
+        if (userId != null)
+        {
+            Users dbuser = usersService.getUsers(userId);
+            if (dbuser != null) {
+                 hospitalId = String.valueOf(dbuser.getOrgId());
+            }
+        }
+
+        BaseObjectResponse br = new BaseObjectResponse();
+        boolean isBuild = false;
         List<BabyChooseResult> results = new ArrayList<>();
 
         if (!StringUtils.isEmpty(vcCardNo) || !StringUtils.isEmpty(cardNo)) {
@@ -377,7 +396,10 @@ public class BabyCheckFacade {
 
             List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
             for (BabyModel model : models) {
-
+                if (model != null && model.getHospitalId() != null && model.getHospitalId().equals(hospitalId))
+                {
+                    isBuild = true;
+                }
                 BabyChooseResult result = new BabyChooseResult();
                 result.setId(model.getId());
                 result.setMonthAge(DateUtil.getBabyMonthAge(model.getBirth(), new Date()));
@@ -386,10 +408,10 @@ public class BabyCheckFacade {
                 result.setBirth(DateUtil.getyyyy_MM_dd(model.getBirth()));
                 results.add(result);
             }
-
         }
-
-        br.setData(results);
+        map.put("isBuild",isBuild);
+        map.put("boies",results);
+        br.setData(map);
         br.setErrorcode(ErrorCodeConstants.SUCCESS);
         br.setErrormsg("成功");
 
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 4168a48..5d78f33 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
@@ -97,6 +97,18 @@ public class BookbuildingFacade {
 				return br;
 			}
 		}
+
+		Integer type =  1; //1孕妇 2儿童 3产妇
+		if (yunRequest.getLastMenstrualPeriod()  != null)
+		{
+			Date date = DateUtil.addWeek(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()),42);
+			Date currentDate = DateUtil.formatDate(new Date());
+			if (date.getTime() >= currentDate.getTime())
+			{
+				type = 3;
+			}
+		}
+
 		PersonModel resperson = null;
 		if (yunRequest.getPregnantPhone() != null || yunRequest.getPregnantCertificateNum() != null)
 		{
@@ -120,7 +132,7 @@ public class BookbuildingFacade {
 			pmodel.setBirth(DateUtil.parseYMD(yunRequest.getBirthday()));
 			pmodel.setPhone(yunRequest.getPregnantPhone());
 			pmodel.setCardNo(yunRequest.getPregnantCertificateNum());
-			pmodel.setType(1);
+			pmodel.setType(type);
 			pmodel.setModified(new Date());
 			if (CollectionUtils.isNotEmpty(personModels) && personModels.get(0) != null)
 			{
@@ -137,6 +149,7 @@ public class BookbuildingFacade {
 		}
 
 		Patients patient = getPatientsData(yunRequest);
+		patient.setType(type);
 		if (resperson != null)
 		{
 			patient.setPid(resperson.getId());