From 7835e1d121638b3eb18ecd177f503f11c8e3fc13 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Fri, 9 Mar 2018 11:08:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=E8=BF=BD?=
 =?UTF-8?q?=E8=AE=BF=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/service/impl/TrackDownServiceImpl.java        | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java
index 5a82ed8..072ba9a 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java
@@ -649,18 +649,19 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS
             }else{
                 return RespBuilder.buildErro(ResponseCode.DATA_ERROR);
             }
-
             List<TrackDownRecord> trackDownRecords = trackDownRecordService.queryTrackDown(query);
+            List<Map<String, Object>> hqjcList = new ArrayList<>(); // 婚前检查
+            List<Map<String, Object>> hyjdList = new ArrayList<>(); // 怀孕建档
+            List<Map<String, Object>> cqjcList = new ArrayList<>(); // 产前检查
+            List<Map<String, Object>> cqscList = new ArrayList<>(); // 产前筛查
+            List<Map<String, Object>> zyfmList = new ArrayList<>(); // 住院分娩
+            List<Map<String, Object>> chfsList = new ArrayList<>(); // 产后访视
+            List<Map<String, Object>> chfcList = new ArrayList<>(); // 产后复查
+
             if (CollectionUtils.isNotEmpty(trackDownRecords)) {
                 TrackDownRecord trackDownRecord = trackDownRecords.get(0);
                 List<TrackDown> trackDowns = mongoTemplate.find(Query.query(Criteria.where("trackDownRecId").is(  trackDownRecord.getId()).and("yn").is(1)).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class);
-                List<Map<String, Object>> hqjcList = new ArrayList<>(); // 婚前检查
-                List<Map<String, Object>> hyjdList = new ArrayList<>(); // 怀孕建档
-                List<Map<String, Object>> cqjcList = new ArrayList<>(); // 产前检查
-                List<Map<String, Object>> cqscList = new ArrayList<>(); // 产前筛查
-                List<Map<String, Object>> zyfmList = new ArrayList<>(); // 住院分娩
-                List<Map<String, Object>> chfsList = new ArrayList<>(); // 产后访视
-                List<Map<String, Object>> chfcList = new ArrayList<>(); // 产后复查
+
                 for (TrackDown trackDown : trackDowns) {
                     Map<String, Object> temp = new HashMap<>();
                     temp.put("trackDownDate", DateUtil.getyyyy_MM_dd(trackDown.getTrackDownDate()));
@@ -694,8 +695,8 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS
                         chfsList.add(temp);
                     }
                 }
-                return RespBuilder.buildSuccess("hqjcList", hqjcList, "hyjdList", hyjdList, "cqjcList", cqjcList, "cqscList", cqscList, "zyfmList", zyfmList, "chfsList", chfsList, "chfcList", chfcList);
             }
+            return RespBuilder.buildSuccess("hqjcList", hqjcList, "hyjdList", hyjdList, "cqjcList", cqjcList, "cqscList", cqscList, "zyfmList", zyfmList, "chfsList", chfsList, "chfcList", chfcList);
         }
         Criteria criteria = Criteria.where("parentId").is(patientId).and("yn").is(1);
 
-- 
1.8.3.1