From 65735e10c1609878fb90315c4a171deba5b08313 Mon Sep 17 00:00:00 2001 From: zhangchao Date: Thu, 15 Aug 2024 11:46:55 +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/BookbuildingFacade.java | 9 ++++++++- .../java/com/lyms/platform/operate/web/facade/PatientFacade.java | 2 +- .../lyms/platform/operate/web/facade/PatientServiceFacade.java | 2 ++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index 647a9b8..d0a26dc 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -3097,7 +3097,14 @@ public class BookbuildingFacade { result.setCloseCaseCode(p.getCloseCaseCode()); result.setBuildingManualCode(p.getBuildingManualCode()); result.setHighRiskFileCode(p.getHighRiskFileCode()); - result.setLastCheckEmployeeId(p.getLastCheckEmployeeId()); + if (StringUtils.isNotEmpty(p.getLastCheckEmployeeId())){ + Integer userCheckId = usersService.getUserId(p.getHospitalId(),p.getLastCheckEmployeeId()); + if (userCheckId==null){ + userCheckId=Integer.valueOf(p.getLastCheckEmployeeId()); + } + result.setLastCheckEmployeeId(String.valueOf(userCheckId)); + } + result.setUserType(p.getUserType()); result.setDept(p.getDept()); result.setLowerHairOgr(p.getLowerHairOgr()); 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 105c32f..4545088 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 @@ -3452,7 +3452,7 @@ public class PatientFacade extends BaseServiceImpl { //TODO 优化产检医生是汉字的逻辑 String lastCheckEmployeeId = ""; if (StringUtils.isNotEmpty(patients.getLastCheckEmployeeId())) { - Integer userCheckId = usersService.getUserId(hospitalId,patientManagerRequest.getLastCheckEmployeeId()); + Integer userCheckId = usersService.getUserId(hospitalId,patients.getLastCheckEmployeeId()); if (userCheckId==null){ userCheckId=Integer.valueOf(patients.getLastCheckEmployeeId()); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java index 256f2ef..d57f3bd 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java @@ -1117,6 +1117,8 @@ public class PatientServiceFacade { } else { result.setCreateUserStr("小程序开通"); } + + result.setBackDate(DateUtil.getyyyy_MM_dd(ps.getBackDate())); result.setBackUser(ps.getSerDoct()); result.setSerDoct(ps.getSerDoct()); -- 1.8.3.1