From fab44712ffaf4acb65de52507892997673c87a18 Mon Sep 17 00:00:00 2001
From: landong2015 <hanshaofeng@lymsh.com>
Date: Mon, 2 May 2016 15:41:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yimiao/web/controller/v1/ConfigController.java |  4 +-
 .../yimiao/web/controller/v1/KidsController.java   | 66 +++++++++++++++++++++-
 .../yimiao/web/controller/v1/UserController.java   |  2 +-
 3 files changed, 67 insertions(+), 5 deletions(-)

diff --git a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/ConfigController.java b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/ConfigController.java
index 9ace7cf..0ed2bab 100644
--- a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/ConfigController.java
+++ b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/ConfigController.java
@@ -28,7 +28,7 @@ public class ConfigController extends BaseController{
      */
     @RequestMapping(value = "/iosConfigs", method = RequestMethod.GET)
     public void getIosConfig(HttpServletResponse response) {
-        AppVersion version = new AppVersion(100, "1.0.0", "","");
+        AppVersion version = new AppVersion(100, "1.0.0", "当前为最新版本","");
         Map<String, Object> map = new HashMap<>();
         map.put("version", version);
         map.put("errorcode", ConstantInterface.SUCCESS);
@@ -42,7 +42,7 @@ public class ConfigController extends BaseController{
      */
     @RequestMapping(value = "/androidConfigs", method = RequestMethod.GET)
     public void getAndroidConfig(HttpServletResponse response) {
-        AppVersion version = new AppVersion(100, "1.0.0", "","");
+        AppVersion version = new AppVersion(100, "1.0.0", "当前为最新版本","");
         Map<String, Object> map = new HashMap<>();
         map.put("version", version);
         map.put("forceUpdate", 0);
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 93b57d7..9c24736 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
@@ -49,6 +49,10 @@ public class KidsController extends BaseController{
     private MedVaccineInfoService medVaccineinfoService;
     @Autowired
     private MedOrganizationService medOrganizationService;
+    @Autowired
+    private MedVaccineNameService medVaccineNameService;
+    @Autowired
+    private MedInoculateRecordService medInoculateRecordService;
 
 
 //    /**
@@ -152,7 +156,11 @@ public class KidsController extends BaseController{
         ResultUtils.buildSuccessResultAndWrite(response,list);
     }
 
-    //添加宝宝接口(当前登陆用户与小孩子进行关联)
+    /**
+     * 添加宝宝接口(当前登陆用户与小孩子进行关联
+     * @param response
+     * @param id        宝宝id
+     */
     @RequestMapping(value = "/relateKids", method = RequestMethod.POST)
     @TokenRequired
     public void UserRelateKids(HttpServletResponse response,
@@ -242,7 +250,61 @@ public class KidsController extends BaseController{
     @RequestMapping(value = "/kidsVaccines", method = RequestMethod.GET)
     @TokenRequired
     public void getKidVaccines(HttpServletResponse response,
-                        @RequestParam("mouthAge")String mouthAge) {
+                        @RequestParam("mouthAge")String mouthAge,
+                        @RequestParam("id")String id) {
+
+        List<Map> list = new ArrayList<>();
+        List<Map> freeList = new ArrayList<>();
+        List<Map> chargeList = new ArrayList<>();
+
+        //先根据月龄去找这个月龄下要接种的所有疫苗
+        MedVaccineNameQuery vaccineNameQuery = new MedVaccineNameQuery();
+        vaccineNameQuery.setVnMonthAge(mouthAge);
+        List<MedVaccineName> vaccineNameList = medVaccineNameService.queryMedVaccineName(vaccineNameQuery);
+        if (CollectionUtils.isNotEmpty(vaccineNameList)){
+            for (MedVaccineName data : vaccineNameList){
+                //免费
+                if (data.getVnVaccineType()==1){
+                    Map<String,Object> map = new HashMap<>();
+
+                    map.put("id",data.getVnId());
+                    map.put("name",data.getVnName());
+                    //需要处理剂次
+                    map.put("jiCi","");
+                    //去接种预约表里面查某个疫苗是否接种,如果在指定时间内没有接种
+                    MedInoculateRecordQuery inoculateRecordQuery = new MedInoculateRecordQuery();
+                    inoculateRecordQuery.setIcKidId(id);
+                    inoculateRecordQuery.setIcVaccineId(data.getVnId());
+                    List<MedInoculateRecord> inoculateRecordList = medInoculateRecordService.queryMedInoculateRecord(inoculateRecordQuery);
+                    if (CollectionUtils.isNotEmpty(inoculateRecordList)){
+                        MedInoculateRecord medInoculateRecord = inoculateRecordList.get(0);
+
+
+                    }
+
+
+
+                //收费
+                }else if (data.getVnVaccineType()==2){
+                    Map<String,Object> map = new HashMap<>();
+
+
+
+
+                }
+            }
+        }
+
+
+
+
+
+
+
+
+
+
+
 
     }
 
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 64a2c09..437822a 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
@@ -184,7 +184,7 @@ public class UserController extends BaseController {
      * @param avatar
      * @param nickname
      */
-    @RequestMapping(value = "/updateUserInfo", method = RequestMethod.PUT)
+    @RequestMapping(value = "/usersInfo", method = RequestMethod.PUT)
     @TokenRequired
     public void updateUser(HttpServletResponse response,
                                @RequestParam(value = "avatar",required = false) String avatar,
-- 
1.8.3.1