From 8ba47fdc491bd5ac317571ff33d2560d6a238f52 Mon Sep 17 00:00:00 2001 From: zhangchao Date: Thu, 15 Aug 2024 11:04:20 +0800 Subject: [PATCH] =?UTF-8?q?#fix:=E4=BC=98=E5=8C=96=E5=BB=BA=E6=A1=A3?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BA=A7=E6=A3=80=E5=8C=BB=E7=94=9F=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E9=80=BB=E8=BE=91=E5=A2=9E=E5=8A=A0=E5=86=97=E4=BD=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mainOrm/master/MasterUsers.xml | 2 +- .../lyms/platform/operate/web/facade/BookbuildingFacade.java | 12 ++++++------ .../com/lyms/platform/operate/web/facade/PatientFacade.java | 7 ++++--- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MasterUsers.xml b/platform-biz-service/src/main/resources/mainOrm/master/MasterUsers.xml index fbe6959..453c19c 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/MasterUsers.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterUsers.xml @@ -349,7 +349,7 @@ select id,logincenter_id,type,org_id,dept_id,name,account,pwd,phone,publish_id,p 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 bac8887..647a9b8 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 @@ -398,7 +398,7 @@ public class BookbuildingFacade { //如果建档医生是空则创建医生 if (StringUtils.isEmpty(patient.getLastCheckEmployeeId())) { - Integer dockerId = usersService.getUserId(patient.getHospitalId(), yunRequest.getLastCheckEmployeeName()); + Integer dockerId = usersService.getUserId(patient.getHospitalId(), yunRequest.getLastCheckEmployeeName().trim()); if (dockerId != null) { patient.setLastCheckEmployeeId(String.valueOf(dockerId)); } else { @@ -408,8 +408,8 @@ public class BookbuildingFacade { users.setType(UserTypeEnum.NORMAL_USER.getId()); //1普通用户 //users.setDeptId(deptId); users.setOrgId(Integer.valueOf(patient.getHospitalId())); - users.setName(yunRequest.getLastCheckEmployeeName()); - users.setAccount(yunRequest.getLastCheckEmployeeName()); + users.setName(yunRequest.getLastCheckEmployeeName().trim()); + users.setAccount(yunRequest.getLastCheckEmployeeName().trim()); //users.setPhone(phone); users.setEnable(1); // users.setZhiChenId(zhiCId); @@ -1924,7 +1924,7 @@ public class BookbuildingFacade { //如果建档医生是空则创建医生 if (StringUtils.isEmpty(patient.getLastCheckEmployeeId())) { - Integer dockerId = usersService.getUserId(hospitalId, yunRequest.getLastCheckEmployeeName()); + Integer dockerId = usersService.getUserId(hospitalId, yunRequest.getLastCheckEmployeeName().trim()); if (dockerId != null) { patient.setLastCheckEmployeeId(String.valueOf(dockerId)); } else { @@ -1934,8 +1934,8 @@ public class BookbuildingFacade { users.setType(UserTypeEnum.NORMAL_USER.getId()); //1普通用户 //users.setDeptId(deptId); users.setOrgId(Integer.valueOf(StringUtils.isNotEmpty(patient.getHospitalId()) ? patient.getHospitalId() : hospitalId)); - users.setName(yunRequest.getLastCheckEmployeeName()); - users.setAccount(yunRequest.getLastCheckEmployeeName()); + users.setName(yunRequest.getLastCheckEmployeeName().trim()); + users.setAccount(yunRequest.getLastCheckEmployeeName().trim()); //users.setPhone(phone); users.setEnable(1); // users.setZhiChenId(zhiCId); 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 d30b07c..78a44dc 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()); - //} + } } @@ -3449,6 +3449,7 @@ public class PatientFacade extends BaseServiceImpl { System.out.println(patients.getId() + ";no user bookbuildingDoctor" + patients.getBookbuildingDoctor()); } } + //TODO 优化产检医生是汉字的逻辑 String lastCheckEmployeeId = ""; if (StringUtils.isNotEmpty(patients.getLastCheckEmployeeId())) { Users user = usersService.getUsers(Integer.valueOf(patients.getLastCheckEmployeeId())); -- 1.8.3.1