diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyScreeningFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyScreeningFacade.java index ba1389a..044546a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyScreeningFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyScreeningFacade.java @@ -596,7 +596,12 @@ public class ApplyScreeningFacade { screeningOutResult.setOutDepartment(screeningModels.get(0).getOutDepartment()); screeningOutResult.setCreated(DateUtil.getYyyyMmDd(screeningModels.get(0).getCreated())); screeningOutResult.setReceived(DateUtil.getYyyyMmDd(screeningModels.get(0).getReceived())); - screeningOutResult.setApplyDoctor(screeningModels.get(0).getApplyDoctor()); + if(StringUtils.isNotEmpty(screeningModels.get(0).getApplyDoctor())){ + Users users = usersService.getUsers(NumberUtils.toInt(screeningModels.get(0).getApplyDoctor())); + if (null != users) { + screeningOutResult.setApplyDoctor(users.getName()); + } + } screeningOutResult.setId(screeningModels.get(0).getId()); } data.add(screeningOutResult); @@ -645,6 +650,7 @@ public class ApplyScreeningFacade { applyScreeningOutResult.setCreated(DateUtil.getYyyyMmDd(screeningModel.getCreated())); } applyScreeningOutResult.setrRisk(screeningModel.getrRisk()); + applyScreeningOutResult.setPhone(screeningModel.getPhone()); data.add(applyScreeningOutResult); }