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 6c4ee8f..52c8a84 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 @@ -787,7 +787,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { - if (null != queryNo) { + if (StringUtils.isNotEmpty(queryNo)) { MongoCondition c = MongoCondition.newInstance(); MongoCondition con1 = MongoCondition.newInstance("phone", queryNo, MongoOper.IS); MongoCondition con2 = MongoCondition.newInstance("username", "^" + queryNo, MongoOper.LIKE); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index b1d9c96..b9bc0dd 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -2546,7 +2546,7 @@ public class MatDeliverFacade { //System.out.println("分娩档案查询" + patientsQuery.convertToQuery().convertToMongoQuery().toString()); List patientsList = patientsService.queryPatient(patientsQuery); - //System.out.println("分娩档案查询结束" + patientsQuery.convertToQuery().convertToMongoQuery().toString()); + System.out.println("分娩档案查询结束" + patientsQuery.convertToQuery().convertToMongoQuery().toString()); // 这里就设置分页内容 childbirthManagerResult.setPageInfo(patientsQuery.getPageInfo()); 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 9c6b51b..6c31777 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 @@ -707,6 +707,7 @@ public class PatientFacade { } }else { //以前逻辑 + System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString()); patientses = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder()); } stopWatch.stop();