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 @@