From fa8b76cd1edfe2ab91555ee5a51dee0d86391b07 Mon Sep 17 00:00:00 2001
From: wtt <wtt@qq.com>
Date: Tue, 24 Mar 2020 15:57:58 +0800
Subject: [PATCH] update

---
 .../java/com/lyms/platform/operate/web/facade/PatientFacade.java     | 5 ++++-
 .../java/com/lyms/platform/operate/web/worker/RareListWorker.java    | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

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 6b63c68..a45dd60 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
@@ -734,6 +734,7 @@ public class PatientFacade {
                 data = convertToTwinsPatient(riskPatientsQueryRequest,patientses, userId, hospital);
             }
         }
+        patientsQuery.mysqlBuild(data.size());
         return new BaseListResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(data).setPageInfo(patientsQuery.getPageInfo());
     }
  /**
@@ -761,8 +762,10 @@ public class PatientFacade {
             if (type == 1) {
                 //处理全部孕妇的情况
                 data = convertToRareList(riskPatientsQueryRequest,patientses, userId, hospital);
+
             }
         }
+        patientsQuery.mysqlBuild(data.size());
         return new BaseListResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(data).setPageInfo(patientsQuery.getPageInfo());
     }
 
@@ -899,7 +902,7 @@ public class PatientFacade {
         }
         for (Future f : listFuture) {
             try {
-                data.addAll((List) f.get(30, TimeUnit.SECONDS));
+                data.addAll((List) f.get(300, TimeUnit.SECONDS));
             } catch (Exception e) {
                 ExceptionUtils.catchException(e, "convertToQuanPatient get result Future error.");
             }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/RareListWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/RareListWorker.java
index 1833be7..cee88d4 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/RareListWorker.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/RareListWorker.java
@@ -325,6 +325,7 @@ public class RareListWorker implements Callable<List<QuanPatientsResult>> {
                 twinsPatientsResult.setrLevel(HighScoreResult.filter(level));
             }
             stopWatch.stop();
+            data.add(twinsPatientsResult);
             logger.debug(stopWatch.toString());
         }
         return data;
-- 
1.8.3.1