Commit bc35244b9b027ae5d529ee681f6c9f2b2c2d6e51
1 parent
25af4bdb34
Exists in
master
and in
1 other branch
空字符串处理
Showing 1 changed file with 5 additions and 5 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
bc35244
| ... | ... | @@ -934,13 +934,13 @@ |
| 934 | 934 | } |
| 935 | 935 | } |
| 936 | 936 | |
| 937 | - patientsQuery.setName(childbirthManagerRequest.getUserName()); | |
| 937 | + patientsQuery.setName(StringUtils.isEmpty(childbirthManagerRequest.getUserName()) ? null : childbirthManagerRequest.getUserName()); | |
| 938 | 938 | patientsQuery.setYn(YnEnums.YES.getId()); |
| 939 | 939 | patientsQuery.setType(3); |
| 940 | 940 | patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(childbirthManagerRequest.getOperatorId())); |
| 941 | - patientsQuery.setCardNo(childbirthManagerRequest.getCardNo()); | |
| 942 | - patientsQuery.setPhone(childbirthManagerRequest.getPhone()); | |
| 943 | - patientsQuery.setHusbandPhone(childbirthManagerRequest.getHusbandPhone()); | |
| 941 | + patientsQuery.setCardNo(StringUtils.isEmpty(childbirthManagerRequest.getCardNo()) ? null : childbirthManagerRequest.getCardNo()); | |
| 942 | + patientsQuery.setPhone(StringUtils.isEmpty(childbirthManagerRequest.getPhone()) ? null : childbirthManagerRequest.getPhone()); | |
| 943 | + patientsQuery.setHusbandPhone(StringUtils.isEmpty(childbirthManagerRequest.getHusbandPhone()) ? null : childbirthManagerRequest.getHusbandPhone()); | |
| 944 | 944 | // 分娩方式去另外一张表查 |
| 945 | 945 | List<Patients> patientsList = patientsService.queryPatient(patientsQuery); |
| 946 | 946 | List<String> parentIdList = new ArrayList<>(); |
| ... | ... | @@ -955,7 +955,7 @@ |
| 955 | 955 | } |
| 956 | 956 | |
| 957 | 957 | MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); |
| 958 | - matDeliverQuery.setDeliveryMode(childbirthManagerRequest.getDeliveryMode()); | |
| 958 | + matDeliverQuery.setDeliveryMode(StringUtils.isEmpty(childbirthManagerRequest.getDeliveryMode()) ? null : childbirthManagerRequest.getDeliveryMode()); | |
| 959 | 959 | matDeliverQuery.setParentIdList(parentIdList); |
| 960 | 960 | matDeliverQuery.setPage(childbirthManagerRequest.getPage()); |
| 961 | 961 | matDeliverQuery.setLimit(childbirthManagerRequest.getLimit()); |