Browse Source

Merge branch 'develop' into bug/mix20190729

# Conflicts:
#	icss-service/src/main/java/com/diagbot/facade/PushFacade.java
gaodm 5 years ago
parent
commit
cf1027caa2
1 changed files with 1 additions and 2 deletions
  1. 1 2
      icss-service/src/main/java/com/diagbot/facade/PushFacade.java

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

@@ -33,7 +33,6 @@ import com.diagbot.vo.PushVO;
 import com.diagbot.vo.QuestionIds2VO;
 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;
 
@@ -325,7 +324,7 @@ public class PushFacade {
     public List<ConceptPushDTO> addQuestionId(List<ConceptPushDTO> concepts, Integer type) {
         QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
         List<String> nameList = concepts.stream().map(concept -> concept.getName()).collect(Collectors.toList());
-        questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("type", type).ne("tag_type", 8);
+        questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("type", type).ne("tag_type", TagTypeEnum.T8.getKey());
         //化验填写单匹配name
         if (type.equals(ConceptTypeEnum.Lis.getKey())) {
             questionInfoQueryWrapper.in("name", nameList);