From 7158cfa6dc048a88560114a5e6c319ce75923ae6 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Mon, 12 Jun 2017 17:24:48 +0800
Subject: [PATCH] update code

---
 .../lyms/platform/operate/web/controller/LisController.java   |  5 +++--
 .../java/com/lyms/platform/operate/web/facade/LisFacade.java  | 11 +++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java
index 579fc60..0c0e619 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java
@@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -165,14 +166,14 @@ public class LisController extends BaseController {
      */
     @RequestMapping(method = RequestMethod.GET, value = "/getNoSendLis")
     @ResponseBody
-    public List<Map<String,String>> getNoSendLis(@RequestParam("page") Integer page,
+    public Map<String,Object> getNoSendLis(@RequestParam("page") Integer page,
                                              @RequestParam("limit") Integer limit,
                                              @RequestHeader("Authorization") String token) {
 
         if (!"3d19960bf3e81e7d816c4f26051c49ba".equals(token))
         {
             ExceptionUtils.catchException("The request token is " + token);
-            return new ArrayList<>();
+            return new HashMap<>();
         }
 
         return lisFacade.getNoSendLis(page, limit);
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 3c7f0d4..be166f9 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
@@ -668,7 +668,7 @@ public class LisFacade {
         return hospitalNames;
     }
 
-    public List<Map<String,String>> getNoSendLis(Integer page, Integer limit) {
+    public Map<String,Object> getNoSendLis(Integer page, Integer limit) {
 
         LisReportQuery query =  new LisReportQuery();
         query.setPage(page);
@@ -677,6 +677,10 @@ public class LisFacade {
         query.setSort(" PUBLISH_TIME DESC ");
         query.setStatus(0); //未推送状态
 
+
+        Map<String,Object> result = new HashMap<>();
+
+
         final CopyOnWriteArraySet<String> patientIds = new CopyOnWriteArraySet<>();
          List<Map<String,String>>  lists = new ArrayList<>();
 
@@ -724,7 +728,10 @@ public class LisFacade {
         }
         patientIds.clear();
 
-        return lists;
+        result.put("list", lists);
+        result.put("hasNext",CollectionUtils.isNotEmpty(lises) && lises.size() >= limit ? "true" : "false");
+
+        return result;
     }
 
     public BaseResponse getBabyLisAssistCheckInfo(String vcCardNo, String phone, String checkTime,Integer userId) {
-- 
1.8.3.1