From 44509c6ecd325ccc14c7767e44d6fbda163e2381 Mon Sep 17 00:00:00 2001
From: litao <litao@lymsh.com>
Date: Wed, 7 Jun 2017 11:47:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/service/impl/ReportServiceImpl.java        | 29 +++++++++++++---------
 .../operate/web/utils/CollectionUtils.java         |  6 +++--
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
index 9e4179d..699b40f 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
@@ -683,23 +683,28 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
     @Override
     public BaseObjectResponse couponInfo(Map<String, Object> param) {
         PageUtil.setPageInfo(param);
-        if(StringUtils.isEmpty(param.get("hospitalId") + "")) {
+        if(param.get("hospitalId") == null) {
             param.put("hospitalId", accessPermissionFacade.getCurrentUserHospPermissions(Integer.parseInt(param.get("userId") + ""))); /** 根据登陆人id 查询出来的医院 */
         }
         doHospitalFilter(param);
+        if(param.get("hospitalId") == null) {
+            return RespBuilder.buildSuccess(new PageResult(0, (Integer) param.get("currentPage") ,(Integer) param.get("pageSize"), CollectionUtils.createMap("couponInfos", new ArrayList<>())));
+        }
         List<Map<String, Object>> couponInfos = couponMapper.findCouponInfo(param);
-        for (Map<String, Object> couponInfo : couponInfos) {
-            String desc = (String) couponReportMap.get(couponInfo.get("type") + "_" + couponInfo.get("coupon_order"));
-            if(StringUtils.isNotBlank(desc)) {
-                /** <div class='ag-double-line'>儿童保健券(五)<div>使用人次</div></div> */
-                String s = desc.replace("使用人次", "")
-                        .replace("<div class='ag-double-line'>", "")
-                        .replace("<div>", "")
-                        .replace("</div>", "");
-                couponInfo.put("type_desc", s);
-            }
+        if(CollectionUtils.isNotEmpty(couponInfos)) {
+            for (Map<String, Object> couponInfo : couponInfos) {
+                String desc = (String) couponReportMap.get(couponInfo.get("type") + "_" + couponInfo.get("coupon_order"));
+                if(StringUtils.isNotBlank(desc)) {
+                    /** <div class='ag-double-line'>儿童保健券(五)<div>使用人次</div></div> */
+                    String s = desc.replace("使用人次", "")
+                            .replace("<div class='ag-double-line'>", "")
+                            .replace("<div>", "")
+                            .replace("</div>", "");
+                    couponInfo.put("type_desc", s);
+                }
 
-            setUsedInfo(couponInfo);
+                setUsedInfo(couponInfo);
+            }
         }
         int count = couponMapper.findCouponInfoCount(param);
         PageResult pageResult = new PageResult(count, (Integer) param.get("currentPage") ,(Integer) param.get("pageSize"), CollectionUtils.createMap("couponInfos", couponInfos));
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CollectionUtils.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CollectionUtils.java
index 9b2d186..99e347f 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CollectionUtils.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CollectionUtils.java
@@ -74,9 +74,11 @@ public class CollectionUtils extends org.apache.commons.collections.CollectionUt
     }
 
     public static <T> List<T> asList(String ids, Class<T> clazz) {
-        Assert.notNull(ids);
-        Assert.notNull(clazz);
+        if(StringUtils.isEmpty(ids)) {
+            return null;
+        }
 
+        Assert.notNull(clazz);
         List<T> list = new ArrayList<>();
         String[] id = ids.split(",");
         for (String s : id) {
-- 
1.8.3.1