From 0bccfdf55844a85ea53346c3b7d6e80dd2a293ae Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Sat, 13 Jul 2019 10:17:20 +0800
Subject: [PATCH] lis

---
 .../com/lyms/platform/permission/service/impl/LisServiceImpl.java  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java
index 28a0a68..df4f9c5 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java
@@ -33,6 +33,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
 
 
 @Service("lisService")
@@ -46,8 +47,7 @@ public class LisServiceImpl  implements LisService {
     private AntenatalExaminationService antExService;
     @Autowired
     private PatientsService patientsService;
-    @Autowired
-    private OrganizationService organizationService;
+
     @Override
     public BaseResponse saveLisData(final  List<LisReportModel> lisList,ThreadPoolTaskExecutor commonThreadPool) {
         try {
@@ -65,10 +65,9 @@ public class LisServiceImpl  implements LisService {
                         end = lisList.size();
                     }
                     List<LisReportModel> models = lisList.subList(i, end);
-//                  new Thread(new LisSaveTask(countDownLatch,masterLisMapper,models)).start();
                     commonThreadPool.execute(new LisSaveTask(countDownLatch,masterLisMapper,models));
                 }
-                countDownLatch.await();
+                countDownLatch.await(20, TimeUnit.SECONDS);
             }
             return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
         }
-- 
1.8.3.1