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());