From dba0c3278d796427520b95a2447820119218cc70 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Fri, 2 Mar 2018 12:03:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=BD=E8=AE=BF=E6=95=B0=E6=8D=AE=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8Bbug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/service/impl/TrackDownServiceImpl.java     | 36 ++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 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 05fd303..626e342 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
@@ -282,7 +282,6 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS
     private void updateRecordStatus(TrackDown trackDown, String id) {
         //如果是扭转到下一个流程的话就需要修改record表
         if (TrackDownTransferEnums.B.getId() == trackDown.getTrackDownTransfer()) {
-
             TrackDownRecord trackDownRecord = new TrackDownRecord();
             Integer nextId = TrackDownDateEnums.getEnum(trackDown.getTrackDownDateType()).getNextid();
             trackDownRecord.setTrackType(nextId);
@@ -477,15 +476,48 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS
                     chfsList.add(temp);
                 } else if (TrackDownDateEnums.G.getId().equals(trackDown.getTrackDownDateType())) {
                     chfcList.add(temp);
+                }  else if (TrackDownDateEnums.H.getId().equals(trackDown.getTrackDownDateType())) {
+                    cqscList.add(temp);
+                } else if (TrackDownDateEnums.I.getId().equals(trackDown.getTrackDownDateType())) {
+                    cqjcList.add(temp);
+                } else if (TrackDownDateEnums.J.getId().equals(trackDown.getTrackDownDateType())) {
+                    chfcList.add(temp);
+                }else if (TrackDownDateEnums.K.getId().equals(trackDown.getTrackDownDateType())) {
+                    chfsList.add(temp);
                 }
             }
             return RespBuilder.buildSuccess("hqjcList", hqjcList, "hyjdList", hyjdList, "cqjcList", cqjcList, "cqscList", cqscList, "zyfmList", zyfmList, "chfsList", chfsList, "chfcList", chfcList);
         }
-        List<TrackDown> trackDowns = mongoTemplate.find(Query.query(Criteria.where("parentId").is(patientId).and("trackDownDateType").is(trackType).and("yn").is(1)), TrackDown.class);
+
+        Criteria criteria = Criteria.where("parentId").is(patientId).and("yn").is(1);
+
+        if (TrackDownDateEnums.D.getId() == trackType) {
+            criteria.and("trackDownDateType").in(4,8);
+        } else if (TrackDownDateEnums.C.getId() == trackType) {
+            criteria.and("trackDownDateType").in(3,9);
+        } else if (TrackDownDateEnums.F.getId() == trackType) {
+            criteria.and("trackDownDateType").in(6,11);
+        } else if (TrackDownDateEnums.G.getId() == trackType) {
+            criteria.and("trackDownDateType").in(7,10);
+        } else {
+            criteria.and("trackDownDateType").in(trackType);
+        }
+        List<TrackDown> trackDowns = mongoTemplate.find(Query.query(criteria), TrackDown.class);
+
         for (TrackDown trackDown : trackDowns) {
             Map<String, Object> temp = new HashMap<>();
             temp.put("trackDownDate", trackDown.getTrackDownDate() == null ? "--" : DateUtil.getyyyy_MM_dd_hms(trackDown.getTrackDownDate()));
             temp.put("trackDownUser", StringUtils.isEmpty(trackDown.getTrackDownUserId()) ? "--" : trackDown.getTrackDownUserId());
+            if(trackDown.getTrackDownType() == TrackDownDateEnums.H.getId()){
+                trackDown.setTrackDownType(4);
+            }else if(trackDown.getTrackDownType() == TrackDownDateEnums.I.getId()){
+                trackDown.setTrackDownType(3);
+            }else if(trackDown.getTrackDownType() == TrackDownDateEnums.J.getId()){
+                trackDown.setTrackDownType(7);
+            }else if(trackDown.getTrackDownType() == TrackDownDateEnums.K.getId()){
+                trackDown.setTrackDownType(6);
+            }
+
             temp.put("trackDownType", TrackDownTypeEnums.getName(trackDown.getTrackDownType()));
             temp.put("result", StringUtils.isEmpty(trackDown.getResult()) ? "--" : trackDown.getResult());
             temp.put("reservatDate", trackDown.getReservatDate() == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getReservatDate()));
-- 
1.8.3.1