Commit 15687c943329e14067f4d9f0500b85c9c5c08c9b
1 parent
3b7f548a46
Exists in
master
and in
8 other branches
孕妇分娩后 变成产妇
Showing 1 changed file with 31 additions and 6 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
View file @
15687c9
| ... | ... | @@ -270,7 +270,11 @@ |
| 270 | 270 | if (StringUtils.isNotEmpty(patients.getBookbuildingDoctor())) { |
| 271 | 271 | if (NumberUtils.isNumber(patients.getBookbuildingDoctor())) { |
| 272 | 272 | Users users = usersService.getUsers(NumberUtils.toInt(patients.getBookbuildingDoctor())); |
| 273 | - chanResult.setlName(users.getName()); | |
| 273 | + if (null!=users) { | |
| 274 | + chanResult.setlName(users.getName()); | |
| 275 | + }else{ | |
| 276 | + chanResult.setlName(patients.getBookbuildingDoctor()); | |
| 277 | + } | |
| 274 | 278 | } else { |
| 275 | 279 | chanResult.setlName(patients.getBookbuildingDoctor()); |
| 276 | 280 | } |
| ... | ... | @@ -278,7 +282,11 @@ |
| 278 | 282 | if (StringUtils.isNotEmpty(patients.getLastCheckEmployeeId())) { |
| 279 | 283 | if (NumberUtils.isNumber(patients.getLastCheckEmployeeId())) { |
| 280 | 284 | Users users = usersService.getUsers(NumberUtils.toInt(patients.getLastCheckEmployeeId())); |
| 281 | - chanResult.setCheckDoctor(users.getName()); | |
| 285 | + if(null!=users){ | |
| 286 | + chanResult.setCheckDoctor(users.getName()); | |
| 287 | + }else{ | |
| 288 | + chanResult.setCheckDoctor(patients.getLastCheckEmployeeId()); | |
| 289 | + } | |
| 282 | 290 | } else { |
| 283 | 291 | chanResult.setCheckDoctor(patients.getLastCheckEmployeeId()); |
| 284 | 292 | } |
| ... | ... | @@ -320,7 +328,12 @@ |
| 320 | 328 | if (StringUtils.isNotEmpty(patients.getBookbuildingDoctor())) { |
| 321 | 329 | if (NumberUtils.isNumber(patients.getBookbuildingDoctor())) { |
| 322 | 330 | Users users = usersService.getUsers(NumberUtils.toInt(patients.getBookbuildingDoctor())); |
| 323 | - quanPatientsResult.setlName(users.getName()); | |
| 331 | + if(null!=users){ | |
| 332 | + quanPatientsResult.setlName(users.getName()); | |
| 333 | + }else{ | |
| 334 | + quanPatientsResult.setlName(patients.getBookbuildingDoctor()); | |
| 335 | + } | |
| 336 | + | |
| 324 | 337 | } else { |
| 325 | 338 | quanPatientsResult.setlName(patients.getBookbuildingDoctor()); |
| 326 | 339 | } |
| ... | ... | @@ -328,7 +341,11 @@ |
| 328 | 341 | if (StringUtils.isNotEmpty(patients.getLastCheckEmployeeId())) { |
| 329 | 342 | if (NumberUtils.isNumber(patients.getLastCheckEmployeeId())) { |
| 330 | 343 | Users users = usersService.getUsers(NumberUtils.toInt(patients.getLastCheckEmployeeId())); |
| 331 | - quanPatientsResult.setCheckDoctor(users.getName()); | |
| 344 | + if(null!=users){ | |
| 345 | + quanPatientsResult.setCheckDoctor(users.getName()); | |
| 346 | + }else{ | |
| 347 | + quanPatientsResult.setCheckDoctor(patients.getLastCheckEmployeeId()); | |
| 348 | + } | |
| 332 | 349 | } else { |
| 333 | 350 | quanPatientsResult.setCheckDoctor(patients.getLastCheckEmployeeId()); |
| 334 | 351 | } |
| ... | ... | @@ -372,7 +389,11 @@ |
| 372 | 389 | if (StringUtils.isNotEmpty(patients.getBookbuildingDoctor())) { |
| 373 | 390 | if (NumberUtils.isNumber(patients.getBookbuildingDoctor())) { |
| 374 | 391 | Users users = usersService.getUsers(NumberUtils.toInt(patients.getBookbuildingDoctor())); |
| 375 | - riskPatientsResult.setlName(users.getName()); | |
| 392 | + if(null!=users){ | |
| 393 | + riskPatientsResult.setlName(users.getName()); | |
| 394 | + }else{ | |
| 395 | + riskPatientsResult.setlName(patients.getBookbuildingDoctor()); | |
| 396 | + } | |
| 376 | 397 | } else { |
| 377 | 398 | riskPatientsResult.setlName(patients.getBookbuildingDoctor()); |
| 378 | 399 | } |
| ... | ... | @@ -380,7 +401,11 @@ |
| 380 | 401 | if (StringUtils.isNotEmpty(patients.getLastCheckEmployeeId())) { |
| 381 | 402 | if (NumberUtils.isNumber(patients.getLastCheckEmployeeId())) { |
| 382 | 403 | Users users = usersService.getUsers(NumberUtils.toInt(patients.getLastCheckEmployeeId())); |
| 383 | - riskPatientsResult.setCheckDoctor(users.getName()); | |
| 404 | + if(null!=users){ | |
| 405 | + riskPatientsResult.setCheckDoctor(users.getName()); | |
| 406 | + }else{ | |
| 407 | + riskPatientsResult.setCheckDoctor(patients.getLastCheckEmployeeId()); | |
| 408 | + } | |
| 384 | 409 | } else { |
| 385 | 410 | riskPatientsResult.setCheckDoctor(patients.getLastCheckEmployeeId()); |
| 386 | 411 | } |