From d41a11c7464534560b7a239e744d80ffbe7357ec Mon Sep 17 00:00:00 2001
From: dongqin <123456>
Date: Wed, 10 Jul 2019 14:30:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=BD=E8=AE=BF=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BabyAfterVisitServiceImpl.java    | 31 ++++++++++------------
 1 file changed, 14 insertions(+), 17 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 4d39546..b7c2c06 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
@@ -353,8 +353,6 @@ public class BabyAfterVisitServiceImpl implements BabyAfterVisitService {
             }
             calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMinimum(Calendar.DAY_OF_MONTH));
             Date end = calendar.getTime();
-            System.out.println("start::"+DateUtil.getyyyy_MM_dd_hms(start));
-            System.out.println("end::"+DateUtil.getyyyy_MM_dd_hms(end));
             query.addCriteria(Criteria.where("birth").gte(end).lte(start));
         }
 
@@ -450,41 +448,40 @@ public class BabyAfterVisitServiceImpl implements BabyAfterVisitService {
 
             //  追访时间
             Date afterVisitTime = model.getAfterVisitTime();
-            if (afterVisitTime != null) {
-                objectMap.put("afterVisitTimeStr", DateUtil.getyyyy_MM_dd(afterVisitTime));
-            }
+            String afterVisitTimeStr = afterVisitTime == null ? "" : DateUtil.getyyyy_MM_dd(afterVisitTime);
+            objectMap.put("afterVisitTimeStr", afterVisitTimeStr);
             //  追访人
             String afterVisitUser = model.getAfterVisitUser();
+            String afterVisitUserStr = "";
             if (StringUtils.isNotEmpty(afterVisitUser)) {
                 Users users = usersMapper.getUsers(Integer.parseInt(afterVisitUser));
                 if (users != null) {
-                    objectMap.put("afterVisitUserStr", users.getName());
+                    afterVisitUserStr = users.getName();
                 }
             }
+            objectMap.put("afterVisitUserStr", afterVisitUserStr);
             // 阳性项目
             String positives = model.getPositiveProject();
-            if (StringUtils.isNotEmpty(positives)) {
-                objectMap.put("positiveProjectStr", positives);
-            }
+            String positiveProjectStr = StringUtils.isNotEmpty(positives) ? positives : "";
+            objectMap.put("positiveProjectStr", positiveProjectStr);
             //  检查医生
             String doctor = model.getCheckDoctor();
+            String checkDoctorStr = "";
             if (StringUtils.isNotEmpty(doctor)) {
                 Users users = usersMapper.getUsers(Integer.parseInt(doctor));
                 if (users != null) {
-                    objectMap.put("checkDoctorStr", users.getName());
+                    checkDoctorStr = users.getName();
                 }
             }
+            objectMap.put("checkDoctorStr", checkDoctorStr);
             // 检查日期
             Date checkTime = model.getCheckTime();
-            if (checkTime != null) {
-                objectMap.put("checkTimeStr", DateUtil.getyyyy_MM_dd(checkTime));
-            }
+            String checkTimeStr = checkTime == null ? "" : DateUtil.getyyyy_MM_dd(checkTime);
+            objectMap.put("checkTimeStr", checkTimeStr);
             //  诊断时间
             Date diagnosisTime = model.getDiagnosisTime();
-            if (diagnosisTime != null) {
-                objectMap.put("diagnosisTimeStr", DateUtil.getyyyy_MM_dd(diagnosisTime));
-            }
-
+            String diagnosisTimeStr = diagnosisTime == null ? "" : DateUtil.getyyyy_MM_dd(diagnosisTime);
+            objectMap.put("diagnosisTimeStr", diagnosisTimeStr);
 
             mapList.add(objectMap);
         }
-- 
1.8.3.1