From cb60020cfafa36a35c98a507577cc20abef027c0 Mon Sep 17 00:00:00 2001
From: wtt <wtt@qq.com>
Date: Thu, 18 Mar 2021 11:55:21 +0800
Subject: [PATCH] update

---
 .../platform/operate/web/facade/PatientFacade.java    |  4 +++-
 .../platform/operate/web/worker/QuanWeightWorker.java | 19 +++++++++++++++++--
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
index f65c3cd..6235987 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
@@ -66,6 +66,8 @@ public class PatientFacade {
     @Autowired
     private BasicConfigService basicConfigService;
     @Autowired
+    private TrackDownRecordService trackDownRecordService;
+    @Autowired
     private AutoMatchFacade autoMatchFacade;
     @Autowired
     private AntenatalExaminationService antExService;
@@ -1531,7 +1533,7 @@ public class PatientFacade {
             if (end > patientses.size()) {
                 end = patientses.size();
             }
-            listFuture.add(commonThreadPool.submit(new QuanWeightWorker(patientses.subList(i, end),mongoTemplate,commonService,basicConfigService)));
+            listFuture.add(commonThreadPool.submit(new QuanWeightWorker(patientses.subList(i, end),mongoTemplate,commonService,basicConfigService,trackDownRecordService)));
         }
         for (Future f : listFuture) {
             try {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanWeightWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanWeightWorker.java
index d78a87f..3e09f09 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanWeightWorker.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanWeightWorker.java
@@ -2,6 +2,7 @@ package com.lyms.platform.operate.web.worker;
 
 import com.lyms.platform.biz.service.BasicConfigService;
 import com.lyms.platform.biz.service.CommonService;
+import com.lyms.platform.biz.service.TrackDownRecordService;
 import com.lyms.platform.common.enums.YnEnums;
 import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.common.utils.StringUtils;
@@ -9,8 +10,10 @@ import com.lyms.platform.operate.web.facade.PatientFacade;
 import com.lyms.platform.pojo.MaternalDeliverModel;
 import com.lyms.platform.pojo.PatientWeight;
 import com.lyms.platform.pojo.Patients;
+import com.lyms.platform.pojo.TrackDownRecord;
 import com.lyms.platform.query.AntExChuQuery;
 import com.lyms.platform.query.AntExQuery;
+import com.lyms.platform.query.TrackDownRecordQuery;
 import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -35,16 +38,18 @@ public class QuanWeightWorker implements Callable<List<Map>> {
     private MongoTemplate mongoTemplate;
     private CommonService commonService;
     private BasicConfigService basicConfigService;
-
+    private TrackDownRecordService trackDownRecordService;
     public QuanWeightWorker(List<Patients> patientses,
                             MongoTemplate mongoTemplate,
                             CommonService commonService,
-                            BasicConfigService basicConfigService
+                            BasicConfigService basicConfigService,
+                            TrackDownRecordService trackDownRecordService
     ) {
         this.patientses = patientses;
         this.mongoTemplate = mongoTemplate;
         this.commonService = commonService;
         this.basicConfigService = basicConfigService;
+        this.trackDownRecordService = trackDownRecordService;
     }
 
     @Override
@@ -58,6 +63,16 @@ public class QuanWeightWorker implements Callable<List<Map>> {
                     if (patientWeight != null && com.lyms.platform.common.utils.StringUtils.isNotEmpty(patientWeight.getBmi())) {
                         Map map = new HashMap();
                         puliMap(patients, patientWeight, map);
+                        //列表中冗余上追访管理--孕期检查列表id
+                        TrackDownRecordQuery query = new TrackDownRecordQuery();
+                        query.setParentId(patients.getId());
+                        List <TrackDownRecord> trackDownRecords = trackDownRecordService.queryTrackDown(query);
+                        if(CollectionUtils.isNotEmpty(trackDownRecords)){
+                            TrackDownRecord trackDownRecord = trackDownRecords.get(0);
+                            if (StringUtils.isNotEmpty(trackDownRecord.getId())){
+                                map.put("trackDownRecId", trackDownRecord.getId());
+                           }
+                        }
                         data.add(map);
                     }
 
-- 
1.8.3.1