剔除化验中的辅检结果和辅检中的化验结果

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

@@ -407,12 +407,12 @@ public class ParamsDataProxy {
         // 在输入的辅检文本中，只提取辅检信息
         String[] PACS_Feature = {Constants.word_property_PACS,
                 Constants.word_property_PACS_Detail, Constants.word_property_PACS_Result};
-        searchData = removeFeature(searchData.getPacs(), fa, searchData, PACS_Feature,  FeatureType.PACS);
+        searchData = removeFeature(searchData.getLis(), fa, searchData, PACS_Feature,  FeatureType.PACS);
 
         // 在输入的化验文本中，只提取化验信息
         String[] LIS_Feature = {Constants.word_property_LIS,
                 Constants.word_property_LIS_Detail, Constants.word_property_LIS_Result};
-        searchData = removeFeature(searchData.getLis(), fa, searchData, LIS_Feature,  FeatureType.LIS);
+        searchData = removeFeature(searchData.getPacs(), fa, searchData, LIS_Feature,  FeatureType.LIS);
 
         return searchData;
     }
@@ -430,16 +430,17 @@ public class ParamsDataProxy {
                     String[] property = item.get("property").toString().split(",");
                     for (String prop : property) {
                         if (Arrays.asList(properties).contains(prop)) {
-                            related = true;
+//                            related = true;
+                            searchData.getInputs().remove(name);
                             break;
                         }
                     }
 
-                    if (!related) {
-                        searchData.getInputs().remove(name);
-                    }
-
-                    related = false;
+//                    if (!related) {
+//                        searchData.getInputs().remove(name);
+//                    }
+//9
+//                    related = false;
                 }
             }