diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/TrackDownTypeEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/TrackDownTypeEnums.java
index e694a97..5306405 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/enums/TrackDownTypeEnums.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/enums/TrackDownTypeEnums.java
@@ -25,7 +25,7 @@ public enum TrackDownTypeEnums {
                 return value.getName();
             }
         }
-        return null;
+        return "--";
     }
     private Integer id;
     private String name;
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 d336333..fee8eb3 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
@@ -252,7 +252,9 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS
             List<ResidentsArchiveModel> residentsArchiveModels = (List<ResidentsArchiveModel>) pageResult.getGrid();
             for (ResidentsArchiveModel residentsArchiveModel : residentsArchiveModels) {
                 Map<String, Object> temp = new HashMap<>();
-                temp.put("id", residentsArchiveModel.getId());
+                Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("cardNo").is(residentsArchiveModel.getCertificateNum())).with(new Sort(Sort.Direction.DESC, "created")), Patients.class);
+                temp.put("id", patients == null ? null : patients.getId());
+                temp.put("residentsArchiveId", residentsArchiveModel.getId());
                 temp.put("username", residentsArchiveModel.getUsername());
                 temp.put("cardNo", residentsArchiveModel.getCertificateNum());
                 temp.put("residenceAddress", mongoUtil.findAddressName(residentsArchiveModel.getProvinceId(), residentsArchiveModel.getCityId(), residentsArchiveModel.getAreaId(), residentsArchiveModel.getStreetId())); /** 居住地 */
@@ -339,11 +341,11 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS
             setTrackType();
             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("trackType").is(trackType).and("yn").is(1)), TrackDown.class);
+        List<TrackDown> trackDowns = mongoTemplate.find(Query.query(Criteria.where("parentId").is(patientId).and("trackDownDateType").is(trackType).and("yn").is(1)), TrackDown.class);
         for (TrackDown trackDown : trackDowns) {
             Map<String, Object> temp = new HashMap<>();
-            temp.put("trackDownDate", DateUtil.getyyyy_MM_dd_hms(trackDown.getTrackDownDate()));
-            temp.put("trackDownUser", trackDown.getTrackDownUserId());
+            temp.put("trackDownDate", trackDown.getTrackDownDate() == null ? "--" : DateUtil.getyyyy_MM_dd_hms(trackDown.getTrackDownDate()));
+            temp.put("trackDownUser", StringUtils.isEmpty(trackDown.getTrackDownUserId()) ? "--" : trackDown.getTrackDownUserId());
             temp.put("trackDownType", TrackDownTypeEnums.getName(trackDown.getTrackDownDateType()));
             temp.put("result", StringUtils.isEmpty(trackDown.getResult()) ? "--" : trackDown.getResult());
             temp.put("reservatDate", DateUtil.getyyyy_MM_dd(trackDown.getReservatDate()));