From 57a37487a131cd1bfed04699e9c0bb3a7ae45b72 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Tue, 16 May 2017 11:34:44 +0800
Subject: [PATCH] update

---
 .../permission/dao/master/MasterLisMapper.java     |   2 +
 .../platform/permission/service/LisService.java    |   2 +
 .../permission/service/impl/LisServiceImpl.java    |   5 +
 .../main/resources/mainOrm/master/MasterLis.xml    |  24 ++++
 .../platform/operate/web/facade/LisFacade.java     | 144 ++++++++++++---------
 .../platform/operate/web/utils/LisHandleTask.java  |  78 +++++++++++
 6 files changed, 196 insertions(+), 59 deletions(-)
 create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/LisHandleTask.java

diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterLisMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterLisMapper.java
index a3f7256..44c8082 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterLisMapper.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterLisMapper.java
@@ -30,4 +30,6 @@ public interface MasterLisMapper {
     void updateAppLisStatus(List<String> list);
 
     int saveLisDataTemp(LisReportModel models);
+
+    List<LisReportModel> queryLisDataByStatus(LisReportQuery query);
 }
\ No newline at end of file
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/LisService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/LisService.java
index d426248..0e9e7b0 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/LisService.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/LisService.java
@@ -23,4 +23,6 @@ public interface LisService {
     void updateAppLisStatus(List<String> list);
 
     int saveLisDataTemp(LisReportModel models);
+
+    List<LisReportModel> queryLisDataByStatus(LisReportQuery query);
 }
\ No newline at end of file
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 90ca531..4865f47 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
@@ -91,6 +91,11 @@ public class LisServiceImpl extends DataAccessLayerService implements LisService
         return masterLisMapper.saveLisDataTemp(models);
     }
 
+    @Override
+    public List<LisReportModel> queryLisDataByStatus(LisReportQuery query) {
+        return masterLisMapper.queryLisDataByStatus(query);
+    }
+
 
     public class LisSaveTask implements  Runnable {
 
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml b/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml
index b511f97..bce3e00 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml
@@ -371,6 +371,30 @@
         <include refid="orderAndLimit"/>
     </select>
 
+
+    <select id="queryLisDataByStatus" parameterType="com.lyms.platform.permission.model.LisReportQuery" resultType="com.lyms.platform.permission.model.LisReportModel">
+        SELECT
+        ID AS id,
+        LIS_ID AS lisId,
+        TITLE AS title,
+        TYPE AS type,
+        VCCARDNO AS vcCardNo,
+        APPLY_TIME AS applyTime,
+        CHECK_TIME AS checkTime,
+        PUBLISH_TIME AS publishTime,
+        APPLY_DOCTOR AS applyDoctor,
+        APPLY_DEPT AS applyDept,
+        HOSPITAL_ID AS hospitalId,
+        CHECKER AS checker
+        FROM   LIS_REPORT_TBL
+        <include refid="LisCondition"/>
+        AND PHONE IS NOT NULL AND VCCARDNO IS NOT NULL
+        <include refid="orderAndLimit"/>
+    </select>
+
+
+
+
     <select id="queryLisCount" resultType="int"
             parameterType="com.lyms.platform.permission.model.LisReportQuery">
         select count(1) from LIS_REPORT_TBL
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java
index e7221c9..6561778 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java
@@ -9,12 +9,10 @@ import com.lyms.platform.common.constants.ErrorCodeConstants;
 import com.lyms.platform.common.enums.*;
 import com.lyms.platform.common.result.BaseObjectResponse;
 import com.lyms.platform.common.result.BaseResponse;
-import com.lyms.platform.common.utils.Assert;
-import com.lyms.platform.common.utils.DateUtil;
-import com.lyms.platform.common.utils.JsonUtil;
-import com.lyms.platform.common.utils.SystemConfig;
+import com.lyms.platform.common.utils.*;
 import com.lyms.platform.operate.web.request.*;
 import com.lyms.platform.operate.web.result.*;
+import com.lyms.platform.operate.web.utils.LisHandleTask;
 import com.lyms.platform.permission.model.*;
 import com.lyms.platform.permission.model.LisReportQuery;
 import com.lyms.platform.permission.service.LisService;
@@ -26,50 +24,38 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.math.NumberUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.data.domain.Sort;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Component;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.*;
+import java.util.concurrent.*;
 
 /**
  *
  */
 @Component
 public class LisFacade {
-    @Autowired
-    private AntenatalExaminationService antenatalExaminationService;
+
     @Autowired
     private PatientsService patientsService;
-    @Autowired
-    private BasicConfigFacade basicConfigFacade;
-    @Autowired
-    private BasicConfigService basicConfigService;
-    @Autowired
-    private ApplyOrderService applyOrderService;
+
     @Autowired
     private OrganizationService organizationService;
-    @Autowired
-    private MatDeliverService matDeliverService;
-    @Autowired
-    private PostReviewService postReviewService;
+
     @Autowired
     private AutoMatchFacade autoMatchFacade;
-    @Autowired
-    private StopPregnancyService stopPregnancyService;
-    @Autowired
-    private UsersService usersService;
-    @Autowired
-    private DeleteProcessHandler deleteProcessHandler;
-    @Autowired
-    private AntExRecordService recordService;
 
-    @Autowired
-    private OrganizationGroupsFacade groupsFacade;
 
     @Autowired
     private LisService lisService;
 
+    @Autowired
+    @Qualifier("commonThreadPool")
+    private ThreadPoolTaskExecutor commonThreadPool;
+
     /**
      * 获取lis和ris检验报告
      * @param vcCardNo 就诊卡号
@@ -581,48 +567,88 @@ public class LisFacade {
         query.setSort(" PUBLISH_TIME DESC ");
         query.setStatus(0); //未推送状态
 
-        Set<String> patientIds = new HashSet<>();
-        List<Map<String,String>>  lists = new ArrayList<>();
+        final CopyOnWriteArraySet<String> patientIds = new CopyOnWriteArraySet<>();
+         List<Map<String,String>>  lists = new ArrayList<>();
 
-        List<LisReportModel> lises  = lisService.queryLisDataByQuery(query);
+        List<LisReportModel> lises  = lisService.queryLisDataByStatus(query);
         if (CollectionUtils.isNotEmpty(lises))
         {
-            for(LisReportModel lisReportModel : lises)
-            {
-                Map<String,String> map = new HashMap<>();
-                if (StringUtils.isNotEmpty(lisReportModel.getHospitalId()))
-                {
-                    Organization organization = organizationService.getOrganization(Integer.parseInt(lisReportModel.getHospitalId()));
-                    if (organization != null)
-                    {
-                        map.put("hospitalName",organization.getName());
-                    }
+            Map<String, String> map = new HashMap<>();
+            OrganizationQuery organizationQuery = new OrganizationQuery();
+            organizationQuery.setYn(YnEnums.YES.getId());
+            List<Organization> organizations = organizationService.queryOrganization(organizationQuery);
+            if (organizations != null) {
+               for(Organization organization : organizations)
+               {
+                   map.put(organization.getId() + "", organization.getName());
+               }
+            }
+            organizations.clear();
+
+
+            List<Future> futures = new ArrayList<>();
+            int batchSize = 20;
+            int end = 0;
+            for (int i = 0; i < lises.size(); i += batchSize) {
+                end = (end + batchSize);
+                if (end > lises.size()) {
+                    end = lises.size();
                 }
+                final List<LisReportModel> models = lises.subList(i, end);
+                Callable c = new LisHandleTask(patientsService,models,map);
+                Future f = commonThreadPool.submit(c);
+                futures.add(f);
+            }
 
-                PatientsQuery patientsQuery=new PatientsQuery();
-                String[] strs = new String[]{lisReportModel.getPhone(), lisReportModel.getVcCardNo()};
-                patientsQuery.setPv(strs);
-                patientsQuery.setYn(YnEnums.YES.getId());
-                List<Patients> list=  patientsService.queryPatient(patientsQuery);
-                if (CollectionUtils.isNotEmpty(list))
+            if (CollectionUtils.isNotEmpty(futures))
+            {
+                for (Future f : futures)
                 {
-                    Patients pat = list.get(0);
-                    String patientId = pat.getId();
-                    if (!patientIds.contains(patientId))
-                    {
-                        patientIds.add(patientId);
-                        map.put("vcCardNo", pat.getVcCardNo());
-                        map.put("name",pat.getUsername());
-                        map.put("phone",pat.getPhone());
-                        map.put("checkTime",DateUtil.getyyyy_MM_dd_hms(lisReportModel.getPublishTime()));
-                        map.put("patientId",patientId);
-                        map.put("hospitalId",lisReportModel.getHospitalId());
-                        map.put("title",lisReportModel.getTitle());
-                        map.put("id",lisReportModel.getId()+"");
-                        lists.add(map);
+                    try {
+                        lists.addAll((List<Map<String,String>>) f.get());
+                    } catch (Exception e) {
+                        ExceptionUtils.catchException(e, "getNoSendLis list  error.");
                     }
                 }
             }
+
+//            for(LisReportModel lisReportModel : lises)
+//            {
+//                Map<String,String> map = new HashMap<>();
+//                if (StringUtils.isNotEmpty(lisReportModel.getHospitalId()))
+//                {
+//                    Organization organization = organizationService.getOrganization(Integer.parseInt(lisReportModel.getHospitalId()));
+//                    if (organization != null)
+//                    {
+//                        map.put("hospitalName",organization.getName());
+//                    }
+//                }
+//
+//                PatientsQuery patientsQuery=new PatientsQuery();
+//                String[] strs = new String[]{lisReportModel.getPhone(), lisReportModel.getVcCardNo()};
+//                patientsQuery.setPv(strs);
+//                patientsQuery.setYn(YnEnums.YES.getId());
+//                List<Patients> list=  patientsService.queryPatient(patientsQuery);
+//                if (CollectionUtils.isNotEmpty(list))
+//                {
+//                    Patients pat = list.get(0);
+//                    String patientId = pat.getId();
+//                    if (!patientIds.contains(patientId))
+//                    {
+//                        patientIds.add(patientId);
+//                        map.put("vcCardNo", pat.getVcCardNo());
+//                        map.put("name",pat.getUsername());
+//                        map.put("phone",pat.getPhone());
+//                        map.put("checkTime",lisReportModel.getCheckTime() == null ? DateUtil.getyyyy_MM_dd_hms(lisReportModel.getPublishTime())
+//                                : DateUtil.getyyyy_MM_dd_hms(lisReportModel.getCheckTime()));
+//                        map.put("patientId",patientId);
+//                        map.put("hospitalId",lisReportModel.getHospitalId());
+//                        map.put("title",lisReportModel.getTitle());
+//                        map.put("id",lisReportModel.getId()+"");
+//                        lists.add(map);
+//                    }
+//                }
+//            }
         }
         patientIds.clear();
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/LisHandleTask.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/LisHandleTask.java
new file mode 100644
index 0000000..af134be
--- /dev/null
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/LisHandleTask.java
@@ -0,0 +1,78 @@
+package com.lyms.platform.operate.web.utils;
+
+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.common.utils.StringUtils;
+import com.lyms.platform.permission.model.LisReportModel;
+import com.lyms.platform.pojo.Patients;
+import com.lyms.platform.query.PatientsQuery;
+import org.apache.commons.collections.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Callable;
+
+/**
+ * Created by Administrator on 2017-05-15.
+ */
+public class LisHandleTask implements Callable {
+
+    private PatientsService patientsService;
+
+    private List<LisReportModel> lises;
+
+    private   Map<String, String> hospitalMap;
+
+    public LisHandleTask(PatientsService patientsService,List<LisReportModel> lises,Map<String, String> hospitalMap)
+    {
+        this.patientsService = patientsService;
+        this.lises = lises;
+        this.hospitalMap = hospitalMap;
+    }
+
+    @Override
+    public List<Map<String,String>> call() throws Exception {
+
+        List<Map<String,String>> result = new ArrayList<>();
+
+        for(LisReportModel lisReportModel : lises)
+        {
+
+               if (StringUtils.isNotEmpty(lisReportModel.getPhone()) || StringUtils.isNotEmpty(lisReportModel.getVcCardNo()))
+               {
+                   Map<String, String> map = new HashMap<>();
+
+                   if (StringUtils.isNotEmpty(lisReportModel.getHospitalId()))
+                   {
+                       map.put("hospitalName",hospitalMap.get(lisReportModel.getHospitalId()));
+                   }
+
+                   PatientsQuery patientsQuery=new PatientsQuery();
+                   String[] strs = new String[]{lisReportModel.getPhone(), lisReportModel.getVcCardNo()};
+                   patientsQuery.setPv(strs);
+                   patientsQuery.setYn(YnEnums.YES.getId());
+                   List<Patients> list=  patientsService.queryPatient(patientsQuery);
+                   if (CollectionUtils.isNotEmpty(list))
+                   {
+                       Patients pat = list.get(0);
+                       String patientId = pat.getId();
+
+                       map.put("vcCardNo", pat.getVcCardNo());
+                       map.put("name",pat.getUsername());
+                       map.put("phone",pat.getPhone());
+                       map.put("checkTime",lisReportModel.getCheckTime() == null ? DateUtil.getyyyy_MM_dd_hms(lisReportModel.getPublishTime())
+                               : DateUtil.getyyyy_MM_dd_hms(lisReportModel.getCheckTime()));
+                       map.put("patientId",patientId);
+                       map.put("hospitalId",lisReportModel.getHospitalId());
+                       map.put("title", lisReportModel.getTitle());
+                       map.put("id",lisReportModel.getId()+"");
+                       result.add(map);
+                   }
+               }
+        }
+        return result;
+    }
+}
-- 
1.8.3.1