Commit b638793b0b359ecfb4612a159bdb681240c405f0
1 parent
2a5a410da1
Exists in
dev
#fix:优化大同建档管理页面产检医生查询逻辑
Showing 1 changed file with 8 additions and 5 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
View file @
b638793
| ... | ... | @@ -3324,12 +3324,15 @@ |
| 3324 | 3324 | patientsQuery.setType(patientManagerRequest.getType()); |
| 3325 | 3325 | patientsQuery.setHighRiskFileCode(patientManagerRequest.getHighRiskFileCode()); |
| 3326 | 3326 | // System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString()); |
| 3327 | - Integer userCheckId = usersService.getUserId(hospitalId,patientManagerRequest.getLastCheckEmployeeId()); | |
| 3328 | - if (userCheckId!=null){ | |
| 3329 | - patientsQuery.setLastCheckEmployeeId(String.valueOf(userCheckId)); | |
| 3330 | - }else { | |
| 3331 | - patientsQuery.setLastCheckEmployeeId(patientManagerRequest.getLastCheckEmployeeId()); | |
| 3327 | + if (StringUtils.isNotEmpty(patientManagerRequest.getLastCheckEmployeeId())){ | |
| 3328 | + Integer userCheckId = usersService.getUserId(hospitalId,patientManagerRequest.getLastCheckEmployeeId()); | |
| 3329 | + if (userCheckId!=null){ | |
| 3330 | + patientsQuery.setLastCheckEmployeeId(String.valueOf(userCheckId)); | |
| 3331 | + }else { | |
| 3332 | + patientsQuery.setLastCheckEmployeeId(patientManagerRequest.getLastCheckEmployeeId()); | |
| 3333 | + } | |
| 3332 | 3334 | } |
| 3335 | + | |
| 3333 | 3336 | |
| 3334 | 3337 | List <Patients> patientsList = patientsService.queryPatient(patientsQuery); |
| 3335 | 3338 | List <PatientManagerQueryModel> patientManagerQueryModelList = new ArrayList <>(); |