Commit fbb66d1b215fc784741b9e7559660e021caf11a4
1 parent
559d5c2bb1
Exists in
master
提交代码
Showing 4 changed files with 19 additions and 10 deletions
webApi/src/main/java/com/lyms/yimiao/web/controller/v1/KidsController.java
View file @
fbb66d1
| ... | ... | @@ -173,12 +173,12 @@ |
| 173 | 173 | query.setKidId(medKids.getId()); |
| 174 | 174 | query.setUserId(users.getId()); |
| 175 | 175 | int count = ymUserKidMapsService.queryYmUserKidMapsCount(query); |
| 176 | - if (count > 0){ | |
| 177 | - map.put("relate",true); | |
| 178 | - }else if (count == 0){ | |
| 179 | - map.put("relate",false); | |
| 180 | - } | |
| 181 | 176 | if (StringUtils.isNotEmpty(medKids.getName())) { |
| 177 | + if (count > 0){ | |
| 178 | + map.put("relate",true); | |
| 179 | + }else if (count == 0){ | |
| 180 | + map.put("relate",false); | |
| 181 | + } | |
| 182 | 182 | map.put("id", medKids.getId()); |
| 183 | 183 | map.put("name", medKids.getName()); |
| 184 | 184 | map.put("sex",medKids.getSex()); |
webApi/src/main/java/com/lyms/yimiao/web/controller/v1/VaccineNamesController.java
View file @
fbb66d1
| ... | ... | @@ -124,7 +124,7 @@ |
| 124 | 124 | String[] ages = data.getVnMonthAge().split(",");//1,2 |
| 125 | 125 | String monthAgeStr = ""; |
| 126 | 126 | for (int j = 0; j < ages.length ; j++) { |
| 127 | - String q = ages[j]+"月齡"+"("+ (j+1) +"/"+ages.length+")"; | |
| 127 | + String q = ages[j]+"月龄"+"("+ (j+1) +"/"+ages.length+")"; | |
| 128 | 128 | monthAgeStr+=q; |
| 129 | 129 | if (ages.length-1 != j) |
| 130 | 130 | { |
webApi/src/main/webapp/WEB-INF/html/inoculateRecord.vm
View file @
fbb66d1
| ... | ... | @@ -5,6 +5,10 @@ |
| 5 | 5 | <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> |
| 6 | 6 | <title>接种记录</title> |
| 7 | 7 | |
| 8 | + <meta content="text/html; charset=utf-8" http-equiv="Content-Type"> | |
| 9 | + <meta content="IE=edge" http-equiv="X-UA-Compatible"> | |
| 10 | + <meta content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0" name="viewport"> | |
| 11 | + | |
| 8 | 12 | <style> |
| 9 | 13 | |
| 10 | 14 | body { |
| ... | ... | @@ -120,9 +124,7 @@ |
| 120 | 124 | } |
| 121 | 125 | </style> |
| 122 | 126 | |
| 123 | - <meta content="text/html; charset=utf-8" http-equiv="Content-Type"> | |
| 124 | - <meta content="IE=edge" http-equiv="X-UA-Compatible"> | |
| 125 | - <meta content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0" name="viewport"> | |
| 127 | + | |
| 126 | 128 | </head> |
| 127 | 129 | |
| 128 | 130 |
webApi/src/main/webapp/WEB-INF/html/vaccineNameList.vm
View file @
fbb66d1
| ... | ... | @@ -5,6 +5,11 @@ |
| 5 | 5 | <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> |
| 6 | 6 | <title>疫苗详情</title> |
| 7 | 7 | |
| 8 | + <meta content="text/html; charset=utf-8" http-equiv="Content-Type"> | |
| 9 | + <meta content="IE=edge" http-equiv="X-UA-Compatible"> | |
| 10 | + <meta content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0" name="viewport"> | |
| 11 | + | |
| 12 | + | |
| 8 | 13 | <style> |
| 9 | 14 | |
| 10 | 15 | body { |
| ... | ... | @@ -183,7 +188,9 @@ |
| 183 | 188 | <span>接种禁忌</span> |
| 184 | 189 | </li> |
| 185 | 190 | <li class="content"> |
| 186 | - <span>$!vaccineName.vnTaboo</span> | |
| 191 | + <span class="text"> | |
| 192 | + $!vaccineName.vnTaboo | |
| 193 | + </span> | |
| 187 | 194 | </li> |
| 188 | 195 | <li class="header"> |
| 189 | 196 | <span>不良反应</span> |