diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedInoculateOrderQuery.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedInoculateOrderQuery.java
index f26e6a0..3f3f183 100644
--- a/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedInoculateOrderQuery.java
+++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedInoculateOrderQuery.java
@@ -2,6 +2,8 @@ package com.lymsh.yimiao.main.data.model;
 
 import com.lymsh.mommybaby.basecommon.base.BaseQuery;
 
+import java.util.List;
+
 public class MedInoculateOrderQuery extends BaseQuery{
     private String ioId;
     private String ioKidId;
@@ -12,6 +14,16 @@ public class MedInoculateOrderQuery extends BaseQuery{
     private String ioOrderOPer;
     private String ioOrderTime;
 
+    private List<String> ids;//多个id情况
+
+    public List<String> getIds() {
+        return ids;
+    }
+
+    public void setIds(List<String> ids) {
+        this.ids = ids;
+    }
+
     public String getIoId() {
         return ioId;
     }
diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedInoculateRecordQuery.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedInoculateRecordQuery.java
index ca19eb9..10a59c2 100644
--- a/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedInoculateRecordQuery.java
+++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedInoculateRecordQuery.java
@@ -2,6 +2,7 @@ package com.lymsh.yimiao.main.data.model;
 
 
 import java.util.Date;
+import java.util.List;
 
 import com.lymsh.mommybaby.basecommon.base.BaseQuery;
 
@@ -19,6 +20,16 @@ public class MedInoculateRecordQuery extends BaseQuery {
     private String icJiCi;
     private String isDelete;
 
+    private List<String> ids;//多个id情况
+
+    public List<String> getIds() {
+        return ids;
+    }
+
+    public void setIds(List<String> ids) {
+        this.ids = ids;
+    }
+
     public String getIsDelete() {
         return isDelete;
     }
diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedKidsQuery.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedKidsQuery.java
index c98bf1e..b428726 100644
--- a/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedKidsQuery.java
+++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedKidsQuery.java
@@ -3,6 +3,8 @@ package com.lymsh.yimiao.main.data.model;
 
 import com.lymsh.mommybaby.basecommon.base.BaseQuery;
 
+import java.util.List;
+
 
 public class MedKidsQuery extends BaseQuery {
     private String id;
@@ -17,6 +19,16 @@ public class MedKidsQuery extends BaseQuery {
     private String buildTime;//建档时间
     private String isDelete;//宝宝是否有效
 
+    private List<String> ids;//多个id情况
+
+    public List<String> getIds() {
+        return ids;
+    }
+
+    public void setIds(List<String> ids) {
+        this.ids = ids;
+    }
+
     public String getIsDelete() {
         return isDelete;
     }
diff --git a/mainData/src/main/resources/mainOrm/MedInoculaterecord.xml b/mainData/src/main/resources/mainOrm/MedInoculaterecord.xml
index 3018cb2..b098703 100644
--- a/mainData/src/main/resources/mainOrm/MedInoculaterecord.xml
+++ b/mainData/src/main/resources/mainOrm/MedInoculaterecord.xml
@@ -70,6 +70,12 @@ and ic_jici = #{icJiCi,jdbcType=VARCHAR}
  <if test="isDelete != null and isDelete != ''">
 and ic_delete = #{isDelete,jdbcType=VARCHAR}
 </if>
+ <if test="ids != null ">
+  and ic_kidId in
+  <foreach collection="ids" index="index" item="item" open="(" separator="," close=")">
+   #{item,jdbcType=VARCHAR}
+  </foreach>
+ </if>
 </where>
 </sql>
 
diff --git a/mainData/src/main/resources/mainOrm/MedKids.xml b/mainData/src/main/resources/mainOrm/MedKids.xml
index e03caf6..22cfd1b 100644
--- a/mainData/src/main/resources/mainOrm/MedKids.xml
+++ b/mainData/src/main/resources/mainOrm/MedKids.xml
@@ -70,6 +70,12 @@ and ki_currentOrganizationid = #{currentOrganizationId,jdbcType=VARCHAR}
  <if test="isDelete != null and isDelete != ''">
   and isdelete = #{isDelete,jdbcType=VARCHAR}
  </if>
+ <if test="ids != null ">
+  and ki_id in
+  <foreach collection="ids" index="index" item="item" open="(" separator="," close=")">
+    #{item,jdbcType=VARCHAR}
+  </foreach>
+ </if>
 </where>
 </sql>
 
@@ -90,5 +96,47 @@ select count(1) from med_kids
 </select>
 
 
+ <resultMap id="KidInoculationRecordMap" type="com.lymsh.yimiao.main.data.model.KidInoculationRecords">
+   <result column="KI_BIRTHDAY" property="birthday" jdbcType="VARCHAR" />
+   <result column="IC_KIDID" property="recordKidId" jdbcType="VARCHAR" />
+   <result column="IC_ID" property="recordId" jdbcType="VARCHAR" />
+   <result column="IC_VACCINEID" property="vaccineInfoId" jdbcType="VARCHAR" />
+   <result column="IC_INOCULATETIME" property="inoculateTime" jdbcType="VARCHAR" />
+   <result column="MONTH_AGE" property="monthAge" jdbcType="VARCHAR" />
+   <result column="IC_JICI" property="jiCi" jdbcType="VARCHAR" />
+   <result column="VI_NAME" property="vaccineInfoName" jdbcType="VARCHAR" />
+   <result column="VN_NAME" property="vaccineNameTitle" jdbcType="VARCHAR" />
+   <result column="VN_VACCINETYPE" property="vaccineType" jdbcType="VARCHAR" />
+   <result column="CNT" property="cnt" jdbcType="INTEGER" />
+ </resultMap>
+
+ <select id="queryInoculationRecord" resultMap="KidInoculationRecordMap" parameterType="java.lang.String">
+   SELECT D.KI_NAME,
+       TO_DATE(D.KI_BIRTHDAY,'YYYY/MM/DD') AS KI_BIRTHDAY,
+       B.IC_KIDID,
+       B.IC_ID,
+       B.IC_VACCINEID,
+       TO_DATE(B.IC_INOCULATETIME,'YYYY/MM/DD') AS IC_INOCULATETIME,
+       TRUNC(MONTHS_BETWEEN(TO_DATE(B.IC_INOCULATETIME,'YYYY/MM/DD'),TO_DATE(D.KI_BIRTHDAY,'YYYY/MM/DD'))) AS MONTH_AGE,
+       B.IC_JICI,
+       C.VI_NAME,
+       A.VN_NAME,
+       A.VN_VACCINETYPE,
+       CCC.CNT
+  FROM med_InoculateRecord B
+    INNER JOIN med_Vaccineinfo C ON B.IC_VACCINEID=C.VI_ID AND C.ISDELETE=1
+    INNER JOIN med_VaccineName A ON C.VI_VACCINENAMEID=A.VN_ID AND A.ISDELETE=1
+    INNER JOIN MED_KIDS D ON B.IC_KIDID=D.KI_ID
+    INNER JOIN (SELECT AA.VN_NAME,COUNT(DISTINCT b.column_value) AS CNT
+                FROM med_VaccineName AA, table(splitstr(AA.VN_MONTHAGE, ',')) b
+               WHERE AA.VN_MONTHAGE IS NOT NULL
+                 AND AA.ISDELETE = 1
+               GROUP BY AA.VN_NAME) CCC ON A.VN_NAME=CCC.VN_NAME
+  WHERE B.IC_DELETE = 1
+   AND B.IC_KIDID= #{recordKidId,jdbcType=VARCHAR}
+ </select>
+
+
+
 
 </mapper>
\ No newline at end of file
diff --git a/mainData/src/main/resources/mainOrm/MedOrganization.xml b/mainData/src/main/resources/mainOrm/MedOrganization.xml
index 814dfd7..b768bbd 100644
--- a/mainData/src/main/resources/mainOrm/MedOrganization.xml
+++ b/mainData/src/main/resources/mainOrm/MedOrganization.xml
@@ -14,7 +14,7 @@
 <result column="o_villageNo" property="oVillageNo" jdbcType="VARCHAR" />
 <result column="o_address" property="oAddress" jdbcType="VARCHAR" />
 <result column="o_isValid" property="oIsValid" jdbcType="VARCHAR" />
-<result column="isDelete" property="isDelete;" jdbcType="VARCHAR" />
+<result column="isDelete" property="isDelete" jdbcType="VARCHAR" />
 </resultMap>
 
 <select id="getMedOrganization" resultMap="MedOrganizationResultMap" parameterType="java.lang.String">
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 3933518..291e9c3 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
@@ -12,6 +12,7 @@ import com.lymsh.yimiao.main.data.model.*;
 import com.lymsh.yimiao.main.data.service.*;
 import com.lymsh.yimiao.main.data.util.JsonUtil;
 import com.lymsh.yimiao.main.data.util.LoginContext;
+import com.lymsh.yimiao.main.data.util.VaccineNameSington;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,7 +22,6 @@ 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 sun.security.util.Length;
 
 
 import javax.servlet.http.HttpServletRequest;
@@ -29,13 +29,13 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.*;
 
 /**
- *   宝宝接口
- *
+ * 宝宝接口
+ * <p/>
  * Created by Administrator on 2016/4/28 0028.
  */
 @Controller
 @RequestMapping("/v1")
-public class KidsController extends BaseController{
+public class KidsController extends BaseController {
 
     @Value("#{configProperties['yimiao.token']}")
     private String token;
@@ -63,6 +63,9 @@ public class KidsController extends BaseController{
 
     private final static String isDelete = "1";
 
+    @Autowired
+    private VaccineNameSington vaccineNameSington;
+
 //    /**
 //     * 发送验证码
 //     * @param response
@@ -93,21 +96,22 @@ public class KidsController extends BaseController{
 
     /**
      * 校验验证码
+     *
      * @param response
-     * @param code      发送给用户的验证码
+     * @param code     发送给用户的验证码
      */
     @RequestMapping(value = "/checkCode", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE + ";charset=utf-8")
     @TokenRequired
     public void checkCode(HttpServletResponse response,
                           @RequestParam("phone") String phone,
-                          @RequestParam("code") String code){
+                          @RequestParam("code") String code) {
 
         Map<String, Object> resultMsgMap = new HashMap<>();
 
         //通过手机拿到redis中的验证码,然后和用户输入的验证码做校验
         //从redis里面获取验证码
         Object verCodeObj = (Object) RedisUtils.getObj("c_" + phone);
-        if (verCodeObj==null){
+        if (verCodeObj == null) {
             //参数错误
             resultMsgMap.put(ResultUtils.ERROR_CODE, ConstantInterface.VER_CODE_EXPIRE);
             resultMsgMap.put(ResultUtils.ERROR_MSG, "验证码已过期,请重新获取.");
@@ -116,12 +120,12 @@ public class KidsController extends BaseController{
         }
 
         if (code.equals(verCodeObj)) {
-            resultMsgMap.put("idRight",true);
+            resultMsgMap.put("idRight", true);
             resultMsgMap.put(ResultUtils.ERROR_CODE, 0);
             resultMsgMap.put(ResultUtils.ERROR_MSG, "成功");
             writeJson(response, JsonUtil.obj2JsonString(resultMsgMap));
         } else {
-            resultMsgMap.put("idRight",false);
+            resultMsgMap.put("idRight", false);
             resultMsgMap.put(ResultUtils.ERROR_CODE, ConstantInterface.USER_PASSWORD_ERROR);
             resultMsgMap.put(ResultUtils.ERROR_MSG, "验证码错误,请重新输入");
             writeJson(response, JsonUtil.obj2JsonString(resultMsgMap));
@@ -130,6 +134,7 @@ public class KidsController extends BaseController{
 
     /**
      * 查询当前登陆账号所关联的宝宝,返回ID
+     *
      * @param response
      * @param birthday
      * @param barCode
@@ -138,9 +143,9 @@ public class KidsController extends BaseController{
     @RequestMapping(value = "/queryKidsId", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE + ";charset=utf-8")
     @TokenRequired
     public void getKidsId(HttpServletResponse response,
-                        @RequestParam("birthday") String birthday,
-                        @RequestParam(value = "barCode",required = false) String barCode,
-                        @RequestParam(value = "phone",required = false) String phone) {
+                          @RequestParam("birthday") String birthday,
+                          @RequestParam(value = "barCode", required = false) String barCode,
+                          @RequestParam(value = "phone", required = false) String phone) {
 
         MedKidsQuery medKidsQuery = new MedKidsQuery();
         medKidsQuery.setBirthday(birthday);
@@ -152,104 +157,116 @@ public class KidsController extends BaseController{
 
         List<Map> list = new ArrayList<>();
 
-        if (CollectionUtils.isNotEmpty(medKidsList)){
-
-            List<String> ids = null;
-
-            List<String> names = new ArrayList<>();
-            for (int i=0;i<medKidsList.size();i++){
-                Map<String,String> map = new HashMap<>();
-
-                ids = new ArrayList<>();
-                if(names.contains(medKidsList.get(i).getName())) continue;
-
-                names.add(medKidsList.get(i).getName());
+        if (CollectionUtils.isNotEmpty(medKidsList)) {
 
-                for (int j=0;j<medKidsList.size();j++){
-                    String id = medKidsList.get(j).getId();
-                    if(!ids.contains(medKidsList.get(j).getId()) && i == j) {
-                        ids.add(id);
-                    }
-
-                    if(medKidsList.get(i).getName().equals(medKidsList.get(j).getName()) && i != j && !ids.contains(j)){
-                        ids.add(id);
-                    }
-                }
-                String tmp = "";
-                for(String k : ids) {
-                    tmp += k  + ",";
+            for (MedKids medKids : medKidsList) {
+                Map<String, String> map = new HashMap<>();
+                if (StringUtils.isNotEmpty(medKids.getName())){
+                    map.put("id",medKids.getId());
+                    map.put("name",medKids.getName());
                 }
-                map.put("name",medKidsList.get(i).getName());
-                map.put("idStr",tmp.substring(0,tmp.length()-1));
-
                 list.add(map);
             }
         }
         ResultUtils.buildSuccessResultAndWrite(response, list);
+
+//            List<String> ids = null;
+//
+//            List<String> names = new ArrayList<>();
+//            for (int i = 0; i < medKidsList.size(); i++) {
+//                Map<String, String> map = new HashMap<>();
+//
+//                ids = new ArrayList<>();
+//                if (names.contains(medKidsList.get(i).getName())) continue;
+//
+//                names.add(medKidsList.get(i).getName());
+//
+//                for (int j = 0; j < medKidsList.size(); j++) {
+//                    String id = medKidsList.get(j).getId();
+//                    if (!ids.contains(medKidsList.get(j).getId()) && i == j) {
+//                        ids.add(id);
+//                    }
+//
+//                    if (medKidsList.get(i).getName().equals(medKidsList.get(j).getName()) && i != j && !ids.contains(j)) {
+//                        ids.add(id);
+//                    }
+//                }
+//                String tmp = "";
+//                for (String k : ids) {
+//                    tmp += k + ",";
+//                }
+//                map.put("name", medKidsList.get(i).getName());
+//                map.put("id", tmp.substring(0, tmp.length() - 1));
+//
+//                list.add(map);
+//            }
+//        }
+//        ResultUtils.buildSuccessResultAndWrite(response, list);
     }
 
     /**
-     * 添加宝宝接口(当前登陆用户与小孩子进行关联
+     * 添加宝宝接口(当前登陆用户与小孩子进行关联)
+     *
      * @param response
-     * @param idStr        宝宝id
+     * @param id       宝宝id
      */
     @RequestMapping(value = "/babys", method = RequestMethod.POST)
     @TokenRequired
     public void UserRelateKids(HttpServletResponse response,
                                HttpServletRequest request,
-                               @RequestParam("idStr")String idStr){
-        String[] ids = idStr.split("id");
-        for (String id : ids){
-            MedKids kids = medKidsService.getMedKids(id);
-            if (kids == null) {
-                ResultUtils.buildParameterErrorResultAndWrite(response, "宝宝id不存在");
-                return;
-            }
-            //取到当前登陆用户的id
-            LoginContext loginContext = (LoginContext) request.getAttribute("loginContext");
-            YmUsers users = usersService.getYmUsers(loginContext.getId());
-            //把查询到的宝宝id与登陆用户关联
-            YmUserKidMapsQuery query = new YmUserKidMapsQuery();
-            query.setUserId(users.getId());
-            query.setKidId(id);
-            query.setYn(YnEnum.yes.getId());
-            int count = ymUserKidMapsService.queryYmUserKidMapsCount(query);
-            if (count!=0){
-                continue;
-            }
-            YmUserKidMaps userKidMaps = new YmUserKidMaps();
-            userKidMaps.setUserId(users.getId());
-            userKidMaps.setKidId(id);
-            userKidMaps.setCreated(new Date());
-            userKidMaps.setYn(YnEnum.yes.getId());
-            ymUserKidMapsService.addYmUserKidMaps(userKidMaps);
+                               @RequestParam("id") String id) {
+        MedKids kids = medKidsService.getMedKids(id);
+        if (kids == null) {
+            ResultUtils.buildParameterErrorResultAndWrite(response, "宝宝id不存在");
+            return;
         }
+        //取到当前登陆用户的id
+        LoginContext loginContext = (LoginContext) request.getAttribute("loginContext");
+        YmUsers users = usersService.getYmUsers(loginContext.getId());
+        //把查询到的宝宝id与登陆用户关联
+        YmUserKidMapsQuery query = new YmUserKidMapsQuery();
+        query.setUserId(users.getId());
+        query.setKidId(id);
+        query.setYn(YnEnum.yes.getId());
+        int count = ymUserKidMapsService.queryYmUserKidMapsCount(query);
+        if (count != 0) {
+            //已经关联了的版本就不需要在关联,直接返回成功
+            ResultUtils.buildSuccessResultAndWrite(response);
+        }
+        YmUserKidMaps userKidMaps = new YmUserKidMaps();
+        userKidMaps.setUserId(users.getId());
+        userKidMaps.setKidId(id);
+        userKidMaps.setCreated(new Date());
+        userKidMaps.setYn(YnEnum.yes.getId());
+        ymUserKidMapsService.addYmUserKidMaps(userKidMaps);
         ResultUtils.buildSuccessResultAndWrite(response);
     }
 
     /**
-     *      获取宝宝信息
+     * 获取宝宝信息
      *
      * @param response
-     * @param id        宝宝id
+     * @param id       宝宝id
      */
-    @RequestMapping(value = "/babys", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE + ";charset=utf-8")
+    @RequestMapping(value = "/babys", method = RequestMethod.GET)
     @TokenRequired
     public void getKids(HttpServletResponse response,
-                        @RequestParam("id")String id) {
+                        @RequestParam("id") String id) {
         if (StringUtils.isBlank(id)) {
             ResultUtils.buildIdIsNull(response);
             return;
         }
-
+        //取出建档最早的那个
         MedKidsQuery query = new MedKidsQuery();
         query.setIsDelete(isDelete);
         query.setId(id);
+        query.setSort("KI_BUILDTIME DESC");
         List<MedKids> medKidList = medKidsService.queryMedKids(query);
 
         Map<String, Object> map = new HashMap<>();
 
-        if (CollectionUtils.isNotEmpty(medKidList)){
+        if (CollectionUtils.isNotEmpty(medKidList)) {
+            //取出第一个宝宝
             MedKids kids = medKidList.get(0);
 
             map.put("id", kids.getId());
@@ -257,7 +274,7 @@ public class KidsController extends BaseController{
             map.put("birthday", DateUtil.getSecond(DateUtil.parseYMD(kids.getBirthday())));
 
             MedInoculateOrderQuery inoculateorderQuery = new MedInoculateOrderQuery();
-            inoculateorderQuery.setIoKidId(id);
+            inoculateorderQuery.setIoKidId(kids.getId());
             //时间倒序
             inoculateorderQuery.setSort("io_inoculateDate desc");
             List<MedInoculateOrder> inoculateorderList = medInoculateorderService.queryMedInoculateOrder(inoculateorderQuery);
@@ -274,143 +291,133 @@ public class KidsController extends BaseController{
                 map.put("organizationId", medInoculateorder.getIoOrganizationId());
                 MedOrganization medOrganization = medOrganizationService.getMedOrganization(medInoculateorder.getIoOrganizationId());
                 map.put("organizationName", medOrganization == null ? "" : medOrganization.getoName());
-            }else {
+            } else {
                 map.put("ioInoculateTime", null);
                 map.put("vaccineId", null);
                 map.put("vaccineName", null);
                 map.put("organizationId", null);
                 map.put("organizationName", null);
             }
-        }else {
-            ResultUtils.buildParameterErrorResultAndWrite(response,"宝宝信息不存在");
+        } else {
+            ResultUtils.buildParameterErrorResultAndWrite(response, "宝宝信息不存在");
         }
         writeJson(response, JsonUtil.obj2JsonString(map));
     }
 
     /**
-     *  根据月龄获取宝宝该月龄预约接种的疫苗(分为免费疫苗和收费疫苗两个模块)
+     * 根据月龄获取宝宝该月龄预约接种的疫苗(分为免费疫苗和收费疫苗两个模块)
      *
      * @param response
-     * @param kidId        宝宝ID
+     * @param kidId    宝宝ID
      */
     @RequestMapping(value = "/inoculatePlan", method = RequestMethod.GET)
-    @TokenRequired
+    //@TokenRequired
     public void getKidVaccines(HttpServletResponse response,
-                               @RequestParam("birthday")String birthday,//2016-01-02
-                               @RequestParam("id")String kidId) {
-        //使用生日来和当前时间做比较,算出月龄
+                               @RequestParam("id") String kidId) {
+        List<MedVaccineName> nameList = vaccineNameSington.getListVaccineName();
+
+        List<KidInoculationRecords> recordsList = medKidsService.queryInoculationRecord(kidId);
 
-        //0,1.2.3.4.5.6.7.8.10.11.1岁,1岁半,2岁,3岁,4岁,6岁
         List<Map> list = new ArrayList<>();//最外层的list
 
-        for (MouthAgeEnum mouth : MouthAgeEnum.values()){
-            List<Map> mouthAgeList = new ArrayList<>();
-            Map<String,Object> mouthMap = new HashMap<>();
+        int monthYear = 0;
+
+        for (MouthAgeEnum ageEnum : MouthAgeEnum.values()){
 
-            Map<String,Object> inoculationMap = new HashMap<>();
+            Map<String, Object> map = new HashMap<>();
 
+            Map<String, Object> mouthMap = new HashMap<>();//装免费和收费的map
+            List<Map> mouthList = new ArrayList<>();//月龄的list
             List<Map> freeList = new ArrayList<>();
             List<Map> chargeList = new ArrayList<>();
 
-            String mouthAge = String.valueOf(mouth.getId());
-
-            //先根据月龄去找这个月龄下要接种的所有疫苗
-            MedVaccineNameQuery vaccineNameQuery = new MedVaccineNameQuery();
-            vaccineNameQuery.setVnMonthAge(mouthAge);
-            vaccineNameQuery.setIsDelete(isDelete);
-            List<MedVaccineName> vaccineNameList = medVaccineNameService.queryMedVaccineName(vaccineNameQuery);
-            if (CollectionUtils.isNotEmpty(vaccineNameList)){
-                for (MedVaccineName data : vaccineNameList){
+            for (MedVaccineName data : nameList){
+                if (ageEnum.getId()==data.getMouthAge()){
                     if (data.getVnVaccineType()==1){
-                        //免费
-                        freeList.add(getInoculate(data,mouthAge,kidId));
-                    }else if (data.getVnVaccineType()==2){
-                        //收费
-                        chargeList.add(getInoculate(data,mouthAge,kidId));
+                    Map<String,Object> freeMap = new HashMap<>();
+                    freeMap.put("id",data.getVnId());
+                    freeMap.put("name",data.getVnName());
+                    String[]a = data.getVnMonthAge().split(",");
+                    int sum = a.length;
+                    int current = 0 ;
+                    for (int i = 0;i<a.length;i++){
+                        if (data.getMouthAge()==Integer.valueOf(a[i])){
+                            current = i + 1;
+                        }
+                    }
+                    freeMap.put("current",current);
+                    freeMap.put("sum",sum);
+                    //接种ID
+                        if (CollectionUtils.isNotEmpty(recordsList)){
+                            for (KidInoculationRecords temp : recordsList){
+                                if (temp.getJiCi()==current && temp.getVaccineNameTitle() == data.getVnName()
+                                        && temp.getCnt() == sum && temp.getVaccineType().equals("1")){
+                                    freeMap.put("inoculateId", temp.getRecordId());
+                                    break;
+                                }else {
+                                    freeMap.put("inoculateId",null);
+                                }
+                            }
+                        }else {
+                            freeMap.put("inoculateId",null);
+                        }
+                    freeList.add(freeMap);
+                }else if (data.getVnVaccineType()==2) {
+                        Map<String, Object> chargeMap = new HashMap<>();
+                        chargeMap.put("id", data.getVnId());
+                        chargeMap.put("name", data.getVnName());
+                        String[] a = data.getVnMonthAge().split(",");
+                        int sum = a.length;
+                        int current = 0;
+                        for (int i = 0; i < a.length; i++) {
+                            if (data.getMouthAge() == Integer.valueOf(a[i])) {
+                                current = i + 1;
+                            }
+                        }
+                        chargeMap.put("current", current);
+                        chargeMap.put("sum", sum);
+                        //接种ID
+                        if (CollectionUtils.isNotEmpty(recordsList)){
+                            for (KidInoculationRecords temp : recordsList){
+                                if (temp.getJiCi()==current && temp.getVaccineNameTitle()==data.getVnName()
+                                        && temp.getCnt() == sum&& temp.getVaccineType().equals("2")){
+                                    chargeMap.put("inoculateId", temp.getRecordId());
+                                    break;
+                                }else {
+                                    chargeMap.put("inoculateId",null);
+                                }
+                            }
+                        }else {
+                            chargeMap.put("inoculateId",null);
+                        }
+                        chargeList.add(chargeMap);
                     }
                 }
-                inoculationMap.put("freeList",freeList);
-                inoculationMap.put("chargeList",chargeList);
             }
-            mouthAgeList.add(inoculationMap);
-
-            mouthMap.put("mouthAgeList",mouthAgeList);
-
-            list.add(mouthMap);
+            monthYear = monthYear + 1 ;
+            mouthMap.put("freeList",freeList);
+            mouthMap.put("chargeList",chargeList);
+            mouthList.add(mouthMap);
+            map.put(monthYear + "monthsOfAge", mouthList);
+            list.add(map);
         }
 
         ResultUtils.buildSuccessResultAndWrite(response,list);
     }
 
-    public Map<String,Object> getInoculate(MedVaccineName data,String mouthAge,String kidId){
-        Map<String,Object> map = new HashMap<>();
-
-        map.put("id",data.getVnId());//疫苗名称ID
-        map.put("name",data.getVnName());//疫苗名称title
-        String mouth = null;
-
-        int length = 0;
-
-        if (data.getVnMonthAge()!=null){
-
-            String[] ages = data.getVnMonthAge().split(",");
-            for (int a = 0 ; a < ages.length ; a++){
-                if (mouthAge.equals(ages[a])){
-                    length = a + 1;
-                }
-            }
-            mouth = "(第" + length + "/" + ages.length + "剂)";
-        }
-        map.put("mouthAge",mouth);
-
-        //去接种预约表里面查某个疫苗是否接种,如果在指定时间内没有接种
-
-        boolean isInoculate = false;
-        String vaccineInfoId = null;
-
-        //查出这个宝宝的所有接种信息
-        MedInoculateRecordQuery inoculateRecordQuery = new MedInoculateRecordQuery();
-        inoculateRecordQuery.setIcKidId(kidId);
-        inoculateRecordQuery.setIsDelete(isDelete);
-        List<MedInoculateRecord> inoculateRecordList = medInoculateRecordService.queryMedInoculateRecord(inoculateRecordQuery);
-        if (CollectionUtils.isNotEmpty(inoculateRecordList)){
-            for (MedInoculateRecord temp : inoculateRecordList){
-
-                MedVaccineInfoQuery infoQuery = new MedVaccineInfoQuery();
-                infoQuery.setIsDelete(isDelete);
-                infoQuery.setViId(temp.getIcVaccineId());
-                List<MedVaccineInfo> infoList = medVaccineinfoService.queryMedVaccineInfo(infoQuery);
-
-                String VaccineNameId = "";
-
-                if (CollectionUtils.isNotEmpty(infoList)){
-                    VaccineNameId = infoList.get(0).getViVaccineNameId();
-                }
-
-                //最后使用剂次和疫苗名称ID来判断接种表里面宝宝的接种是否成立
-                if (length==Integer.valueOf(temp.getIcJiCi()) && data.getVnId().equals(VaccineNameId)){
-                    isInoculate = true;
-                    vaccineInfoId = temp.getIcVaccineId();
-                }
-            }
-        }
-        map.put("isInoculate",isInoculate);
-        map.put("vaccineInfoId",vaccineInfoId);
-        return map;
-    }
-
     /**
      * 获取接种记录
+     *
      * @param response
      * @param kidId         宝宝ID
-     * @param vaccineInfoId     疫苗基本信息ID
+     * @param vaccineInfoId 疫苗基本信息ID
      */
     @RequestMapping(value = "/inoculateRecord", method = RequestMethod.GET)
     @TokenRequired
     public void getKidVaccines(HttpServletResponse response,
-                               @RequestParam("kidId")String kidId,
-                               @RequestParam("jiCi")String jiCi,
-                               @RequestParam("vaccineInfoId")String vaccineInfoId){
+                               @RequestParam("kidId") String kidId,
+                               @RequestParam("jiCi") String jiCi,
+                               @RequestParam("vaccineInfoId") String vaccineInfoId) {
 
         List<Map> list = new ArrayList<>();
 
@@ -455,7 +462,7 @@ public class KidsController extends BaseController{
             map.put("batchNumber", data.getIcBatchNumber());
             list.add(map);
         }
-        ResultUtils.buildSuccessResultAndWrite(response,list);
+        ResultUtils.buildSuccessResultAndWrite(response, list);
     }