Commit f46e65f723bb8b7b2f843b5b2dfd95e56eef8d91
1 parent
1141261708
Exists in
master
and in
1 other branch
update code
Showing 1 changed file with 29 additions and 1 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
View file @
f46e65f
| ... | ... | @@ -356,7 +356,35 @@ |
| 356 | 356 | //result.setHighRiskReason(model.getHighRiskReason()); |
| 357 | 357 | result.setExpVip(model.getExpVip()); |
| 358 | 358 | result.setMremark(model.getMremark() == null ? "" : model.getMremark()); |
| 359 | - result.setDiagnose(JsonUtil.toList(model.getDiagnose(),List.class)); | |
| 359 | + | |
| 360 | + List<Map<String, String>> list = new ArrayList<>(); | |
| 361 | + String diagnoseStr = model.getDiagnose(); | |
| 362 | + if (!StringUtils.isEmpty(diagnoseStr)) | |
| 363 | + { | |
| 364 | + List diagnoses = JsonUtil.toList(diagnoseStr,List.class); | |
| 365 | + for (Object obj : diagnoses) | |
| 366 | + { | |
| 367 | + if (obj != null) | |
| 368 | + { | |
| 369 | + BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); | |
| 370 | + basicConfigQuery.setYn(YnEnums.YES.getId()); | |
| 371 | + basicConfigQuery.setParentId(SystemConfig.DIAGNOSE_TYPE_ID); | |
| 372 | + basicConfigQuery.setId(String.valueOf(obj)); | |
| 373 | + List<BasicConfig> datas = basicConfigService.queryBasicConfig(basicConfigQuery); | |
| 374 | + if (CollectionUtils.isNotEmpty(datas)) | |
| 375 | + { | |
| 376 | + Map<String,String> map = new HashMap<>(); | |
| 377 | + map.put("id", datas.get(0).getId()); | |
| 378 | + map.put("name",datas.get(0).getName()); | |
| 379 | + list.add(map); | |
| 380 | + } | |
| 381 | + } | |
| 382 | + | |
| 383 | + } | |
| 384 | + } | |
| 385 | + result.setDiagnose(list); | |
| 386 | + | |
| 387 | + | |
| 360 | 388 | //result.setVipEndTime(DateUtil.getyyyy_MM_dd(model.getVipEndTime())); |
| 361 | 389 | result.setServiceStatus(String.valueOf(model.getServiceStatus())); |
| 362 | 390 |