|
@@ -63,11 +63,17 @@ public class QuestionUsualFacade {
|
|
.map(ConceptBaseDTO::getName)
|
|
.map(ConceptBaseDTO::getName)
|
|
.collect(Collectors.toList());
|
|
.collect(Collectors.toList());
|
|
//与question标签匹配
|
|
//与question标签匹配
|
|
|
|
+ List<Integer> sexList = new ArrayList<>();
|
|
|
|
+ sexList.add(3);
|
|
|
|
+ sexList.add(questionUsualVO.getSexType());
|
|
QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
|
|
questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
.in("tag_name", conceptName)
|
|
.in("tag_name", conceptName)
|
|
.ne("tag_type", 8)
|
|
.ne("tag_type", 8)
|
|
.eq("item_type", 0)
|
|
.eq("item_type", 0)
|
|
|
|
+ .in("sex_type", sexList)
|
|
|
|
+ .le("age_begin", questionUsualVO.getAge())
|
|
|
|
+ .ge("age_end", questionUsualVO.getAge())
|
|
.eq("type", type);
|
|
.eq("type", type);
|
|
List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);
|
|
List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);
|
|
Map<String, QuestionInfo> questionInfoMap
|
|
Map<String, QuestionInfo> questionInfoMap
|