From bc35244b9b027ae5d529ee681f6c9f2b2c2d6e51 Mon Sep 17 00:00:00 2001 From: hujiaqi Date: Thu, 15 Dec 2016 16:28:11 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A9=BA=E5=AD=97=E7=AC=A6=E4=B8=B2=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/operate/web/facade/MatDeliverFacade.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 f0294cf..b61c056 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 @@ -934,13 +934,13 @@ public class MatDeliverFacade { } } - patientsQuery.setName(childbirthManagerRequest.getUserName()); + patientsQuery.setName(StringUtils.isEmpty(childbirthManagerRequest.getUserName()) ? null : childbirthManagerRequest.getUserName()); patientsQuery.setYn(YnEnums.YES.getId()); patientsQuery.setType(3); patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(childbirthManagerRequest.getOperatorId())); - patientsQuery.setCardNo(childbirthManagerRequest.getCardNo()); - patientsQuery.setPhone(childbirthManagerRequest.getPhone()); - patientsQuery.setHusbandPhone(childbirthManagerRequest.getHusbandPhone()); + patientsQuery.setCardNo(StringUtils.isEmpty(childbirthManagerRequest.getCardNo()) ? null : childbirthManagerRequest.getCardNo()); + patientsQuery.setPhone(StringUtils.isEmpty(childbirthManagerRequest.getPhone()) ? null : childbirthManagerRequest.getPhone()); + patientsQuery.setHusbandPhone(StringUtils.isEmpty(childbirthManagerRequest.getHusbandPhone()) ? null : childbirthManagerRequest.getHusbandPhone()); // 分娩方式去另外一张表查 List patientsList = patientsService.queryPatient(patientsQuery); List parentIdList = new ArrayList<>(); @@ -955,7 +955,7 @@ public class MatDeliverFacade { } MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); - matDeliverQuery.setDeliveryMode(childbirthManagerRequest.getDeliveryMode()); + matDeliverQuery.setDeliveryMode(StringUtils.isEmpty(childbirthManagerRequest.getDeliveryMode()) ? null : childbirthManagerRequest.getDeliveryMode()); matDeliverQuery.setParentIdList(parentIdList); matDeliverQuery.setPage(childbirthManagerRequest.getPage()); matDeliverQuery.setLimit(childbirthManagerRequest.getLimit()); -- 1.8.3.1