|
@@ -316,7 +316,13 @@ 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()).in("tag_name", nameList).eq("type", type);
|
|
|
|
|
|
+ questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("type", type);
|
|
|
|
+ //化验填写单匹配name
|
|
|
|
+ if (type.equals(ConceptTypeEnum.Lis.getKey())) {
|
|
|
|
+ questionInfoQueryWrapper.in("name", nameList);
|
|
|
|
+ } else {
|
|
|
|
+ questionInfoQueryWrapper.in("tag_name", nameList);
|
|
|
|
+ }
|
|
List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);
|
|
List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);
|
|
if (ListUtil.isNotEmpty(questionInfoList)) {
|
|
if (ListUtil.isNotEmpty(questionInfoList)) {
|
|
Map<String, QuestionInfo> questionInfoMap = EntityUtil.makeEntityMap(questionInfoList, "tagName");
|
|
Map<String, QuestionInfo> questionInfoMap = EntityUtil.makeEntityMap(questionInfoList, "tagName");
|