shiyang / regional-platform

Download as
Browse Code ยป

Commit 5f77b2245a91e80e18f64f19bd1cf26ae8e8a172

Authored by jiangjiazhi
2 parents 42ad4909c5 e97e9f71f2
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 1 changed file

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 5f77b22
... ... @@ -1274,10 +1274,22 @@
1274 1274 result.setPatientId(model.getParentId());
1275 1275  
1276 1276 String diagnose = "";
1277   - if (!StringUtils.isEmpty(model.getDiagnose())) {
1278   - List diagList = JsonUtil.toList(model.getDiagnose(), List.class);
  1277 +// if (!StringUtils.isEmpty(model.getDiagnose())) {
  1278 +// List diagList = JsonUtil.toList(model.getDiagnose(), List.class);
  1279 +// if (CollectionUtils.isNotEmpty(diagList)) {
  1280 +// diagnose = "";
  1281 +// for (Object obj : diagList) {
  1282 +// BasicConfig basicConfig = basicConfigService.getOneBasicConfigById((String) obj);
  1283 +// if (basicConfig != null) {
  1284 +// diagnose += basicConfig.getName() + " ";
  1285 +// }
  1286 +// }
  1287 +// }
  1288 +// }
  1289 + if (StringUtils.isNotEmpty(model.getPid()))
  1290 + {
  1291 + List diagList = babyCheckFacade.getBabyLastDiagnose(model.getPid());
1279 1292 if (CollectionUtils.isNotEmpty(diagList)) {
1280   - diagnose = "";
1281 1293 for (Object obj : diagList) {
1282 1294 BasicConfig basicConfig = basicConfigService.getOneBasicConfigById((String) obj);
1283 1295 if (basicConfig != null) {