Commit 06df5aa37077eaa14566605b79b72b69eeba457d
1 parent
a4f005aeac
Exists in
master
提交代码
Showing 2 changed files with 11 additions and 11 deletions
webApi/src/main/java/com/lyms/yimiao/web/controller/v1/KidsController.java
View file @
06df5aa
| ... | ... | @@ -290,8 +290,8 @@ |
| 290 | 290 | //最后一次接种时间 |
| 291 | 291 | map.put("lastInculateTime",DateUtil.getSecond(DateUtil.parseYMDHMS(recordsList.get(0).getInoculateTime()))); |
| 292 | 292 | }else { |
| 293 | - map.put("lastInculateTime",""); | |
| 294 | -// map.put("lastInculateTime",null); | |
| 293 | +// map.put("lastInculateTime",""); | |
| 294 | + map.put("lastInculateTime",null); | |
| 295 | 295 | } |
| 296 | 296 | |
| 297 | 297 | //取出建档最早的那个 |
| ... | ... | @@ -325,8 +325,8 @@ |
| 325 | 325 | MedInoculateOrder order = inoculateorderList.get(0); |
| 326 | 326 | map.put("organizationId", order.getIoOrganizationId()); |
| 327 | 327 | MedOrganization medOrganization = medOrganizationService.getMedOrganization(order.getIoOrganizationId()); |
| 328 | - map.put("organizationName", medOrganization == null ? "" : medOrganization.getoName()); | |
| 329 | -// map.put("organizationName", medOrganization == null ? null : medOrganization.getoName()); | |
| 328 | +// map.put("organizationName", medOrganization == null ? "" : medOrganization.getoName()); | |
| 329 | + map.put("organizationName", medOrganization == null ? null : medOrganization.getoName()); | |
| 330 | 330 | |
| 331 | 331 | for (MedInoculateOrder data : inoculateorderList){ |
| 332 | 332 | Map<String, Object> orderMap = new HashMap<>(); |
| ... | ... | @@ -336,8 +336,8 @@ |
| 336 | 336 | orderMap.put("vaccineId", data.getIoVaccineId()); |
| 337 | 337 | //下次接种疫苗名称 |
| 338 | 338 | MedVaccineName medVaccineName = medVaccineNameService.getMedVaccineName(data.getIoVaccineId()); |
| 339 | - orderMap.put("vaccineName", medVaccineName == null ? "" : medVaccineName.getVnName()); | |
| 340 | -// orderMap.put("vaccineName", medVaccineName == null ? null : medVaccineName.getVnName()); | |
| 339 | +// orderMap.put("vaccineName", medVaccineName == null ? "" : medVaccineName.getVnName()); | |
| 340 | + orderMap.put("vaccineName", medVaccineName == null ? null : medVaccineName.getVnName()); | |
| 341 | 341 | //剂次 |
| 342 | 342 | if (medVaccineName != null) { |
| 343 | 343 | //总针数 |
| ... | ... | @@ -368,10 +368,10 @@ |
| 368 | 368 | orderMap.put("ioInoculateDate", null); |
| 369 | 369 | orderMap.put("vaccineId", null); |
| 370 | 370 | orderMap.put("vaccineName", null); |
| 371 | - orderMap.put("sum",""); | |
| 372 | -// orderMap.put("sum",null); | |
| 373 | - orderMap.put("jiCi",""); | |
| 374 | -// orderMap.put("jiCi",null); | |
| 371 | +// orderMap.put("sum",""); | |
| 372 | + orderMap.put("sum",null); | |
| 373 | +// orderMap.put("jiCi",""); | |
| 374 | + orderMap.put("jiCi",null); | |
| 375 | 375 | list.add(orderMap); |
| 376 | 376 | map.put("inoculate",list); |
| 377 | 377 | } |
webApi/src/main/resources/config.properties
View file @
06df5aa