From d5ab55a5f1df7e31cfcb36af428a07eb14cd807d Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Thu, 26 Oct 2017 15:26:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=A6=87=E5=88=97=E8=A1=A8=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E4=B9=A1=E9=95=87=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/platform/operate/web/ThreadPoolTest.java  | 46 ++++++++++++++++++++++
 .../operate/web/result/QuanChanResult.java         | 11 ++++++
 .../operate/web/worker/QuanChanPatientWorker.java  |  2 +
 3 files changed, 59 insertions(+)
 create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/ThreadPoolTest.java

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/ThreadPoolTest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/ThreadPoolTest.java
new file mode 100644
index 0000000..eaf1fdf
--- /dev/null
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/ThreadPoolTest.java
@@ -0,0 +1,46 @@
+package com.lyms.platform.operate.web;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @auther yangfei
+ * @createTime 2017年10月25日 18时00分
+ * @discription
+ */
+public class ThreadPoolTest {
+    public static void main(String[] args) {
+        //固定线程数量的线程池
+        ExecutorService threadPool = Executors.newFixedThreadPool(3); //线程池的大小依赖于操作系统（或者说JVM）
+        // ExecutorService threadPool = Executors.newCachedThreadPool(); //单个线程的线程池：只有一个线程在工作，如果这个线程异常结束，则会立刻有一个新线程替代它
+        // ExecutorService threadPool = Executors.newSingleThreadExecutor();
+        for (int i = 1; i <= 10; i++) {
+            final int task = i;
+            threadPool.execute(new Runnable() {
+                @Override
+                public void run() {
+                    for (int j = 1; j <= 10; j++) {
+                        try {
+                            Thread.sleep(20);
+                        } catch (InterruptedException e) { // TODO Auto-generated catch block
+
+                            e.printStackTrace();
+                        }
+                        System.out.println(Thread.currentThread().getName() + " is looping of " + j + " for task of " + task);
+                    }
+                }
+            });
+        }
+        threadPool.shutdown();
+        //结束线程池
+        // 附带一个定时任务，O(∩_∩)O哈哈~
+        Executors.newScheduledThreadPool(3).scheduleAtFixedRate(new Runnable() {
+            @Override
+            public void run() {
+                System.out.println("bombing!");
+            }
+        }, 6, 2, TimeUnit.SECONDS);
+
+    }
+}
\ No newline at end of file
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java
index 578afc6..35442c3 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java
@@ -54,6 +54,9 @@ public class QuanChanResult implements IBasicResultConvert<QuanChanResult, Patie
     private String registerAddr;
     //居住地
     private String addr;
+    //街道/
+    private String street;
+
     //首次建档医院
     private String firstBH;
     //分娩医院
@@ -84,6 +87,14 @@ public class QuanChanResult implements IBasicResultConvert<QuanChanResult, Patie
         return tireNumber;
     }
 
+    public String getStreet() {
+        return street;
+    }
+
+    public void setStreet(String street) {
+        this.street = street;
+    }
+
     public void setTireNumber(String tireNumber) {
         this.tireNumber = tireNumber;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java
index d6291e6..5cab662 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java
@@ -101,6 +101,8 @@ public class QuanChanPatientWorker implements Callable<List<QuanChanResult>> {
             } catch (Exception e) {
                 chanResult.setFirstBH("");
             }
+            //乡镇/街道
+            chanResult.setStreet(CommonsHelper.getName1(patients.getStreetId(),basicConfigService));
             MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
             matDeliverQuery.setPid(patients.getPid());
             matDeliverQuery.setCreatedStart(patients.getLastMenses());
-- 
1.8.3.1