|
@@ -33,7 +33,6 @@ import com.diagbot.vo.PushVO;
|
|
|
import com.diagbot.vo.QuestionIds2VO;
|
|
import com.diagbot.vo.QuestionIds2VO;
|
|
|
import com.diagbot.vo.QuestionVO;
|
|
import com.diagbot.vo.QuestionVO;
|
|
|
import com.google.common.collect.Lists;
|
|
import com.google.common.collect.Lists;
|
|
|
-import org.aspectj.weaver.patterns.TypePatternQuestions;
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Component;
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
|
|
@@ -325,7 +324,7 @@ public class PushFacade {
|
|
|
public List<ConceptPushDTO> addQuestionId(List<ConceptPushDTO> concepts, Integer type) {
|
|
public List<ConceptPushDTO> addQuestionId(List<ConceptPushDTO> concepts, Integer type) {
|
|
|
QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
|
|
|
List<String> nameList = concepts.stream().map(concept -> concept.getName()).collect(Collectors.toList());
|
|
List<String> nameList = concepts.stream().map(concept -> concept.getName()).collect(Collectors.toList());
|
|
|
- questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("type", type);
|
|
|
|
|
|
|
+ questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("type", type).ne("tag_type", TagTypeEnum.T8.getKey());
|
|
|
//化验填写单匹配name
|
|
//化验填写单匹配name
|
|
|
if (type.equals(ConceptTypeEnum.Lis.getKey())) {
|
|
if (type.equals(ConceptTypeEnum.Lis.getKey())) {
|
|
|
questionInfoQueryWrapper.in("name", nameList);
|
|
questionInfoQueryWrapper.in("name", nameList);
|
gaodm