From 377811986f4701aada71c20764ecca77ca86bdc6 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Thu, 22 Mar 2018 09:28:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E7=AD=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/facade/SieveFacade.java   |  2 +-
 .../platform/operate/web/worker/SieveWorker.java   | 22 +++++++++++++++++-----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
index 48579ae..9995a6f 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
@@ -282,7 +282,7 @@ public class SieveFacade {
             if (end > list.size()) {
                 end = list.size();
             }
-            listFuture.add(commonThreadPool.submit(new SieveWorker(hospitalId, list.subList(i, end), antenatalExaminationService, patientsService)));
+            listFuture.add(commonThreadPool.submit(new SieveWorker(hospitalId, list.subList(i, end), antenatalExaminationService, patientsService,applyOrderService)));
         }
         for (Future f : listFuture) {
             try {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker.java
index fdfc2e2..448ffd3 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker.java
@@ -1,16 +1,15 @@
 package com.lyms.platform.operate.web.worker;
 
 import com.lyms.platform.biz.service.AntenatalExaminationService;
+import com.lyms.platform.biz.service.ApplyOrderService;
 import com.lyms.platform.biz.service.PatientsService;
 import com.lyms.platform.common.enums.YnEnums;
 import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.operate.web.result.SieveListResult;
-import com.lyms.platform.pojo.AntExChuModel;
-import com.lyms.platform.pojo.AntenatalExaminationModel;
-import com.lyms.platform.pojo.Patients;
-import com.lyms.platform.pojo.SieveModel;
+import com.lyms.platform.pojo.*;
 import com.lyms.platform.query.AntExChuQuery;
 import com.lyms.platform.query.AntExQuery;
+import com.lyms.platform.query.ReferralApplyOrderQuery;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.math.NumberUtils;
@@ -32,14 +31,16 @@ public class SieveWorker implements Callable<List<SieveListResult>> {
     private List<SieveModel> list;
 
     private AntenatalExaminationService antService;
+    private ApplyOrderService applyOrderService;
 
     private PatientsService patientsService;
 
-    public SieveWorker(String hospitalId, List<SieveModel> list, AntenatalExaminationService antService, PatientsService patientsService) {
+    public SieveWorker(String hospitalId, List<SieveModel> list, AntenatalExaminationService antService, PatientsService patientsService,ApplyOrderService applyOrderService) {
         this.hospitalId = hospitalId;
         this.list = list;
         this.antService = antService;
         this.patientsService = patientsService;
+        this.applyOrderService = applyOrderService;
     }
 
     @Override
@@ -80,6 +81,17 @@ public class SieveWorker implements Callable<List<SieveListResult>> {
                 }
                 sieveListResult.setAge(DateUtil.getAge(patients.getBirth()) + "岁");
             }
+
+//            ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery();
+//            referralApplyOrderQuery.setType(2);
+//            referralApplyOrderQuery.setParentId(sieveModel.getParentId());
+//            List<ReferralApplyOrderModel> orderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery);
+//            if (CollectionUtils.isNotEmpty(orderModels))
+//            {
+//
+//            }
+
+
             results.add(sieveListResult);
         }
         return results;
-- 
1.8.3.1