如果匹配不到questionID就移除

icss-service/src/main/java/com/diagbot/facade/QuestionUsualFacade.java

@@ -17,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -75,6 +76,13 @@ public class QuestionUsualFacade extends QuestionUsualServiceImpl {
             }
             return questionUsualDTOList;
         }
+        //如何没有匹配到questionId就移除
+        Iterator<QuestionUsualDTO> questionUsualDTOIterator = questionUsualDTOList.iterator();
+        while (questionUsualDTOIterator.hasNext()){
+            if(questionUsualDTOIterator.next().getQuestionId() == null){
+                questionUsualDTOIterator.remove();
+            }
+        }
         return questionUsualDTOList;
     }
 }

icss-service/src/main/java/com/diagbot/facade/RetrievalFacade.java

@@ -17,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -92,6 +93,13 @@ public class RetrievalFacade {
                 retrievalDTOS.add(retrievalDTO);
             }
         }
+        //如何没有匹配到questionId就移除
+        Iterator<RetrievalDTO> retrievalDTOIterator = retrievalDTOS.iterator();
+        while (retrievalDTOIterator.hasNext()){
+                if(retrievalDTOIterator.next().getQuestionId() == null){
+                    retrievalDTOIterator.remove();
+                }
+        }
         return retrievalDTOS;
     }