搜索接口更新

src/main/java/com/diagbot/dto/GetAllForRelationDTO.java

@@ -36,6 +36,12 @@ public class GetAllForRelationDTO {
     @ApiModelProperty(value="概念名称(类型)")
     private String conceptNameType;
 
+    /**
+     * 说明
+     */
+    @ApiModelProperty(value="说明（remark）")
+    private String remark;
+
 
 
 }

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

@@ -4,17 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.GetAllForRelationDTO;
 import com.diagbot.dto.IndexBatchDTO;
 import com.diagbot.dto.KllisDetailDTO;
-import com.diagbot.entity.KlConcept;
-import com.diagbot.entity.KlDisease;
-import com.diagbot.entity.KlLibraryInfo;
-import com.diagbot.entity.KlOperation;
-import com.diagbot.entity.TcmDisease;
-import com.diagbot.entity.TcmSyndrome;
-import com.diagbot.enums.ConceptTypeEnum;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.enums.LexiconEnum;
-import com.diagbot.enums.MatchSourceEnum;
-import com.diagbot.enums.StatusEnum;
+import com.diagbot.entity.*;
+import com.diagbot.enums.*;
 import com.diagbot.service.impl.KlConceptServiceImpl;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.ListUtil;
@@ -398,22 +389,27 @@ public class KlConceptFacade extends KlConceptServiceImpl {
         Integer libType = searchConceptVO.getLibType();
         List<Long> excludedConceptIds = searchConceptVO.getExcludedConceptIds();
         if (StringUtils.isNotBlank(name) && libType != null) {
-            List<KlConcept> conceptList = this.list(new QueryWrapper<KlConcept>()
-                    .eq("is_deleted", IsDeleteEnum.N.getKey())
-                    .like(StringUtil.isNotBlank(name), "lib_name", name.trim())
-                    .eq("lib_type", libType)
-                    .eq("status", StatusEnum.Enable.getKey())
-                    .notIn(ListUtil.isNotEmpty(excludedConceptIds), "id", excludedConceptIds));
-            if (ListUtil.isNotEmpty(conceptList)) {
-                getAllForRelationDTOS = conceptList.stream().map(x -> {
-                    GetAllForRelationDTO getAllForRelationDTO = new GetAllForRelationDTO();
-                    getAllForRelationDTO.setConceptNameType(x.getLibName());
-                    getAllForRelationDTO.setConceptName(x.getLibName());
-                    getAllForRelationDTO.setConceptId(x.getId());
-                    getAllForRelationDTO.setLibType(x.getLibType());
-                    return getAllForRelationDTO;
-                }).collect(Collectors.toList());
+            if(libType >= 308 && libType <= 328){
+                getAllForRelationDTOS = this.searchByTypeAndName(searchConceptVO);
+            }else {
+                List<KlConcept> conceptList = this.list(new QueryWrapper<KlConcept>()
+                        .eq("is_deleted", IsDeleteEnum.N.getKey())
+                        .like(StringUtil.isNotBlank(name), "lib_name", name.trim())
+                        .eq("lib_type", libType)
+                        .eq("status", StatusEnum.Enable.getKey())
+                        .notIn(ListUtil.isNotEmpty(excludedConceptIds), "id", excludedConceptIds));
+                if (ListUtil.isNotEmpty(conceptList)) {
+                    getAllForRelationDTOS = conceptList.stream().map(x -> {
+                        GetAllForRelationDTO getAllForRelationDTO = new GetAllForRelationDTO();
+                        getAllForRelationDTO.setConceptNameType(x.getLibName());
+                        getAllForRelationDTO.setConceptName(x.getLibName());
+                        getAllForRelationDTO.setConceptId(x.getId());
+                        getAllForRelationDTO.setLibType(x.getLibType());
+                        return getAllForRelationDTO;
+                    }).collect(Collectors.toList());
+                }
             }
+
         }
         return getAllForRelationDTOS;
     }
@@ -423,4 +419,6 @@ public class KlConceptFacade extends KlConceptServiceImpl {
         Map<String, KllisDetailDTO> res = EntityUtil.makeEntityMap(list, "libName");
         return res;
     }
-}
+
+
+}

src/main/java/com/diagbot/mapper/KlConceptMapper.java

@@ -1,12 +1,14 @@
 package com.diagbot.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.dto.GetAllForRelationDTO;
 import com.diagbot.dto.IndexDTO;
 import com.diagbot.dto.KllisDetailDTO;
 import com.diagbot.dto.StaticKnowledgeIndexDTO;
 import com.diagbot.entity.KlConcept;
 import com.diagbot.vo.KllisDetailVO;
 import com.diagbot.vo.MedRetrievalVO;
+import com.diagbot.vo.SearchConceptVO;
 import com.diagbot.vo.StaticKnowledgeIndexVO;
 
 import java.util.List;
@@ -26,4 +28,7 @@ public interface KlConceptMapper extends BaseMapper<KlConcept> {
     List<StaticKnowledgeIndexDTO> staticIndex(StaticKnowledgeIndexVO staticKnowledgeIndexVO);
 
     List<KllisDetailDTO> getLisDetaisByNames(KllisDetailVO kllisDetailVO);
+
+    List<GetAllForRelationDTO> searchByTypeAndName(SearchConceptVO searchConceptVO);
+
 }

src/main/java/com/diagbot/service/KlConceptService.java

@@ -1,12 +1,14 @@
 package com.diagbot.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.dto.GetAllForRelationDTO;
 import com.diagbot.dto.IndexDTO;
 import com.diagbot.dto.KllisDetailDTO;
 import com.diagbot.dto.StaticKnowledgeIndexDTO;
 import com.diagbot.entity.KlConcept;
 import com.diagbot.vo.KllisDetailVO;
 import com.diagbot.vo.MedRetrievalVO;
+import com.diagbot.vo.SearchConceptVO;
 import com.diagbot.vo.StaticKnowledgeIndexVO;
 
 import java.util.List;
@@ -26,4 +28,7 @@ public interface KlConceptService extends IService<KlConcept> {
     List<StaticKnowledgeIndexDTO> staticIndex(StaticKnowledgeIndexVO staticKnowledgeIndexVO);
 
     List<KllisDetailDTO> getLisDetaisByNames(KllisDetailVO kllisDetailVO);
+
+    List<GetAllForRelationDTO> searchByTypeAndName(SearchConceptVO searchConceptVO);
+
 }

src/main/java/com/diagbot/service/impl/KlConceptServiceImpl.java

@@ -2,6 +2,7 @@ package com.diagbot.service.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.dto.GetAllForRelationDTO;
 import com.diagbot.dto.IndexDTO;
 import com.diagbot.dto.KllisDetailDTO;
 import com.diagbot.dto.StaticKnowledgeIndexDTO;
@@ -10,6 +11,7 @@ import com.diagbot.mapper.KlConceptMapper;
 import com.diagbot.service.KlConceptService;
 import com.diagbot.vo.KllisDetailVO;
 import com.diagbot.vo.MedRetrievalVO;
+import com.diagbot.vo.SearchConceptVO;
 import com.diagbot.vo.StaticKnowledgeIndexVO;
 import org.springframework.stereotype.Service;
 
@@ -41,4 +43,10 @@ public class KlConceptServiceImpl extends ServiceImpl<KlConceptMapper, KlConcept
     public List<KllisDetailDTO> getLisDetaisByNames(KllisDetailVO kllisDetailVO) {
         return baseMapper.getLisDetaisByNames(kllisDetailVO);
     }
-}
+
+    @Override
+    public List<GetAllForRelationDTO> searchByTypeAndName(SearchConceptVO searchConceptVO) {
+        return baseMapper.searchByTypeAndName(searchConceptVO);
+    }
+
+}