diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedKids.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedKids.java
index 1776b52..692ccf2 100644
--- a/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedKids.java
+++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedKids.java
@@ -13,6 +13,26 @@ public class MedKids {
     private String buildTime;//建档时间
     private String isDelete;//宝宝是否有效
 
+    private String fatherName;
+    private String motherName;
+
+    public String getMotherName() {
+        return motherName;
+    }
+
+    public void setMotherName(String motherName) {
+        this.motherName = motherName;
+    }
+
+    public String getFatherName() {
+
+        return fatherName;
+    }
+
+    public void setFatherName(String fatherName) {
+        this.fatherName = fatherName;
+    }
+
     public String getIsDelete() {
         return isDelete;
     }
@@ -101,4 +121,28 @@ public class MedKids {
     public void setCurrentOrganizationId(String currentOrganizationId) {
         this.currentOrganizationId = currentOrganizationId;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        MedKids medKids = (MedKids) o;
+
+        if (!buildTime.equals(medKids.buildTime)) return false;
+        if (!fatherName.equals(medKids.fatherName)) return false;
+        if (!motherName.equals(medKids.motherName)) return false;
+        if (!phone.equals(medKids.phone)) return false;
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = phone.hashCode();
+        result = 31 * result + buildTime.hashCode();
+        result = 31 * result + fatherName.hashCode();
+        result = 31 * result + motherName.hashCode();
+        return result;
+    }
 }
\ No newline at end of file
diff --git a/mainData/src/main/resources/mainOrm/MedKids.xml b/mainData/src/main/resources/mainOrm/MedKids.xml
index bba80ee..851c49a 100644
--- a/mainData/src/main/resources/mainOrm/MedKids.xml
+++ b/mainData/src/main/resources/mainOrm/MedKids.xml
@@ -17,7 +17,7 @@
 </resultMap>
 
 <select id="getMedKids" resultMap="MedKidsResultMap" parameterType="java.lang.String">
-select ki_id,ki_name,ki_sex,ki_birthday,ki_guardianid,ki_currentOrganizationid,ki_barCode,phone,ki_buildoper, ki_buildtime,isdelete
+select ki_id,ki_name,ki_sex,ki_birthday,ki_guardianid,ki_currentOrganizationid,ki_barCode,phone,ki_buildoper, ki_buildtime,isdelete,fathername,mothername
 from med_kids
 WHERE ki_id = #{id,jdbcType=VARCHAR}
 </select>
@@ -36,7 +36,7 @@ limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER}
 
 <sql id="MedKidsCondition">
 <where>
- 1 = 1 
+ 1 = 1
 <if test="id != null and id != ''">
  and ki_id = #{id,jdbcType=VARCHAR}
 </if>
@@ -76,7 +76,7 @@ and ki_currentOrganizationid = #{currentOrganizationId,jdbcType=VARCHAR}
 
 
 <select id="queryMedKids" resultMap="MedKidsResultMap" parameterType="com.lymsh.yimiao.main.data.model.MedKidsQuery">
-select ki_id,ki_name,ki_sex,ki_birthday,ki_guardianid,ki_currentOrganizationid,ki_barCode,phone,ki_buildoper, ki_buildtime,isdelete
+select ki_id,ki_name,ki_sex,ki_birthday,ki_guardianid,ki_currentOrganizationid,ki_barCode,phone,ki_buildoper, ki_buildtime,isdelete,fathername,mothername
  from med_kids 
 <include refid="MedKidsCondition" />
 <include refid="orderAndLimit" />
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 7d1cbfe..0fa4e2b 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
@@ -4,8 +4,7 @@ import com.lymsh.mommybaby.basecommon.base.BaseController;
 import com.lymsh.mommybaby.basecommon.base.TokenRequired;
 import com.lymsh.mommybaby.basecommon.cache.redis.RedisUtils;
 import com.lymsh.mommybaby.basecommon.constant.ConstantInterface;
-import com.lymsh.mommybaby.basecommon.context.MommyBobyContext;
-import com.lymsh.mommybaby.basecommon.util.ContextHolder;
+import com.lymsh.mommybaby.basecommon.util.DateUtil;
 import com.lymsh.mommybaby.basecommon.util.ResultUtils;
 import com.lymsh.yimiao.main.data.enumdata.YnEnum;
 import com.lymsh.yimiao.main.data.model.*;
@@ -140,7 +139,7 @@ public class KidsController extends BaseController{
         medKidsQuery.setBirthday(birthday);
         medKidsQuery.setBarCode(barCode);
         medKidsQuery.setPhone(phone);
-        //medKidsQuery.setSort("");//时间排序
+        medKidsQuery.setSort("ki_buildtime desc");//时间排序
         medKidsQuery.setIsDelete("1");
         List<MedKids> medKidsList = medKidsService.queryMedKids(medKidsQuery);
 
@@ -148,16 +147,125 @@ public class KidsController extends BaseController{
 
         if (CollectionUtils.isNotEmpty(medKidsList)){
             //TODO 查出来的数据,可能会多条一样的和不一样的,有多条一样的情况下,取最新的一条,不一样的正常返回
+
+            Set<MedKids> set = new HashSet<>();
+
+            Map<MedKids,MedKids>  map  = new HashMap<>();
+
             for (MedKids data :medKidsList){
-                Map<String,Object> map = new HashMap<>();
-                map.put("id",data.getId());
-                map.put("name",data.getName());
-                list.add(map);
+
+                if (map.containsKey(data)){
+                    MedKids kids = map.get(data);
+                    Date mapDate = DateUtil.parseYMD(kids.getBuildTime());
+                    Date dataDate = DateUtil.parseYMD(data.getBuildTime());
+                    if(mapDate.after(dataDate)) {
+                        map.put(data, data);
+                    }
+                }else {
+                    set.add(data);
+                    map.put(data,data);
+                }
             }
+
+
+
+
+
         }
+
         ResultUtils.buildSuccessResultAndWrite(response,list);
     }
 
+
+    public static void main(String[] str) {
+        final Kids kids = new Kids();
+        kids.setPhone("110");
+        kids.setName("罗野");
+        kids.setFatherName("罗芭");
+        kids.setMotherName("罗马");
+        kids.setCreated("2016-05-04");
+        kids.setNumber(1);
+
+
+        Kids kids1 = new Kids();
+        kids1.setPhone("110");
+        kids1.setName("罗野");
+        kids1.setFatherName("罗芭");
+        kids1.setMotherName("罗马");
+        kids1.setCreated("2016-05-11");
+        kids1.setNumber(3);
+
+
+        Kids kids2 = new Kids();
+        kids2.setPhone("110");
+        kids2.setName("罗小野");
+        kids2.setFatherName("罗芭");
+        kids2.setMotherName("罗马");
+        kids2.setCreated("2016-05-03");
+        List<Kids> list = new ArrayList<>();
+        list.add(kids);
+        list.add(kids1);
+        list.add(kids2);
+        Set<Kids> set = new HashSet<>();
+        Map<Kids,Kids>  map  = new HashMap<>();
+
+
+        List<Kids> list1 = new ArrayList<>();
+        List<Kids> list2 = new ArrayList<>();
+
+        for (Kids data : list) {
+
+            if (!list1.contains(data)){
+                list1.add(data);
+            }else {
+                list2.add(data);
+            }
+
+
+//            if (map.containsKey(data)) {
+//                Kids k   = map.get(data);
+//                Date mapDate = DateUtil.parseYMD(k.getCreated());
+//                Date dataDate = DateUtil.parseYMD(data.getCreated());
+//                  if(mapDate.getTime()> dataDate.getTime()) {
+//                      map.put(data, data);
+//                    }
+//            } else{
+//                set.add(data);
+//                map.put(data,data);
+//            }
+        }
+
+        List<Kids> a = new ArrayList<>(set);
+
+//        Collections.sort(a, new Comparator<Kids>() {
+//
+//            private String key ="created";
+//
+//            @Override
+//            public int compare(Kids o1, Kids o2) {
+//                if (o1.getCreated()!=null && o2.getCreated()!=null){
+//                    if (o1.getCreated().getTime() ==o2.getCreated().getTime()) {
+//                        return 0;
+//                    }
+//                    if (o1.getCreated().getTime() >o2.getCreated().getTime()){
+//                        return -1;
+//                    }else {
+//                        return 1;
+//                    }
+//                }
+//                return 0;
+//            }
+//        });
+
+        for (Kids data :a){
+            System.out.println(data.getName());
+            System.out.println(data.getCreated());
+            System.out.println(data.getNumber());
+        }
+
+    }
+
+
     /**
      * 添加宝宝接口(当前登陆用户与小孩子进行关联
      * @param response
@@ -218,23 +326,22 @@ public class KidsController extends BaseController{
         Map<String, Object> map = new HashMap<>();
         map.put("id", kids.getId());
         map.put("name", kids.getName());
-        //TODO 这里需要把这个字符串转换成时间戳
-        map.put("birthday", kids.getBirthday());
+        map.put("birthday", DateUtil.getSecond(DateUtil.parseYMD(kids.getBirthday())));
 
         MedInoculateOrderQuery inoculateorderQuery = new MedInoculateOrderQuery();
         inoculateorderQuery.setIoKidId(id);
         //时间倒序
-        inoculateorderQuery.setIoInoculateTime("ioInoculateTime desc");
+        inoculateorderQuery.setSort("io_inoculateDate desc");
         List<MedInoculateOrder> inoculateorderList = medInoculateorderService.queryMedInoculateOrder(inoculateorderQuery);
         if (CollectionUtils.isNotEmpty(inoculateorderList)) {
             //取出离现在日期最近的一个预约接种
             MedInoculateOrder medInoculateorder = inoculateorderList.get(0);
             //下次接种时间
-            map.put("ioInoculateTime", medInoculateorder.getIoInoculateTime());
+            map.put("ioInoculateDate", DateUtil.getSecond(DateUtil.parseYMD(medInoculateorder.getIoInoculateDate())));
             //下次接种疫苗
             map.put("vaccineId", medInoculateorder.getIoVaccineId());
-            MedVaccineInfo medVaccineinfo = medVaccineinfoService.getMedVaccineInfo(medInoculateorder.getIoVaccineId());
-            map.put("vaccineName", medVaccineinfo == null ? "" : medVaccineinfo.getViName());
+            MedVaccineName medVaccineName = medVaccineNameService.getMedVaccineName(medInoculateorder.getIoVaccineId());
+            map.put("vaccineName", medVaccineName == null ? "" : medVaccineName.getVnName());
             //接种地点
             map.put("organizationId", medInoculateorder.getIoOrganizationId());
             MedOrganization medOrganization = medOrganizationService.getMedOrganization(medInoculateorder.getIoOrganizationId());
@@ -303,21 +410,18 @@ public class KidsController extends BaseController{
             }
         }
 
-
-
-
-
-
-
-
-
-
-
-
     }
 
+    /**
+     * 获取接种记录
+     * @param response
+     * @param request
+     */
+    @RequestMapping(value = "/inoculateRecord", method = RequestMethod.GET)
+    @TokenRequired
+    public void getKidVaccines(HttpServletResponse response,HttpServletRequest request){
 
-
+    }
 
 
 }
diff --git a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/NotificationsController.java b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/NotificationsController.java
index e3e9f9f..e737d99 100644
--- a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/NotificationsController.java
+++ b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/NotificationsController.java
@@ -1,8 +1,27 @@
 package com.lyms.yimiao.web.controller.v1;
 
 import com.lymsh.mommybaby.basecommon.base.BaseController;
+import com.lymsh.mommybaby.basecommon.base.TokenRequired;
+import com.lymsh.mommybaby.basecommon.bean.CommonResult;
+import com.lymsh.mommybaby.basecommon.util.DateUtil;
+import com.lymsh.mommybaby.basecommon.util.ResultUtils;
+import com.lymsh.yimiao.main.data.enumdata.YnEnum;
+import com.lymsh.yimiao.main.data.model.YmNotifications;
+import com.lymsh.yimiao.main.data.model.YmNotificationsQuery;
+import com.lymsh.yimiao.main.data.service.YmNotificationsService;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import javax.management.Notification;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  *
@@ -14,8 +33,43 @@ import org.springframework.web.bind.annotation.RequestMapping;
 @RequestMapping("/v1")
 public class NotificationsController extends BaseController{
 
+    @Autowired
+    private YmNotificationsService notificationsService;
+
     //获取消息(1.系统消息2.接种消息)
+    @RequestMapping(value = "/notifications", method = RequestMethod.GET)
+    @TokenRequired
+    public void getNotifications(HttpServletResponse response,
+                                 @RequestParam("page") int page,
+                                 @RequestParam("limit") int limit ){
+
+        YmNotificationsQuery notificationsQuery = new YmNotificationsQuery();
+        notificationsQuery.setYn(YnEnum.yes.getId());
+
+        notificationsQuery.setPage(page);
+        notificationsQuery.setLimit(limit);
+        notificationsQuery.setSort("created desc");
+        notificationsQuery.setNeed("y");
+
+        List<YmNotifications> notificationsList = notificationsService.queryYmNotifications(notificationsQuery);
+
+        List<Map> list = new ArrayList<>();
 
+        if (CollectionUtils.isNotEmpty(notificationsList)){
+            for (YmNotifications data : notificationsList){
+                Map<String,Object> map = new HashMap<>();
+                map.put("id",data.getId());
+                map.put("created", DateUtil.getSecond(data.getCreated()));
+                map.put("type",data.getType());
+                map.put("content",data.getContent());
+                list.add(map);
+            }
+        }
+        CommonResult result = new CommonResult();
+        result.setList(list);
+        result.setPageInfo(notificationsQuery.getPageInfo());
+        ResultUtils.buildSuccessResultAndWrite(response,result);
+    }
 
     //定时发送给当前登录用户接种通知
     /*
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 45a3c27..b63d3ce 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
@@ -15,6 +15,7 @@ import com.lymsh.yimiao.main.data.util.ImageUtil;
 import com.lymsh.yimiao.main.data.util.LoginContext;
 import com.lymsh.yimiao.main.data.util.LoginUtil;
 import com.lymsh.yimiao.main.data.util.PhoneUtil;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.MediaType;
@@ -109,6 +110,30 @@ public class UserController extends BaseController {
         }
     }
 
+    //暫時獲取token接口
+    @RequestMapping(value = "/userlogin", method = RequestMethod.POST)
+    public void userLogin(HttpServletResponse response,
+                          @RequestParam("phone") String phone){
+        YmUsersQuery query = new YmUsersQuery();
+        query.setPhone(phone);
+        query.setYn(YnEnum.yes.getId());
+        List<YmUsers> usersList = usersService.queryYmUsers(query);
+        Map<String, Object> map = new HashMap<>();
+        if (CollectionUtils.isNotEmpty(usersList)){
+            YmUsers users = usersList.get(0);
+            String token = tokenService.createToken(users.getId());
+            map.put("token", token);
+            map.put("id", users.getId());
+            users.setLastLoginTime(new Date());
+            usersService.updateYmUsers(users);
+            map.put("errorcode", 0);
+            map.put("errormsg", "成功");
+            writeJson(response,JsonUtil.obj2JsonString(map));
+        }else {
+            ResultUtils.buildParameterErrorResultAndWrite(response,"該手機不存在,請註冊");
+        }
+    }
+
     /**
      * 注册
      * @param response
diff --git a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/VaccineNamesController.java b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/VaccineNamesController.java
index 576343d..92583cc 100644
--- a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/VaccineNamesController.java
+++ b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/VaccineNamesController.java
@@ -12,7 +12,9 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**     疫苗信息接口
@@ -46,12 +48,30 @@ public class VaccineNamesController extends BaseController{
         map.put("title",medVaccineName.getVnName());
         //接种预防疾病
         map.put("preventDisease",medVaccineName.getVnPreventDisease());
-        //TODO 接种月龄 需要处理成  3月龄(1/2),6月龄(2/2)
-        map.put("mouthAge",medVaccineName.getVnMonthAge());
+        // 接种月龄 需要处理成  3月龄(1/2),6月龄(2/2)
+
+        String mouthAge = null;
+
+        if (medVaccineName.getVnMonthAge()!=null){
+            String[] ages = medVaccineName.getVnMonthAge().split(",");//1,2
+            List<String> list = new ArrayList();
+            for (int j = 0; j < ages.length ; j++) {
+                String q = ages[j]+"月齡"+"("+ (j+1) +"/"+ages.length+")";
+                list.add(q);
+            }
+            StringBuffer q = new StringBuffer();
+            for (String a : list){
+                q = q.append(a).append(",");
+            }
+            q.deleteCharAt(q.length()-1);
+
+            mouthAge = new String(q);
+        }
+        map.put("mouthAge",mouthAge);
         //接种部位
         map.put("position",medVaccineName.getVnPosition());
         //TODO 接种效果
-
+        map.put("InoculateEffect",null);
         //接种禁忌
         map.put("taboo",medVaccineName.getVnTaboo());
         //不良反应