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 df6f052..85bf5c6 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 @@ -3324,13 +3324,16 @@ public class PatientFacade extends BaseServiceImpl { patientsQuery.setType(patientManagerRequest.getType()); patientsQuery.setHighRiskFileCode(patientManagerRequest.getHighRiskFileCode()); // System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString()); - Integer userCheckId = usersService.getUserId(hospitalId,patientManagerRequest.getLastCheckEmployeeId()); - if (userCheckId!=null){ - patientsQuery.setLastCheckEmployeeId(String.valueOf(userCheckId)); - }else { - patientsQuery.setLastCheckEmployeeId(patientManagerRequest.getLastCheckEmployeeId()); + if (StringUtils.isNotEmpty(patientManagerRequest.getLastCheckEmployeeId())){ + Integer userCheckId = usersService.getUserId(hospitalId,patientManagerRequest.getLastCheckEmployeeId()); + if (userCheckId!=null){ + patientsQuery.setLastCheckEmployeeId(String.valueOf(userCheckId)); + }else { + patientsQuery.setLastCheckEmployeeId(patientManagerRequest.getLastCheckEmployeeId()); + } } + List patientsList = patientsService.queryPatient(patientsQuery); List patientManagerQueryModelList = new ArrayList <>(); if (CollectionUtils.isNotEmpty(patientsList)) {