|
@@ -96,10 +96,12 @@ public class RetrievalFacade {
|
|
|
//如何没有匹配到questionId就移除
|
|
|
Iterator<RetrievalDTO> retrievalDTOIterator = retrievalDTOS.iterator();
|
|
|
while (retrievalDTOIterator.hasNext()){
|
|
|
- if(retrievalDTOIterator.next().getQuestionId() == null
|
|
|
- && retrievalDTOIterator.next().getType().intValue() != QuestionTypeEnum.Pacs.getKey()
|
|
|
- && retrievalDTOIterator.next().getType().intValue() != QuestionTypeEnum.Disease.getKey()){
|
|
|
- retrievalDTOIterator.remove();
|
|
|
+ RetrievalDTO retrievalDTO = new RetrievalDTO();
|
|
|
+ retrievalDTO = retrievalDTOIterator.next();
|
|
|
+ if(retrievalDTO.getQuestionId() == null
|
|
|
+ && retrievalDTO.getType().intValue() != QuestionTypeEnum.Pacs.getKey()
|
|
|
+ && retrievalDTO.getType().intValue() != QuestionTypeEnum.Disease.getKey()){
|
|
|
+ retrievalDTOIterator.remove();
|
|
|
}
|
|
|
}
|
|
|
return retrievalDTOS;
|