From 8b05d29e332eb563d1836e630c7d08ca8a6627ec Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Fri, 9 Mar 2018 16:13:13 +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

---
 .../operate/web/facade/TrackDownFacade.java        | 23 +++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 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 0715534..722d0ac 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
@@ -205,8 +205,23 @@ public class TrackDownFacade {
             }
         }
         map.put("checkTime", "--"); /** 产检日期 */
+
+        List<Integer> trackTypes = new ArrayList<>();
+        //产检和产后数据特殊处理
+        if (null != trackType && TrackDownDateEnums.C.getId() == trackType) {
+            trackTypes = Arrays.asList(3, 9);
+        } else if (null != trackType && TrackDownDateEnums.D.getId() == trackType) {
+            trackTypes =Arrays.asList(3, 8);
+        } else if (null != trackType && TrackDownDateEnums.F.getId() == trackType) {
+            trackTypes =Arrays.asList(6, 11);
+        } else if (null != trackType && TrackDownDateEnums.G.getId() == trackType) {
+            trackTypes =Arrays.asList(6, 10);
+        } else {
+            trackTypes  = Arrays.asList(trackType);
+        }
+
         //查询追访记录
-        TrackDown tc = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(parentId).and("trackDownDateType").is(trackType).and("yn").is(1)).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class);
+        TrackDown tc = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(parentId).and("trackDownDateType").in(trackTypes).and("yn").is(1)).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class);
         if (tc != null) {
             map.put("nextCheckTime", tc.getReservatDate() == null ? "--" : DateUtil.getyyyy_MM_dd(tc.getReservatDate())); // 预约预约时间
             map.put("yyfsDate", DateUtil.getyyyy_MM_dd(tc.getReservatDate()));  /** 预约访视日期 */
@@ -328,6 +343,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()));
+
             //预约复查时间默认用追访时间
             temp.put("yyfcDate", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getReservatDate()));
             PostReviewQuery postReviewQuery = new PostReviewQuery();
@@ -364,10 +380,11 @@ public class TrackDownFacade {
             /** 复查次数 */
             temp.put("fcNum", list.size());
             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("ccfcDate", list.get(0).getCheckTime() == null ? "--" : DateUtil.getyyyy_MM_dd(list.get(0).getCheckTime()));
                 /** 预约复查日期 */
-                temp.put("yyfcDate ", list.get(0).getNextCheckTime() == null ? "--" : DateUtil.getyyyy_MM_dd(list.get(0).getNextCheckTime()));
+                temp.put("yyfcDate", list.get(list.size() - 1).getNextCheckTime() == null ? "--" : DateUtil.getyyyy_MM_dd(list.get(list.size() - 1).getNextCheckTime()));
             }
             return temp;
         }
-- 
1.8.3.1