BI数据统计结果排序

bi-service/src/main/java/com/diagbot/facade/StatisticsFacade.java

@@ -15,6 +15,7 @@ import io.github.lvyahui8.spring.aggregate.facade.DataBeanAggregateQueryFacade;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -57,12 +58,12 @@ public class StatisticsFacade {
 
     public BIModuleDTO getBIModuleDTO(Map<String, List<BIItemDTO>> map, Integer key) {
         BIModuleDTO biModuleDTO = new BIModuleDTO();
-        if (map.get(StatisticsTypeEnum.getName(key)) == null) {
-            return null;
-        }
         List<BIItemDTO> queryItemList = Lists.newLinkedList();
-        List<BIItemDTO> biItemDTOList = map.get(StatisticsTypeEnum.getName(key));
-        Map<String, BIItemDTO> biItemMap = EntityUtil.makeEntityMap(biItemDTOList, "itemName");
+        Map<String, BIItemDTO> biItemMap = new LinkedHashMap<>();
+        if (map.get(StatisticsTypeEnum.getName(key)) != null) {
+            List<BIItemDTO> biItemDTOList = map.get(StatisticsTypeEnum.getName(key));
+            biItemMap = EntityUtil.makeEntityMap(biItemDTOList, "itemName");
+        }
         switch (StatisticsTypeEnum.getEnum(key)) {
             case DIAGNOSE:
                 if (biItemMap.get(StatisticsDetailTypeEnum.getName(StatisticsDetailTypeEnum.DiseaseCount.getKey())) != null) {
@@ -232,7 +233,7 @@ public class StatisticsFacade {
     }
 
 
-    public BIItemDTO getItem(String moduleName,String itemName,Integer count) {
+    public BIItemDTO getItem(String moduleName, String itemName, Integer count) {
         BIItemDTO biItemDTO = new BIItemDTO();
         biItemDTO.setModuleName(moduleName);
         biItemDTO.setItemName(itemName);