From bba02e280623e2a403e123aa53e28fe93f3d91d6 Mon Sep 17 00:00:00 2001
From: dongqin <123456>
Date: Tue, 23 Jul 2019 18:56:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/service/impl/BabyAfterVisitServiceImpl.java        | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyAfterVisitServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyAfterVisitServiceImpl.java
index 0e05926..8380b13 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyAfterVisitServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyAfterVisitServiceImpl.java
@@ -296,7 +296,7 @@ public class BabyAfterVisitServiceImpl implements BabyAfterVisitService {
         Query query = new Query();
         String hospitalId = autoMatchFacade.getHospitalId(userId);
         query.addCriteria(Criteria.where("hospitalId").is(hospitalId));
-        if (Objects.isNull(type)) {
+        if (StringUtils.isEmpty(type)) {
             return new BaseResponse("参数缺失", ErrorCodeConstants.PARAMETER_ERROR);
         }
         query.addCriteria(Criteria.where("type").is(type).and("yn").is(1));
@@ -346,18 +346,18 @@ public class BabyAfterVisitServiceImpl implements BabyAfterVisitService {
 
         // 流程状态
         String workflowStatus = request.getWorkflowStatus();
-        if (Objects.nonNull(workflowStatus)) {
+        if (StringUtils.isNotEmpty(workflowStatus)) {
             query.addCriteria(Criteria.where("afterVisitWorkflow").is(workflowStatus));
         }
         // 追访方式
         String afterVisitWay = request.getAfterVisitWay();
-        if (Objects.nonNull(afterVisitWay)) {
+        if (StringUtils.isNotEmpty(afterVisitWay)) {
             query.addCriteria(Criteria.where("afterVisitWay").is(afterVisitWay));
         }
         //  检查时间
         String startCheckTime = request.getStartCheckTime();
         String endCheckTime = request.getEndCheckTime();
-        if (Objects.nonNull(startCheckTime) && Objects.nonNull(endCheckTime)) {
+        if (StringUtils.isNotEmpty(startCheckTime) && StringUtils.isNotEmpty(endCheckTime)) {
             startCheckTime +=  " 00:00:00";
             endCheckTime +=  " 23:59:59";
             Date startDate = DateUtil.parseYMDHMS(startCheckTime);
@@ -367,19 +367,19 @@ public class BabyAfterVisitServiceImpl implements BabyAfterVisitService {
 
         //  检查医生 checkDoctor
         String checkDoctor = request.getCheckDoctor();
-        if (Objects.nonNull(checkDoctor)) {
+        if (StringUtils.isNotEmpty(checkDoctor)) {
             query.addCriteria(Criteria.where("checkDoctor").is(checkDoctor));
         }
 
         //  检查月龄
         String checkMonth = request.getCheckMonth();
-        if (Objects.nonNull(checkMonth)) {
+        if (StringUtils.isNotEmpty(checkMonth)) {
             query.addCriteria(Criteria.where("checkMonthId").is(checkMonth));
         }
 
         //  阳性项目
         String positiveProject = request.getPositiveProject();
-        if (Objects.nonNull(positiveProject)) {
+        if (StringUtils.isNotEmpty(positiveProject)) {
             Pattern pattern = Pattern.compile("^.*"+positiveProject+".*$", Pattern.CASE_INSENSITIVE);
             query.addCriteria(Criteria.where("positiveProject").regex(pattern));
         }
-- 
1.8.3.1