排序

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

@@ -404,25 +404,32 @@ public class ConsoleByDeptExportFacade {
 
     static void orderMethod(BehospitalPageVO behospitalPageVO){
         List orders = behospitalPageVO.getOrders();
-        Boolean flag= false;
+        Boolean flag = false;
         List<OrderItem> itemList = new ArrayList<>();
+        List<OrderItem> targetItemList = new ArrayList<>();
         for (Object order : orders) {
             ObjectMapper objectMapper = new ObjectMapper();
             OrderItem orderName = objectMapper.convertValue(order, OrderItem.class);
             itemList.add(orderName);
-            if(!orderName.getColumn().equals("doctorName")){
+            if(!(orderName.getColumn().equals("deptName")||orderName.getColumn().equals("doctorName"))){
                 flag = true;
             }
         }
-        //医生作为第一升序排列，传入排序随后 配合excel注解属性mergeVertical处理科室合并
+        //科室、医生作为第一升序排列，传入排序随后 配合excel注解属性mergeVertical处理科室合并
+            OrderItem orderDept = new OrderItem();
+            orderDept.setAsc(true);
+            orderDept.setColumn("deptName");
+            targetItemList.add(orderDept);
+            OrderItem orderDoctor = new OrderItem();
+            orderDoctor.setAsc(true);
+            orderDoctor.setColumn("doctorName");
+            targetItemList.add(orderDoctor);
         if(flag){
-            OrderItem orderItem = new OrderItem();
-            orderItem.setAsc(true);
-            orderItem.setColumn("doctorName");
-            itemList.add(orderItem);
-            behospitalPageVO.setOrders(itemList);
-            Collections.reverse(itemList);
+            if(itemList.size()==1){
+                targetItemList.add(itemList.get(0));
+            }
         }
+        behospitalPageVO.setOrders(targetItemList);
 
     };