diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 9021553..8d77c99 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -270,7 +270,11 @@ public class PatientFacade { if (StringUtils.isNotEmpty(patients.getBookbuildingDoctor())) { if (NumberUtils.isNumber(patients.getBookbuildingDoctor())) { Users users = usersService.getUsers(NumberUtils.toInt(patients.getBookbuildingDoctor())); - chanResult.setlName(users.getName()); + if (null!=users) { + chanResult.setlName(users.getName()); + }else{ + chanResult.setlName(patients.getBookbuildingDoctor()); + } } else { chanResult.setlName(patients.getBookbuildingDoctor()); } @@ -278,7 +282,11 @@ public class PatientFacade { if (StringUtils.isNotEmpty(patients.getLastCheckEmployeeId())) { if (NumberUtils.isNumber(patients.getLastCheckEmployeeId())) { Users users = usersService.getUsers(NumberUtils.toInt(patients.getLastCheckEmployeeId())); - chanResult.setCheckDoctor(users.getName()); + if(null!=users){ + chanResult.setCheckDoctor(users.getName()); + }else{ + chanResult.setCheckDoctor(patients.getLastCheckEmployeeId()); + } } else { chanResult.setCheckDoctor(patients.getLastCheckEmployeeId()); } @@ -320,7 +328,12 @@ public class PatientFacade { if (StringUtils.isNotEmpty(patients.getBookbuildingDoctor())) { if (NumberUtils.isNumber(patients.getBookbuildingDoctor())) { Users users = usersService.getUsers(NumberUtils.toInt(patients.getBookbuildingDoctor())); - quanPatientsResult.setlName(users.getName()); + if(null!=users){ + quanPatientsResult.setlName(users.getName()); + }else{ + quanPatientsResult.setlName(patients.getBookbuildingDoctor()); + } + } else { quanPatientsResult.setlName(patients.getBookbuildingDoctor()); } @@ -328,7 +341,11 @@ public class PatientFacade { if (StringUtils.isNotEmpty(patients.getLastCheckEmployeeId())) { if (NumberUtils.isNumber(patients.getLastCheckEmployeeId())) { Users users = usersService.getUsers(NumberUtils.toInt(patients.getLastCheckEmployeeId())); - quanPatientsResult.setCheckDoctor(users.getName()); + if(null!=users){ + quanPatientsResult.setCheckDoctor(users.getName()); + }else{ + quanPatientsResult.setCheckDoctor(patients.getLastCheckEmployeeId()); + } } else { quanPatientsResult.setCheckDoctor(patients.getLastCheckEmployeeId()); } @@ -372,7 +389,11 @@ public class PatientFacade { if (StringUtils.isNotEmpty(patients.getBookbuildingDoctor())) { if (NumberUtils.isNumber(patients.getBookbuildingDoctor())) { Users users = usersService.getUsers(NumberUtils.toInt(patients.getBookbuildingDoctor())); - riskPatientsResult.setlName(users.getName()); + if(null!=users){ + riskPatientsResult.setlName(users.getName()); + }else{ + riskPatientsResult.setlName(patients.getBookbuildingDoctor()); + } } else { riskPatientsResult.setlName(patients.getBookbuildingDoctor()); } @@ -380,7 +401,11 @@ public class PatientFacade { if (StringUtils.isNotEmpty(patients.getLastCheckEmployeeId())) { if (NumberUtils.isNumber(patients.getLastCheckEmployeeId())) { Users users = usersService.getUsers(NumberUtils.toInt(patients.getLastCheckEmployeeId())); - riskPatientsResult.setCheckDoctor(users.getName()); + if(null!=users){ + riskPatientsResult.setCheckDoctor(users.getName()); + }else{ + riskPatientsResult.setCheckDoctor(patients.getLastCheckEmployeeId()); + } } else { riskPatientsResult.setCheckDoctor(patients.getLastCheckEmployeeId()); }