化验推理结果去重

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

@@ -45,7 +45,6 @@ import com.diagbot.vo.PushKYJVO;
 import com.diagbot.vo.PushVO;
 import com.diagbot.vo.QuestionVO;
 import com.google.common.collect.Lists;
-import org.aspectj.weaver.patterns.TypePatternQuestions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -226,7 +225,11 @@ public class PushFacade {
                 for (FeatureRate featureRate : labs) {
                     if (ListUtil.isNotEmpty(lisMapping.get(featureRate.getFeatureName()))) {
                         //匹配出多个套餐项默认取第一个
-                        nameList.add(lisMapping.get(featureRate.getFeatureName()).get(0));
+                        String name = lisMapping.get(featureRate.getFeatureName()).get(0);
+                        if (nameList.contains(name)) {
+                            continue;
+                        }
+                        nameList.add(name);
                     }
                 }
                 List<QuestionDTO> labDTO = getTagList(nameList, pushVO, FeatureTypeEnum.Lis.getKey());
@@ -423,12 +426,11 @@ public class PushFacade {
                 questionVO.setSexType(pushVO.getSex());
                 questionVO.setId(questionMap.get(name).getId());
                 questionDTO = questionFacade.getById(questionVO);
-                if (questionDTO == null || questionDTO.getId() == null || (!questionDTO.getItemType().equals(0))) {
+                if (questionDTO == null || questionDTO.getId() == null) {
                     questionDTO = new QuestionDTO();
                     questionDTO.setTagName(name);
                     questionDTO.setName(name);
                 }
-
             } else {
                 questionDTO.setTagName(name);
                 questionDTO.setName(name);