|
@@ -310,8 +310,10 @@ public class KnowledgeServiceImpl implements KnowledgeService {
|
|
public Map<String, List<FeatureRate>> getLisPacs(SearchData searchData) {
|
|
public Map<String, List<FeatureRate>> getLisPacs(SearchData searchData) {
|
|
Map<String, List<FeatureRate>> lisPacsFeature = new HashMap<>();
|
|
Map<String, List<FeatureRate>> lisPacsFeature = new HashMap<>();
|
|
String webDiag = searchData.getDiag();
|
|
String webDiag = searchData.getDiag();
|
|
- if(webDiag != null && webDiag !=""){
|
|
|
|
- List<String> webDiagList = Arrays.asList(webDiag.split(",|,|、"));
|
|
|
|
|
|
+ List<String> webDiagList = null;
|
|
|
|
+ if(webDiag != null && webDiag !="") {
|
|
|
|
+ webDiagList = Arrays.asList(webDiag.split(",|,|、"));
|
|
|
|
+ }
|
|
List<FeatureRate> bigdataDiagFeature = searchData.getPushDiags();
|
|
List<FeatureRate> bigdataDiagFeature = searchData.getPushDiags();
|
|
List<String> bigdataDiagList =new LinkedList<>();
|
|
List<String> bigdataDiagList =new LinkedList<>();
|
|
if(bigdataDiagFeature.size()>0){
|
|
if(bigdataDiagFeature.size()>0){
|
|
@@ -325,10 +327,12 @@ public class KnowledgeServiceImpl implements KnowledgeService {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- for (String web: webDiagList ) {
|
|
|
|
- for (int i=0;i<bigdataDiagList.size();i++ ) {
|
|
|
|
- if(bigdataDiagList.get(i).equals(web)){
|
|
|
|
- bigdataDiagList.remove(bigdataDiagList.get(i));
|
|
|
|
|
|
+ if(webDiagList != null){
|
|
|
|
+ for (String web: webDiagList ) {
|
|
|
|
+ for (int i=0;i<bigdataDiagList.size();i++ ) {
|
|
|
|
+ if(bigdataDiagList.get(i).equals(web)){
|
|
|
|
+ bigdataDiagList.remove(bigdataDiagList.get(i));
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -379,7 +383,7 @@ public class KnowledgeServiceImpl implements KnowledgeService {
|
|
}
|
|
}
|
|
lisPacsFeature.put("lisList",lisFeature);
|
|
lisPacsFeature.put("lisList",lisFeature);
|
|
lisPacsFeature.put("pacsList",pacsFeature);
|
|
lisPacsFeature.put("pacsList",pacsFeature);
|
|
- }
|
|
|
|
|
|
+
|
|
return lisPacsFeature;
|
|
return lisPacsFeature;
|
|
}
|
|
}
|
|
|
|
|