From 5d29548a3d714bd4fd2fcc55192045afaee97057 Mon Sep 17 00:00:00 2001
From: wtt <wtt@qq.com>
Date: Fri, 26 Mar 2021 08:55:37 +0800
Subject: [PATCH] update

---
 .../operate/web/facade/BabyStatisticsFacade.java   | 25 +++++++++++++---------
 .../operate/web/worker/MonthListsWorker.java       | 24 ++++++++++++---------
 2 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsFacade.java
index 9742a74..7e2122c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsFacade.java
@@ -109,14 +109,8 @@ public class BabyStatisticsFacade  extends BaseServiceImpl {
 
     }
 
-   /**
-     *  获取儿保检查套餐总数1月   3月   6月  8月  12月  18月   24月   30月    36月    4岁    5岁    6岁
-     * @param queryRequest
-     * @param userId
-     * @Author: 武涛涛
-     * @Date: 2021/3/25 19:53
-     */
-    public BaseResponse monthLists1(BabyStatisticsQueryRequest queryRequest,Integer userId) {
+
+    public BaseResponse monthLists_back(BabyStatisticsQueryRequest queryRequest,Integer userId) {
         String hospitalId = autoMatchFacade.getHospitalId(userId);
         long startTime=System.currentTimeMillis(); //获取开始时间
         Map <String, Object> map = new HashMap <>();
@@ -162,13 +156,24 @@ public class BabyStatisticsFacade  extends BaseServiceImpl {
         return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(map);
 
     }
+    /**
+     *  获取儿保检查套餐1月   3月   6月  8月  12月  18月   24月   30月    36月    4岁    5岁    6岁总数
+     * @param queryRequest
+     * @param userId
+     * @Author: 武涛涛
+     * @Date: 2021/3/25 19:53
+     */
     public BaseResponse monthLists(BabyStatisticsQueryRequest queryRequest,Integer userId) {
         String hospitalId = autoMatchFacade.getHospitalId(userId);
         List <Map <String, MonthTcType>> listMaps = monthTcTypeInit();
-
         long startTime=System.currentTimeMillis(); //获取开始时间
+
         List <String> tcType1 = getCountOne(queryRequest, hospitalId);
         List <Map> mapList = convertToMonthLists(listMaps, queryRequest, hospitalId, tcType1);
+        Map map = new HashMap();
+        map.put("tcType1", tcType1 !=null ? tcType1.size() : null);
+        mapList.add(map);
+
         long endTime=System.currentTimeMillis(); //获取结束时间
         System.out.println("程序运行毫秒： " + (endTime - startTime) + "ms");
         return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(mapList);
@@ -192,7 +197,7 @@ public class BabyStatisticsFacade  extends BaseServiceImpl {
             for (Future f : listFuture) {
                 try {
                     if(f!=null && f.get(85, TimeUnit.SECONDS)!=null){
-                        data.addAll((List <Map>) f.get(300, TimeUnit.SECONDS));
+                        data.addAll((List <Map>) f.get(90, TimeUnit.SECONDS));
                     }
                 } catch (Exception e) {
                     ExceptionUtils.catchException(e, "convertToQuanWeight get result Future error.");
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MonthListsWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MonthListsWorker.java
index d5f1c16..e27f2d8 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MonthListsWorker.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MonthListsWorker.java
@@ -48,18 +48,22 @@ public class MonthListsWorker implements Callable <List <Map>> {
     public List <Map> call() throws Exception {
         List <Map> data = new ArrayList <>();
         for (int i = 0; i < mapList.size(); i++) {
-            if (CollectionUtils.isEmpty(countOneList)) {
-                continue;
-            }
-            Map <String, MonthTcType> integerStatisticMap = mapList.get(i);
-           for (Map.Entry <String, MonthTcType> entry : integerStatisticMap.entrySet()) {
-               // System.out.println("Key = " + entry.getKey() + ", Value = " + entry.getValue());
-               MonthTcType monthTcType = integerStatisticMap.get(entry.getKey());
-                if (monthTcType == null) {
+            try {
+                if (CollectionUtils.isEmpty(countOneList)) {
                     continue;
                 }
-               Map <String, Object> map = monthTcType.getMonthTcType(babyStatisticsQueryRequest, hospitalId, countOneList, null);
-                data.add(map);
+                Map <String, MonthTcType> integerStatisticMap = mapList.get(i);
+                for (Map.Entry <String, MonthTcType> entry : integerStatisticMap.entrySet()) {
+                    // System.out.println("Key = " + entry.getKey() + ", Value = " + entry.getValue());
+                    MonthTcType monthTcType = integerStatisticMap.get(entry.getKey());
+                     if (monthTcType == null) {
+                         continue;
+                     }
+                    Map <String, Object> map = monthTcType.getMonthTcType(babyStatisticsQueryRequest, hospitalId, countOneList, null);
+                     data.add(map);
+                 }
+            } catch (Exception e) {
+                e.printStackTrace();
             }
         }
         return data;
-- 
1.8.3.1