From 45158fe4d6d26fa0bdf2cf13727ff3f7ca6f0400 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Fri, 23 Feb 2018 11:21:39 +0800
Subject: [PATCH] 1

---
 .../operate/web/facade/TrackDownFacade.java        | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java
index 27f840b..83270b8 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java
@@ -93,6 +93,7 @@ public class TrackDownFacade {
 
     /**
      * 处理建档时候的追访功能
+     *
      * @param patients
      */
     public void aop4Patient(Patients patients) {
@@ -221,9 +222,11 @@ public class TrackDownFacade {
          */
         Map build(TrackDownRecord downRecord, MongoTemplate mongoTemplate);
     }
+
     @Autowired
     private PostReviewService postReviewService;
-    class CHFCTrackDownTypeHandler implements TrackDownTypeHandler{
+
+    class CHFCTrackDownTypeHandler implements TrackDownTypeHandler {
 
         @Override
         public Map build(TrackDownRecord downRecord, MongoTemplate mongoTemplate) {
@@ -243,7 +246,7 @@ public class TrackDownFacade {
             temp.put("trackDownTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getTrackDownDate()));
             // 预约时间
             temp.put("yyTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getReservatDate()));
-            PostReviewQuery postReviewQuery =new PostReviewQuery();
+            PostReviewQuery postReviewQuery = new PostReviewQuery();
             postReviewQuery.setYn(YnEnums.YES.getId());
             postReviewQuery.setParentId(downRecord.getParentId());
             List<PostReviewModel> list = postReviewService.findWithList(postReviewQuery);
@@ -251,19 +254,24 @@ public class TrackDownFacade {
             /** 复查次数 */
             temp.put("fcNum", list.size());
             temp.put("fmDate", DateUtil.getyyyy_MM_dd(patients.getFmDate()));
-            /** 初次复查日期 */
-            temp.put("ccfcDate", list.get(list.size()-1).getCheckTime() == null ? "--" : DateUtil.getyyyy_MM_dd(list.get(list.size()-1).getCheckTime()));
-            /** 预约复查日期 */
-            temp.put("yyfcDate ",list.get(0).getNextCheckTime() == null ? "--" : DateUtil.getyyyy_MM_dd(list.get(0).getNextCheckTime()));
+            temp.put("ccfcDate", "--");
+            temp.put("yyfcDate ", "--");
+            if (CollectionUtils.isNotEmpty(list)) {
+                /** 初次复查日期 */
+                temp.put("ccfcDate", list.get(list.size() - 1).getCheckTime() == null ? "--" : DateUtil.getyyyy_MM_dd(list.get(list.size() - 1).getCheckTime()));
+                /** 预约复查日期 */
+                temp.put("yyfcDate ", list.get(0).getNextCheckTime() == null ? "--" : DateUtil.getyyyy_MM_dd(list.get(0).getNextCheckTime()));
+            }
             /** 生产方式 */
             temp.put("scType", FmTypeEnums.getFmNameById2("1"));
             return temp;
         }
     }
+
     /**
      * 产后访视
      */
-    class CHTrackDownTypeHandler implements  TrackDownTypeHandler{
+    class CHTrackDownTypeHandler implements TrackDownTypeHandler {
         @Override
         public Map build(TrackDownRecord downRecord, MongoTemplate mongoTemplate) {
             Map<String, Object> temp = new HashMap<>();
-- 
1.8.3.1