From 2632665ecf97a3464749062cdcd42ff3be0f06b7 Mon Sep 17 00:00:00 2001
From: "litao@lymsh.com" <Lt123456>
Date: Fri, 12 Jan 2018 13:42:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=BD=E8=AE=BF=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/service/impl/TrackDownServiceImpl.java  | 9 +++++++++
 1 file changed, 9 insertions(+)

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 25dbe3c..0783aa3 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
@@ -280,6 +280,7 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS
                 temp.put("residenceAddress", mongoUtil.findAddressName(patient.getProvinceId(), patient.getCityId(), patient.getAreaId(), patient.getStreetId())); /** 居住地 */
                 temp.put("phone", StringUtils.encryPhone(patient.getPhone()));
                 temp.put("id", patient.getId());
+                temp.put("dueDate", DateUtil.getyyyy_MM_dd(patient.getDueDate()));
                 TrackDown trackDown = mongoTemplate.findOne(Query.query(Criteria.where("yn").is(1).and("parentId").is(patient.getId())).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class);
                 if(trackDown != null) {
                     temp.put("result", StringUtils.isEmpty(trackDown.getResult()) ? "--" : trackDown.getResult()); // 婚检追访结果
@@ -290,6 +291,14 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS
                     temp.put("trackDownTime", "--"); // 追访时间
                     temp.put("yyTime", "--"); // 预约时间
                 }
+                if(trackType == TrackDownDateEnums.G.getId()) {// 产后复查
+                    /** 复查次数 */
+                    temp.put("fcNum", mongoTemplate.count(Query.query(Criteria.where("parentId").is(patient.getId()).and("trackDownDateType").is(TrackDownDateEnums.G.getId()).and("yn").is(1)), TrackDown.class));
+                    temp.put("fmDate", DateUtil.getyyyy_MM_dd(patient.getFmDate()));
+                    /** 初次复查日期 */
+                    TrackDown t = mongoTemplate.findOne(Query.query(Criteria.where("yn").is(1).and("parentId").is(patient.getId()).and("trackDownDateType").is(7)).with(new Sort(Sort.Direction.ASC, "created")), TrackDown.class);
+                    temp.put("ccfcDate", t == null ? "--" : DateUtil.getyyyy_MM_dd(t.getCreated()));
+                }
                 restList.add(temp);
             }
             Criteria trackDowncCriteria = new Criteria();
-- 
1.8.3.1