From b638793b0b359ecfb4612a159bdb681240c405f0 Mon Sep 17 00:00:00 2001 From: zhangchao Date: Mon, 5 Aug 2024 09:26:44 +0800 Subject: [PATCH] =?UTF-8?q?#fix:=E4=BC=98=E5=8C=96=E5=A4=A7=E5=90=8C?= =?UTF-8?q?=E5=BB=BA=E6=A1=A3=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E4=BA=A7?= =?UTF-8?q?=E6=A3=80=E5=8C=BB=E7=94=9F=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/operate/web/facade/PatientFacade.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) 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)) { -- 1.8.3.1