代码优化

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

@@ -7,6 +7,7 @@ import com.diagbot.dto.QuestionUsualDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.QuestionInfo;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.QuestionTypeEnum;
 import com.diagbot.service.impl.QuestionUsualServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.ListUtil;
@@ -79,7 +80,9 @@ public class QuestionUsualFacade extends QuestionUsualServiceImpl {
         //如何没有匹配到questionId就移除
         Iterator<QuestionUsualDTO> questionUsualDTOIterator = questionUsualDTOList.iterator();
         while (questionUsualDTOIterator.hasNext()){
-            if(questionUsualDTOIterator.next().getQuestionId() == null){
+            if(questionUsualDTOIterator.next().getQuestionId() == null
+                    && questionUsualVO.getType().intValue() != QuestionTypeEnum.Pacs.getKey()
+                    && questionUsualVO.getType().intValue() != QuestionTypeEnum.Disease.getKey()){
                 questionUsualDTOIterator.remove();
             }
         }

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

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