Commit bba02e280623e2a403e123aa53e28fe93f3d91d6
1 parent
b064d9bc08
Exists in
master
and in
1 other branch
修复bug
Showing 1 changed file with 7 additions and 7 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyAfterVisitServiceImpl.java
View file @
bba02e2
| ... | ... | @@ -296,7 +296,7 @@ |
| 296 | 296 | Query query = new Query(); |
| 297 | 297 | String hospitalId = autoMatchFacade.getHospitalId(userId); |
| 298 | 298 | query.addCriteria(Criteria.where("hospitalId").is(hospitalId)); |
| 299 | - if (Objects.isNull(type)) { | |
| 299 | + if (StringUtils.isEmpty(type)) { | |
| 300 | 300 | return new BaseResponse("参数缺失", ErrorCodeConstants.PARAMETER_ERROR); |
| 301 | 301 | } |
| 302 | 302 | query.addCriteria(Criteria.where("type").is(type).and("yn").is(1)); |
| 303 | 303 | |
| 304 | 304 | |
| ... | ... | @@ -346,18 +346,18 @@ |
| 346 | 346 | |
| 347 | 347 | // 流程状态 |
| 348 | 348 | String workflowStatus = request.getWorkflowStatus(); |
| 349 | - if (Objects.nonNull(workflowStatus)) { | |
| 349 | + if (StringUtils.isNotEmpty(workflowStatus)) { | |
| 350 | 350 | query.addCriteria(Criteria.where("afterVisitWorkflow").is(workflowStatus)); |
| 351 | 351 | } |
| 352 | 352 | // 追访方式 |
| 353 | 353 | String afterVisitWay = request.getAfterVisitWay(); |
| 354 | - if (Objects.nonNull(afterVisitWay)) { | |
| 354 | + if (StringUtils.isNotEmpty(afterVisitWay)) { | |
| 355 | 355 | query.addCriteria(Criteria.where("afterVisitWay").is(afterVisitWay)); |
| 356 | 356 | } |
| 357 | 357 | // 检查时间 |
| 358 | 358 | String startCheckTime = request.getStartCheckTime(); |
| 359 | 359 | String endCheckTime = request.getEndCheckTime(); |
| 360 | - if (Objects.nonNull(startCheckTime) && Objects.nonNull(endCheckTime)) { | |
| 360 | + if (StringUtils.isNotEmpty(startCheckTime) && StringUtils.isNotEmpty(endCheckTime)) { | |
| 361 | 361 | startCheckTime += " 00:00:00"; |
| 362 | 362 | endCheckTime += " 23:59:59"; |
| 363 | 363 | Date startDate = DateUtil.parseYMDHMS(startCheckTime); |
| 364 | 364 | |
| 365 | 365 | |
| ... | ... | @@ -367,19 +367,19 @@ |
| 367 | 367 | |
| 368 | 368 | // 检查医生 checkDoctor |
| 369 | 369 | String checkDoctor = request.getCheckDoctor(); |
| 370 | - if (Objects.nonNull(checkDoctor)) { | |
| 370 | + if (StringUtils.isNotEmpty(checkDoctor)) { | |
| 371 | 371 | query.addCriteria(Criteria.where("checkDoctor").is(checkDoctor)); |
| 372 | 372 | } |
| 373 | 373 | |
| 374 | 374 | // 检查月龄 |
| 375 | 375 | String checkMonth = request.getCheckMonth(); |
| 376 | - if (Objects.nonNull(checkMonth)) { | |
| 376 | + if (StringUtils.isNotEmpty(checkMonth)) { | |
| 377 | 377 | query.addCriteria(Criteria.where("checkMonthId").is(checkMonth)); |
| 378 | 378 | } |
| 379 | 379 | |
| 380 | 380 | // 阳性项目 |
| 381 | 381 | String positiveProject = request.getPositiveProject(); |
| 382 | - if (Objects.nonNull(positiveProject)) { | |
| 382 | + if (StringUtils.isNotEmpty(positiveProject)) { | |
| 383 | 383 | Pattern pattern = Pattern.compile("^.*"+positiveProject+".*$", Pattern.CASE_INSENSITIVE); |
| 384 | 384 | query.addCriteria(Criteria.where("positiveProject").regex(pattern)); |
| 385 | 385 | } |