辅检术语校验

src/main/java/com/diagbot/facade/KlConceptFacade.java

@@ -15,6 +15,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -40,10 +41,16 @@ public class KlConceptFacade extends KlConceptServiceImpl {
         //type： 类型：1-化验大项、2-化验小项、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血
         Integer type = convertType(conceptVO.getType());
 
-        List<KlConcept> concepts = this.list(new QueryWrapper<KlConcept>()
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("lib_type", type)
-                .in("lib_name", conceptVO.getNames()));
+        QueryWrapper<KlConcept> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .in("lib_name", conceptVO.getNames());
+        if (conceptVO.getType().equals(3)) {
+            //辅检同时检索辅检项目和辅检子项
+            queryWrapper.in("lib_type", Arrays.asList(LexiconEnum.PacsName.getKey(), LexiconEnum.PacsSubName.getKey()));
+        } else {
+            queryWrapper.eq("lib_type", type);
+        }
+        List<KlConcept> concepts = this.list(queryWrapper);
 
         if (ListUtil.isNotEmpty(concepts)) {
             retList = concepts.stream().map(i -> i.getLibName()).distinct().collect(Collectors.toList());