31天再入院全院、科室导出处理

src/main/java/com/diagbot/facade/ConsoleByDeptExportFacade.java

@@ -332,9 +332,8 @@ public class ConsoleByDeptExportFacade {
      * @return
      */
     public void reHos31DaysPageExportByDept(HttpServletResponse response, ReBeHosPageVO reBeHosPageVO) {
-        reBeHosPageVO.setCurrent(1L);
-        reBeHosPageVO.setSize(Long.MAX_VALUE);
         reBeHosPageVO.setSearchCount(false);
+        reBeHosPageVO.setFlag(1);
         IPage<ReBeHosByDeptDTO> page = consoleByDeptFacade.reHos31DaysPageByDept(reBeHosPageVO);
         List<ReBeHosByDeptDTO> records = page.getRecords();
         String fileName = "31天再入院统计详情.xls";

src/main/java/com/diagbot/facade/ConsoleByDeptFacade.java

@@ -903,7 +903,7 @@ public class ConsoleByDeptFacade {
         long size = reBeHosPageVO.getSize();
         long current = reBeHosPageVO.getCurrent();
         reBeHosPageVO.setCurrent(1L);
-        reBeHosPageVO.setSize(10000L);
+        reBeHosPageVO.setSize(Long.MAX_VALUE);
         IPage<ReBeHosMergeDTO> page = behospitalInfoFacade.reHos31DaysPageByDept(reBeHosPageVO);
         List<ReBeHosMergeDTO> records = page.getRecords();
         IPage<ReBeHosByDeptDTO> retPage = new Page<>();
@@ -943,6 +943,9 @@ public class ConsoleByDeptFacade {
                 retRecords.add(retRecord);
             }
         }
+        if(reBeHosPageVO.getFlag()==1){
+            size = retRecords.size();
+        }
         retPage.setSize(size);
         retPage.setTotal(retRecords.size());
         retPage.setCurrent(current);

src/main/java/com/diagbot/facade/ConsoleExportFacade.java

@@ -478,9 +478,8 @@ public class ConsoleExportFacade {
      * @return
      */
     public void reHos31DaysPageExport(HttpServletResponse response, ReBeHosPageVO reBeHosPageVO) {
-        reBeHosPageVO.setCurrent(1L);
-        reBeHosPageVO.setSize(Long.MAX_VALUE);
         reBeHosPageVO.setSearchCount(false);
+        reBeHosPageVO.setFlag(1);
         IPage<ReBeHosDTO> page = consoleFacade.reHos31DaysPage(reBeHosPageVO);
         List<ReBeHosDTO> records = page.getRecords();
         String fileName = "31天再入院统计详情.xls";

src/main/java/com/diagbot/facade/ConsoleFacade.java

@@ -3005,7 +3005,7 @@ public class ConsoleFacade {
         long size = reBeHosPageVO.getSize();
         long current = reBeHosPageVO.getCurrent();
         reBeHosPageVO.setCurrent(1L);
-        reBeHosPageVO.setSize(10000L);
+        reBeHosPageVO.setSize(Long.MAX_VALUE);
         IPage<ReBeHosMergeDTO> page = behospitalInfoFacade.reHos31DaysPage(reBeHosPageVO);
         List<ReBeHosMergeDTO> records = page.getRecords();
         IPage<ReBeHosDTO> retPage = new Page<>();
@@ -3045,6 +3045,9 @@ public class ConsoleFacade {
                 retRecords.add(retRecord);
             }
         }
+        if(reBeHosPageVO.getFlag()==1){
+            size = retRecords.size();
+        }
         retPage.setSize(size);
         retPage.setTotal(retRecords.size());
         retPage.setCurrent(current);

src/main/java/com/diagbot/vo/ReBeHosPageVO.java

@@ -37,4 +37,6 @@ public class ReBeHosPageVO extends Page {
      * 是否归档（0：未归档，1：已归档）
      */
     private String isPlacefile = "1";
+
+    private int flag = 0;//1-导出操作;
 }