From 1ad48f56ca039d3a19bc4687c035d68823469f21 Mon Sep 17 00:00:00 2001 From: zhangchao Date: Wed, 7 Aug 2024 17:55:34 +0800 Subject: [PATCH] =?UTF-8?q?#fix:=E4=BC=98=E5=8C=96=E5=BB=BA=E6=A1=A3?= =?UTF-8?q?=E4=BA=A7=E6=A3=80=E5=8C=BB=E7=94=9F=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/lyms/platform/biz/service/PatientsService.java | 1 + .../src/main/java/com/lyms/platform/query/PatientsQuery.java | 5 ++++- .../java/com/lyms/platform/operate/web/facade/PatientFacade.java | 6 +++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java index 527bb51..0ad91b3 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java @@ -108,6 +108,7 @@ public class PatientsService { if (!StringUtils.isEmpty(patientsQuery.getSort())) { return iPatientDao.queryPatient(query.addOrder(Sort.Direction.ASC, patientsQuery.getSort())); } + System.out.println(query.convertToMongoQuery().toString()); return iPatientDao.queryPatient(query.addOrder(Sort.Direction.DESC, "id")); } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java index e5b4797..9e72142 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java @@ -1227,7 +1227,10 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { if (StringUtils.isNotEmpty(lastCheckEmployeeId)) { if("0123456789".equals(lastCheckEmployeeId)){ - condition = condition.and("lastCheckEmployeeId", false, MongoOper.EXISTS); + MongoCondition condition2 = new MongoCondition("lastCheckEmployeeId", false, MongoOper.EXISTS); + MongoCondition condition3 = new MongoCondition("lastCheckEmployeeId", "", MongoOper.IS); + MongoCondition condition4 = new MongoCondition("lastCheckEmployeeId", null, MongoOper.IS); + condition=condition.orCondition(new MongoCondition[]{condition2, condition3,condition4}); }else { condition = condition.and("lastCheckEmployeeId", lastCheckEmployeeId, MongoOper.IS); } 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 85bf5c6..4e75568 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()); - } + //} } -- 1.8.3.1