Merge remote-tracking branch 'origin/push-symptom' into push-dev

bigdata-web/src/main/java/org/diagbot/bigdata/work/BigDataParamsProxy.java

@@ -9,7 +9,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -34,8 +33,7 @@ public class BigDataParamsProxy {
      * @param searchData
      */
     public AlgorithmClassify[] createAlgorithmClassify(String sysCode, String[] featureTypes, SearchData searchData) {
-        AlgorithmClassify[] classifies = new AlgorithmClassify[featureTypes.length];
-        List<AlgorithmClassify> algorithmClassifies = new ArrayList<>(Arrays.asList(classifies));
+        List<AlgorithmClassify> algorithmClassifies = new ArrayList<>();
         //下了诊断且其他信息全为空 反推标识
         boolean reverse = !StringUtils.isEmpty(searchData.getDiag()) && StringUtils.isEmpty(searchData.getSymptom());
         for (int i = 0; i < featureTypes.length; i++) {
@@ -44,64 +42,64 @@ public class BigDataParamsProxy {
                 switch (FeatureType.parse(featureTypes[i])) {
                     case SYMPTOM:
                         if (reverse) {
-                            algorithmClassifies.add(i,AlgorithmClassify.NEURAL_DIAG_SYMPTOM);
+                            algorithmClassifies.add(AlgorithmClassify.NEURAL_DIAG_SYMPTOM);
                         } else {
-                            algorithmClassifies.add(i,AlgorithmClassify.NEURAL_SYMPTOM);
+                            algorithmClassifies.add(AlgorithmClassify.NEURAL_SYMPTOM);
                         }
                         break;
                     case DIAG:
                         if (reverse) {
-                            algorithmClassifies.add(i,null);
+                            algorithmClassifies.add(null);
                         } else {
-                            algorithmClassifies.add(i,AlgorithmClassify.NEURAL_DIAG);
+                            algorithmClassifies.add(AlgorithmClassify.NEURAL_DIAG);
                         }
                         break;
                     case VITAL:
                         if (reverse) {
-                            algorithmClassifies.add(i,AlgorithmClassify.NEURAL_DIAG_VITAL);
+                            algorithmClassifies.add(AlgorithmClassify.NEURAL_DIAG_VITAL);
 
                         } else {
-                            algorithmClassifies.add(i,AlgorithmClassify.NEURAL_VITAL);
+                            algorithmClassifies.add(AlgorithmClassify.NEURAL_VITAL);
 
                         }
                         break;
                     case LIS:
                         if (reverse) {
-                            algorithmClassifies.add(i,AlgorithmClassify.NEURAL_DIAG_LIS);
+                            algorithmClassifies.add(AlgorithmClassify.NEURAL_DIAG_LIS);
 
                         } else {
-                            algorithmClassifies.add(i,AlgorithmClassify.NEURAL_LIS);
+                            algorithmClassifies.add(AlgorithmClassify.NEURAL_LIS);
                         }
                         break;
                     case PACS:
                         if (reverse) {
-                            algorithmClassifies.add(i,AlgorithmClassify.NEURAL_DIAG_PACS);
+                            algorithmClassifies.add(AlgorithmClassify.NEURAL_DIAG_PACS);
                         } else {
-                            algorithmClassifies.add(i,AlgorithmClassify.NEURAL_PACS);
+                            algorithmClassifies.add(AlgorithmClassify.NEURAL_PACS);
                         }
                         break;
                     case TREAT:
                         if (reverse) {
-                            algorithmClassifies.add(i,AlgorithmClassify.NEURAL_DIAG_TREAT);
+                            algorithmClassifies.add(AlgorithmClassify.NEURAL_DIAG_TREAT);
 
                         } else {
-                            algorithmClassifies.add(i,AlgorithmClassify.NEURAL_TREAT);
+                            algorithmClassifies.add(AlgorithmClassify.NEURAL_TREAT);
 
                         }
                         break;
                     case HISTORY:
                         if (reverse) {
-                            algorithmClassifies.add(i,AlgorithmClassify.NEURAL_DIAG_HISTORY);
+                            algorithmClassifies.add(AlgorithmClassify.NEURAL_DIAG_HISTORY);
 
                         } else {
-                            algorithmClassifies.add(i,AlgorithmClassify.NEURAL_HISTORY);
+                            algorithmClassifies.add(AlgorithmClassify.NEURAL_HISTORY);
                         }
                         break;
                 }
             }
         }
-        AlgorithmClassify[] classifies_new = new AlgorithmClassify[algorithmClassifies.size()];
-        algorithmClassifies.toArray(classifies_new);
-        return classifies_new;
+        AlgorithmClassify[] classifies = new AlgorithmClassify[algorithmClassifies.size()];
+        algorithmClassifies.toArray(classifies);
+        return classifies;
     }
 }