diff --git a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/KidsController.java b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/KidsController.java
index 3698d82..956feb6 100644
--- a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/KidsController.java
+++ b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/KidsController.java
@@ -273,13 +273,16 @@ public class KidsController extends BaseController {
      * @param id       宝宝id
      */
     @RequestMapping(value = "/babys", method = RequestMethod.GET)
-    @TokenRequired
+    //@TokenRequired
     public void getKids(HttpServletResponse response,
                         @RequestParam("id") String id) {
         if (StringUtils.isBlank(id)) {
             ResultUtils.buildIdIsNull(response);
             return;
         }
+
+        List<KidInoculationRecords> recordsList = medKidsService.queryInoculationRecord(id);
+
         //取出建档最早的那个
         MedKidsQuery query = new MedKidsQuery();
         query.setIsDelete(isDelete);
@@ -313,12 +316,17 @@ public class KidsController extends BaseController {
                 map.put("vaccineId", medInoculateorder.getIoVaccineId());
                 MedVaccineName medVaccineName = medVaccineNameService.getMedVaccineName(medInoculateorder.getIoVaccineId());
                 map.put("vaccineName", medVaccineName == null ? "" : medVaccineName.getVnName());
+                //剂次
+                int sum = medVaccineName.getVnMonthAge().split(",").length;
+
+
+
                 //接种地点
                 map.put("organizationId", medInoculateorder.getIoOrganizationId());
                 MedOrganization medOrganization = medOrganizationService.getMedOrganization(medInoculateorder.getIoOrganizationId());
                 map.put("organizationName", medOrganization == null ? "" : medOrganization.getoName());
             } else {
-                map.put("ioInoculateTime", null);
+                map.put("ioInoculateDate", null);
                 map.put("vaccineId", null);
                 map.put("vaccineName", null);
                 map.put("organizationId", null);
@@ -332,6 +340,17 @@ public class KidsController extends BaseController {
         writeJson(response, JsonUtil.obj2JsonString(map));
     }
 
+    public static void main(String[] str) {
+        long a = DateUtil.getSecond(new Date()) - DateUtil.getSecond(DateUtil.parseYMD("2016-1-1"));
+
+        System.out.println(DateUtil.getSecond(new Date()));
+        System.out.println(DateUtil.parseYMD("2016-1-1"));
+
+        System.out.print(a);
+    }
+
+
+
     /**
      * 根据月龄获取宝宝该月龄预约接种的疫苗(分为免费疫苗和收费疫苗两个模块)
      *
diff --git a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/UserController.java b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/UserController.java
index 1fd08a9..f9c688e 100644
--- a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/UserController.java
+++ b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/UserController.java
@@ -131,7 +131,7 @@ public class UserController extends BaseController {
             map.put("errormsg", "成功");
             writeJson(response,JsonUtil.obj2JsonString(map));
         }else {
-            ResultUtils.buildParameterErrorResultAndWrite(response,"該手機不存在,請註冊");
+            ResultUtils.buildParameterErrorResultAndWrite(response,"该手机号不存在,请注册");
         }
     }
 
@@ -187,6 +187,8 @@ public class UserController extends BaseController {
         //如果没有头像,返回默认头像
         map.put("avatar", QiniuUtil.buildImg(users.getAvatar()!=null ? users.getAvatar() : ImageUtil.DEFAULTUSERAVATAR));
 
+        map.put("phone", users.getPhone());
+
         list.add(map);
 
         ResultUtils.buildSuccessResultAndWrite(response,list);
@@ -206,6 +208,18 @@ public class UserController extends BaseController {
 
         //取到当前登陆用户的id
         YmUsers users = usersService.getYmUsers(loginContext.getId());
+
+        YmUsersQuery query = new YmUsersQuery();
+        query.setYn(YnEnum.yes.getId());
+        List<YmUsers> ymUsersList = usersService.queryYmUsers(query);
+        if (CollectionUtils.isNotEmpty(ymUsersList)){
+            for (YmUsers data : ymUsersList){
+                if (phone.equals(data.getPhone())){
+                    ResultUtils.buildParameterErrorResultAndWrite(response,"当前手机已绑定,请重新输入");
+                }
+            }
+        }
+
         if (PhoneUtil.isMobileNO(phone)){
             users.setPhone(phone);
             users.setModified(new Date());