diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownJobFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownJobFacade.java
index 9684bbc..327629c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownJobFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownJobFacade.java
@@ -285,23 +285,33 @@ public class TrackDownJobFacade {
      * <p/>
      * 完成婚检流程并没有建档
      */
-    class HYTrackDownDataLoader implements TrackDownDataLoader<ResidentsArchiveModel> {
+    class HYTrackDownDataLoader implements TrackDownDataLoader<PremaritalCheckup> {
 
         @Override
         public void execute() {
             int page = 0;
-            List<ResidentsArchiveModel> data = null;
+            List<PremaritalCheckup> data = null;
             do {
-                ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery();
+          /*      ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery();
                 archiveQuery.setYn(YnEnums.YES.getId());
                 archiveQuery.setSort("created asc");
                 archiveQuery.setNeed("1");
                 archiveQuery.setPage(page);
-                archiveQuery.setLimit(limit);
+                archiveQuery.setLimit(limit);*/
+
+                PremaritalCheckupQuery premaritalCheckupQuery = new PremaritalCheckupQuery();
+                premaritalCheckupQuery.setYn(YnEnums.YES.getId());
+                premaritalCheckupQuery.setSexType(1);
+                premaritalCheckupQuery.setSort("created asc");
+                premaritalCheckupQuery.setNeed("1");
+                premaritalCheckupQuery.setPage(page);
+                premaritalCheckupQuery.setLimit(limit);
+                data= premaritalCheckupService.queryPremaritalCheckup(premaritalCheckupQuery);
+
                 //查询妇女建档
-                data = residentsArchiveService.queryResident(archiveQuery);
+//                data = residentsArchiveService.queryResident(archiveQuery);
                 if (CollectionUtils.isNotEmpty(data)) {
-                    for (ResidentsArchiveModel model : data) {
+                    for (PremaritalCheckup model : data) {
                         handOneByOne(model);
                     }
                 }
@@ -310,7 +320,7 @@ public class TrackDownJobFacade {
         }
 
         @Override
-        public void handOneByOne(ResidentsArchiveModel model) {
+        public void handOneByOne(PremaritalCheckup model) {
             PatientsQuery patientsQuery1 = new PatientsQuery();
             patientsQuery1.setCardNo(model.getCertificateNum());
             patientsQuery1.setPcerteTypeId(model.getCertificateTypeId());
@@ -318,24 +328,31 @@ public class TrackDownJobFacade {
             Integer count = patientsService.queryPatientCount(patientsQuery1);
             if (null != count && count == 0) {
                 logger.info("HYTrackDownDataLoader addTrackDown by id :" + model.getId());
-                downRecordService.addTrackDown(build(model));
+                TrackDownRecord down= build(model);
+                if(null!=down){
+                    downRecordService.addTrackDown(down);
+                }
             }
         }
 
         @Override
-        public TrackDownRecord build(ResidentsArchiveModel model) {
+        public TrackDownRecord build(PremaritalCheckup model) {
+            if(StringUtils.isEmpty(model.getParentId())){
+                return null;
+            }
             TrackDownRecord record = new TrackDownRecord();
             record.setParentId(model.getId());
-            record.setAddressRegister(model.getAddressRegister());
-            record.setAreaRegisterId(model.getAreaRegisterId());
-            record.setBirth(model.getBirthday());
-            record.setCityRegisterId(model.getCityRegisterId());
-            record.setUsername(model.getUsername());
-            record.setStreetRegisterId(model.getStreetRegisterId());
-            record.setPhone(model.getPhone());
+
+            ResidentsArchiveModel resid = residentsArchiveService.getResident(model.getParentId());
+            record.setAddressRegister(resid.getAddressRegister());
+            record.setAreaRegisterId(resid.getAreaRegisterId());
+            record.setBirth(resid.getBirthday());
+            record.setCityRegisterId(resid.getCityRegisterId());
+            record.setUsername(resid.getUsername());
+            record.setStreetRegisterId(resid.getStreetRegisterId());
+            record.setPhone(resid.getPhone());
             record.setHospitalId(model.getHospitalId());
             record.setStatus(1);
-//            record.setDone(0);
             record.setCardNo(model.getCertificateNum());
             record.setTrackType(TrackDownDateEnums.B.getId());
             return record;