From 024cf673b9b90055d2b7864a9288c0124ec5ceae Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Fri, 13 Jan 2017 17:56:47 +0800
Subject: [PATCH] 1

---
 .../main/java/com/lyms/platform/query/AreaCodeQuery.java   | 14 ++++++++++++++
 .../platform/operate/web/facade/BookbuildingFacade.java    |  1 +
 .../operate/web/facade/PatientCheckTicketFacade.java       | 10 +++++++++-
 .../src/main/resources/spring/applicationContext.xml       |  3 +--
 4 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/query/AreaCodeQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/AreaCodeQuery.java
index 95d56be..88b0378 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/AreaCodeQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/AreaCodeQuery.java
@@ -11,6 +11,8 @@ import com.lyms.platform.common.dao.operator.MongoQuery;
  */
 public class AreaCodeQuery extends BaseQuery implements IConvertToNativeQuery {
     private String areaId;
+    private Integer yn;
+
 
     @Override
     public MongoQuery convertToQuery() {
@@ -19,6 +21,10 @@ public class AreaCodeQuery extends BaseQuery implements IConvertToNativeQuery {
         if(null!=areaId){
             condition=condition.and("areaId", areaId, MongoOper.IS);
         }
+
+        if(null!=yn){
+            condition=condition.and("yn", yn, MongoOper.IS);
+        }
         return condition.toMongoQuery();
     }
 
@@ -29,4 +35,12 @@ public class AreaCodeQuery extends BaseQuery implements IConvertToNativeQuery {
     public void setAreaId(String areaId) {
         this.areaId = areaId;
     }
+
+    public Integer getYn() {
+        return yn;
+    }
+
+    public void setYn(Integer yn) {
+        this.yn = yn;
+    }
 }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
index 89922d5..d8b7b0f 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
@@ -268,6 +268,7 @@ public class BookbuildingFacade {
             if (null != organization) {
                 AreaCodeQuery areaCodeQuery = new AreaCodeQuery();
                 areaCodeQuery.setAreaId(organization.getCityId());
+                areaCodeQuery.setYn(YnEnums.YES.getId());
                 List<AreaCodeModel> code = areaCodeService.queryList(areaCodeQuery);
                 AreaCodeModel areaCode = null;
                 if (CollectionUtils.isNotEmpty(code)) {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientCheckTicketFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientCheckTicketFacade.java
index 9e21c39..0b26dde 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientCheckTicketFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientCheckTicketFacade.java
@@ -19,6 +19,8 @@ import com.lyms.platform.query.PatientCheckTicketQuery;
 import com.lyms.platform.query.PatientsQuery;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
@@ -48,6 +50,10 @@ public class PatientCheckTicketFacade {
     @Autowired
     private OrganizationService organizationService;
 
+    @Autowired
+    @Qualifier("commonThreadPool")
+    private ThreadPoolTaskExecutor commonThreadPool;
+
     /**
      * 补发以前建档的产检劵
      *
@@ -72,7 +78,7 @@ public class PatientCheckTicketFacade {
             if (end > patientses.size()) {
                 end = patientses.size();
             }
-            new SupplyCheckTicketThread(patientses.subList(i, end)).start();
+            commonThreadPool.execute(new SupplyCheckTicketThread(patientses.subList(i, end)));
         }
         return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
     }
@@ -96,6 +102,8 @@ public class PatientCheckTicketFacade {
                         if (null != organization) {
                             AreaCodeQuery areaCodeQuery = new AreaCodeQuery();
                             areaCodeQuery.setAreaId(organization.getCityId());
+                            areaCodeQuery.setYn(YnEnums.YES.getId()
+                            );
                             List<AreaCodeModel> code = areaCodeService.queryList(areaCodeQuery);
                             AreaCodeModel areaCode = null;
                             if (CollectionUtils.isNotEmpty(code)) {
diff --git a/platform-operate-api/src/main/resources/spring/applicationContext.xml b/platform-operate-api/src/main/resources/spring/applicationContext.xml
index c979f4c..e944f81 100644
--- a/platform-operate-api/src/main/resources/spring/applicationContext.xml
+++ b/platform-operate-api/src/main/resources/spring/applicationContext.xml
@@ -56,7 +56,7 @@
 
     <bean id="commonThreadPool" class="org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor">
         <!-- 核心线程数，默认为1 -->
-        <property name="corePoolSize" value="10" />
+        <property name="corePoolSize" value="10"/>
 
         <!-- 最大线程数，默认为Integer.MAX_VALUE -->
         <property name="maxPoolSize" value="50" />
@@ -73,6 +73,5 @@
         <!-- CallerRunsPolicy:主线程直接执行该任务，执行完之后尝试添加下一个任务到线程池中，可以有效降低向线程池内添加任务的速度 -->
         <!-- DiscardOldestPolicy:抛弃旧的任务、暂不支持；会导致被丢弃的任务无法再次被执行 -->
         <!-- DiscardPolicy:抛弃当前任务、暂不支持；会导致被丢弃的任务无法再次被执行 -->
-
     </bean>
 </beans>
\ No newline at end of file
-- 
1.8.3.1