From fbb66d1b215fc784741b9e7559660e021caf11a4 Mon Sep 17 00:00:00 2001
From: landong2015 <hanshaofeng@lymsh.com>
Date: Mon, 16 May 2016 21:11:38 +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

---
 .../java/com/lyms/yimiao/web/controller/v1/KidsController.java | 10 +++++-----
 .../lyms/yimiao/web/controller/v1/VaccineNamesController.java  |  2 +-
 webApi/src/main/webapp/WEB-INF/html/inoculateRecord.vm         |  8 +++++---
 webApi/src/main/webapp/WEB-INF/html/vaccineNameList.vm         |  9 ++++++++-
 4 files changed, 19 insertions(+), 10 deletions(-)

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 5bdae4e..6f4901f 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
@@ -173,12 +173,12 @@ public class KidsController extends BaseController {
                 query.setKidId(medKids.getId());
                 query.setUserId(users.getId());
                 int count = ymUserKidMapsService.queryYmUserKidMapsCount(query);
-                if (count > 0){
-                    map.put("relate",true);
-                }else if (count == 0){
-                    map.put("relate",false);
-                }
                 if (StringUtils.isNotEmpty(medKids.getName())) {
+                    if (count > 0){
+                        map.put("relate",true);
+                    }else if (count == 0){
+                        map.put("relate",false);
+                    }
                     map.put("id", medKids.getId());
                     map.put("name", medKids.getName());
                     map.put("sex",medKids.getSex());
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 71df920..5e01ba8 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
@@ -124,7 +124,7 @@ public class VaccineNamesController extends BaseController{
                 String[] ages = data.getVnMonthAge().split(",");//1,2
                 String monthAgeStr = "";
                 for (int j = 0; j < ages.length ; j++) {
-                    String q = ages[j]+"月齡"+"("+ (j+1) +"/"+ages.length+")";
+                    String q = ages[j]+"月龄"+"("+ (j+1) +"/"+ages.length+")";
                     monthAgeStr+=q;
                     if (ages.length-1 != j)
                     {
diff --git a/webApi/src/main/webapp/WEB-INF/html/inoculateRecord.vm b/webApi/src/main/webapp/WEB-INF/html/inoculateRecord.vm
index b01057a..eee7373 100644
--- a/webApi/src/main/webapp/WEB-INF/html/inoculateRecord.vm
+++ b/webApi/src/main/webapp/WEB-INF/html/inoculateRecord.vm
@@ -5,6 +5,10 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <title>接种记录</title>
 
+    <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
+    <meta content="IE=edge" http-equiv="X-UA-Compatible">
+    <meta content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0" name="viewport">
+
     <style>
 
         body {
@@ -120,9 +124,7 @@
         }
     </style>
 
-    <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
-    <meta content="IE=edge" http-equiv="X-UA-Compatible">
-    <meta content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0" name="viewport">
+
 </head>
 
 
diff --git a/webApi/src/main/webapp/WEB-INF/html/vaccineNameList.vm b/webApi/src/main/webapp/WEB-INF/html/vaccineNameList.vm
index be9acd5..7b3553b 100644
--- a/webApi/src/main/webapp/WEB-INF/html/vaccineNameList.vm
+++ b/webApi/src/main/webapp/WEB-INF/html/vaccineNameList.vm
@@ -5,6 +5,11 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <title>疫苗详情</title>
 
+    <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
+    <meta content="IE=edge" http-equiv="X-UA-Compatible">
+    <meta content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0" name="viewport">
+
+
     <style>
 
         body {
@@ -183,7 +188,9 @@
                     <span>接种禁忌</span>
                 </li>
                 <li class="content">
-                    <span>$!vaccineName.vnTaboo</span>
+                    <span class="text">
+                        $!vaccineName.vnTaboo
+                    </span>
                 </li>
                 <li class="header">
                     <span>不良反应</span>
-- 
1.8.3.1