Merge remote-tracking branch 'origin/dev/20200426_2nd' into dev/20200426_2nd

src/main/java/com/diagbot/aggregate/AverageStatisticsAggregate.java

@@ -74,7 +74,7 @@ public class AverageStatisticsAggregate {
         filterVO.setEndDate(endDate);
         List<AverageStatisticsDTO> lastAverageDayNumList = homePageFacade.getAverageDayNum(filterVO);
         Map<String, Double> lastMap
-                = EntityUtil.makeMapWithKeyValue(lastAverageDayNumList, "deptName", "averageValue");
+                = EntityUtil.makeMapWithKeyValue(lastAverageDayNumList, "name", "averageValue");
 
         //去年本月
         if (filterVO.getType().equals(1)) {
@@ -89,7 +89,7 @@ public class AverageStatisticsAggregate {
         List<AverageStatisticsDTO> lastYearAverageDayNumList = homePageFacade.getAverageDayNum(filterVO);
 
         Map<String, Double> lastYearMap
-                = EntityUtil.makeMapWithKeyValue(lastYearAverageDayNumList, "deptName", "averageValue");
+                = EntityUtil.makeMapWithKeyValue(lastYearAverageDayNumList, "name", "averageValue");
 
         averageDayNumList.forEach(item -> {
             if (lastMap.containsKey(item.getName())) {
@@ -120,7 +120,7 @@ public class AverageStatisticsAggregate {
         filterVO.setEndDate(endDate);
         List<AverageStatisticsDTO> lastAverageFeeList = homePageFacade.getAverageDayNum(filterVO);
         Map<String, Double> lastMap
-                = EntityUtil.makeMapWithKeyValue(lastAverageFeeList, "deptName", "averageValue");
+                = EntityUtil.makeMapWithKeyValue(lastAverageFeeList, "name", "averageValue");
 
         //去年本月
         if (filterVO.getType().equals(1)) {
@@ -135,7 +135,7 @@ public class AverageStatisticsAggregate {
         List<AverageStatisticsDTO> lastYearAverageFeeList = homePageFacade.getAverageDayNum(filterVO);
 
         Map<String, Double> lastYearMap
-                = EntityUtil.makeMapWithKeyValue(lastYearAverageFeeList, "deptName", "averageValue");
+                = EntityUtil.makeMapWithKeyValue(lastYearAverageFeeList, "name", "averageValue");
 
         averageFeeList.forEach(item -> {
             if (lastMap.containsKey(item.getName())) {