From 862fd4f7c10970bdffe9cc4d0194edd7b75adcd5 Mon Sep 17 00:00:00 2001 From: zhangchao Date: Thu, 15 Aug 2024 11:16:51 +0800 Subject: [PATCH] =?UTF-8?q?#fix:=E4=BC=98=E5=8C=96?= 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, 9 insertions(+), 4 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 78a44dc..105c32f 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 @@ -3325,12 +3325,12 @@ public class PatientFacade extends BaseServiceImpl { patientsQuery.setHighRiskFileCode(patientManagerRequest.getHighRiskFileCode()); // System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString()); if (StringUtils.isNotEmpty(patientManagerRequest.getLastCheckEmployeeId())){ - Integer userCheckId = usersService.getUserId(hospitalId,patientManagerRequest.getLastCheckEmployeeId()); + /*Integer userCheckId = usersService.getUserId(hospitalId,patientManagerRequest.getLastCheckEmployeeId()); if (userCheckId!=null){ patientsQuery.setLastCheckEmployeeId(String.valueOf(userCheckId)); - }else { + }else {*/ patientsQuery.setLastCheckEmployeeId(patientManagerRequest.getLastCheckEmployeeId()); - } + //} } @@ -3452,12 +3452,17 @@ public class PatientFacade extends BaseServiceImpl { //TODO 优化产检医生是汉字的逻辑 String lastCheckEmployeeId = ""; if (StringUtils.isNotEmpty(patients.getLastCheckEmployeeId())) { - Users user = usersService.getUsers(Integer.valueOf(patients.getLastCheckEmployeeId())); + Integer userCheckId = usersService.getUserId(hospitalId,patientManagerRequest.getLastCheckEmployeeId()); + if (userCheckId==null){ + userCheckId=Integer.valueOf(patients.getLastCheckEmployeeId()); + } + Users user = usersService.getUsers(userCheckId); if (user != null) { lastCheckEmployeeId = user.getName(); } else { System.out.println(patients.getId() + ";no user lastCheckEmployeeId" + patients.getLastCheckEmployeeId()); } + } //初诊时间和初诊医生字段展示,作为模块化 if (StringUtils.isNotEmpty(patients.getFirstCheckId())) { -- 1.8.3.1