返回值问题

bi-server/src/main/java/com/usoftchina/bi/server/service/chart/ShowPopulationService.java

@@ -84,22 +84,22 @@ public class ShowPopulationService {
 
         //无分组
         if (groupByList.size() == 0) {
-            Iterator operatorsList = operators.iterator();
+            Iterator<String> operatorsList = operators.iterator();
             while (operatorsList.hasNext()) {
-                String operator = String.valueOf(operatorsList.next()).toUpperCase();
-                if ("75TH".equals(operator)) {
+                String operator = operatorsList.next();
+                if ("75TH".equalsIgnoreCase(operator)) {
                     String calculation = "MEDIAN";
                     Double median = showChartsMapper.getColumnDev(tableName, columnName, calculation, screenStr);
                     calculation = "MAX";
                     Double max = showChartsMapper.getColumnDev(tableName, columnName, calculation, screenStr);
                     value = showChartsMapper.getValue(tableName, columnName, calculation, median, max);
-                } else if ("25TH".equals(operator)) {
+                } else if ("25TH".equalsIgnoreCase(operator)) {
                     String calculation = "MEDIAN";
                     Double median = showChartsMapper.getColumnDev(tableName, columnName, calculation, screen);
                     calculation = "MIN";
                     Double min = showChartsMapper.getColumnDev(tableName, columnName, calculation, screenStr);
                     value = showChartsMapper.getValue(tableName, columnName, calculation, min, median);
-                } else if ("PERCENT".equals(operator)) {
+                } else if ("PERCENT".equalsIgnoreCase(operator)) {
                     value = 1.00;
                 } else if("dictinctCount".equalsIgnoreCase(operator)){
                     value = showChartsMapper.getDistinctCountColumnData(tableName, columnName, operator, screenStr);