Commit 862fd4f7c10970bdffe9cc4d0194edd7b75adcd5
1 parent
8ba47fdc49
Exists in
dev
#fix:优化
Showing 1 changed file with 9 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
View file @
862fd4f
| ... | ... | @@ -3325,12 +3325,12 @@ |
| 3325 | 3325 | patientsQuery.setHighRiskFileCode(patientManagerRequest.getHighRiskFileCode()); |
| 3326 | 3326 | // System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString()); |
| 3327 | 3327 | if (StringUtils.isNotEmpty(patientManagerRequest.getLastCheckEmployeeId())){ |
| 3328 | - Integer userCheckId = usersService.getUserId(hospitalId,patientManagerRequest.getLastCheckEmployeeId()); | |
| 3328 | + /*Integer userCheckId = usersService.getUserId(hospitalId,patientManagerRequest.getLastCheckEmployeeId()); | |
| 3329 | 3329 | if (userCheckId!=null){ |
| 3330 | 3330 | patientsQuery.setLastCheckEmployeeId(String.valueOf(userCheckId)); |
| 3331 | - }else { | |
| 3331 | + }else {*/ | |
| 3332 | 3332 | patientsQuery.setLastCheckEmployeeId(patientManagerRequest.getLastCheckEmployeeId()); |
| 3333 | - } | |
| 3333 | + //} | |
| 3334 | 3334 | } |
| 3335 | 3335 | |
| 3336 | 3336 | |
| 3337 | 3337 | |
| ... | ... | @@ -3452,12 +3452,17 @@ |
| 3452 | 3452 | //TODO 优化产检医生是汉字的逻辑 |
| 3453 | 3453 | String lastCheckEmployeeId = ""; |
| 3454 | 3454 | if (StringUtils.isNotEmpty(patients.getLastCheckEmployeeId())) { |
| 3455 | - Users user = usersService.getUsers(Integer.valueOf(patients.getLastCheckEmployeeId())); | |
| 3455 | + Integer userCheckId = usersService.getUserId(hospitalId,patientManagerRequest.getLastCheckEmployeeId()); | |
| 3456 | + if (userCheckId==null){ | |
| 3457 | + userCheckId=Integer.valueOf(patients.getLastCheckEmployeeId()); | |
| 3458 | + } | |
| 3459 | + Users user = usersService.getUsers(userCheckId); | |
| 3456 | 3460 | if (user != null) { |
| 3457 | 3461 | lastCheckEmployeeId = user.getName(); |
| 3458 | 3462 | } else { |
| 3459 | 3463 | System.out.println(patients.getId() + ";no user lastCheckEmployeeId" + patients.getLastCheckEmployeeId()); |
| 3460 | 3464 | } |
| 3465 | + | |
| 3461 | 3466 | } |
| 3462 | 3467 | //初诊时间和初诊医生字段展示,作为模块化 |
| 3463 | 3468 | if (StringUtils.isNotEmpty(patients.getFirstCheckId())) { |