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 66cec8d..b2f936a 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 @@ -290,8 +290,8 @@ public class KidsController extends BaseController { //最后一次接种时间 map.put("lastInculateTime",DateUtil.getSecond(DateUtil.parseYMDHMS(recordsList.get(0).getInoculateTime()))); }else { - map.put("lastInculateTime",""); -// map.put("lastInculateTime",null); +// map.put("lastInculateTime",""); + map.put("lastInculateTime",null); } //取出建档最早的那个 @@ -325,8 +325,8 @@ public class KidsController extends BaseController { MedInoculateOrder order = inoculateorderList.get(0); map.put("organizationId", order.getIoOrganizationId()); MedOrganization medOrganization = medOrganizationService.getMedOrganization(order.getIoOrganizationId()); - map.put("organizationName", medOrganization == null ? "" : medOrganization.getoName()); -// map.put("organizationName", medOrganization == null ? null : medOrganization.getoName()); +// map.put("organizationName", medOrganization == null ? "" : medOrganization.getoName()); + map.put("organizationName", medOrganization == null ? null : medOrganization.getoName()); for (MedInoculateOrder data : inoculateorderList){ Map orderMap = new HashMap<>(); @@ -336,8 +336,8 @@ public class KidsController extends BaseController { orderMap.put("vaccineId", data.getIoVaccineId()); //下次接种疫苗名称 MedVaccineName medVaccineName = medVaccineNameService.getMedVaccineName(data.getIoVaccineId()); - orderMap.put("vaccineName", medVaccineName == null ? "" : medVaccineName.getVnName()); -// orderMap.put("vaccineName", medVaccineName == null ? null : medVaccineName.getVnName()); +// orderMap.put("vaccineName", medVaccineName == null ? "" : medVaccineName.getVnName()); + orderMap.put("vaccineName", medVaccineName == null ? null : medVaccineName.getVnName()); //剂次 if (medVaccineName != null) { //总针数 @@ -368,10 +368,10 @@ public class KidsController extends BaseController { orderMap.put("ioInoculateDate", null); orderMap.put("vaccineId", null); orderMap.put("vaccineName", null); - orderMap.put("sum",""); -// orderMap.put("sum",null); - orderMap.put("jiCi",""); -// orderMap.put("jiCi",null); +// orderMap.put("sum",""); + orderMap.put("sum",null); +// orderMap.put("jiCi",""); + orderMap.put("jiCi",null); list.add(orderMap); map.put("inoculate",list); } diff --git a/webApi/src/main/resources/config.properties b/webApi/src/main/resources/config.properties index 4221702..80cd0c8 100644 --- a/webApi/src/main/resources/config.properties +++ b/webApi/src/main/resources/config.properties @@ -36,7 +36,7 @@ mailServerUsername=411441657@qq.com mailServerPassword=yt12304 redis.servers=192.168.5.250:6379:mommybaby123 -#redis.servers=192.168.1.43:6379:Lyms@2016 +//redis.servers=192.168.1.43:6379:Lyms@2016 ams.login.msg=֤{0}ڵ¼AMSDZ˲й¶ token.prefix=ams