推理关联量表

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

@@ -9,7 +9,6 @@ import com.diagbot.dto.ConceptScaleDetailDTO;
 import com.diagbot.dto.DictionaryInfoDTO;
 import com.diagbot.dto.KlConceptDetailDTO;
 import com.diagbot.dto.KlConceptStaticDTO;
-import com.diagbot.dto.KlScaleByIdDTO;
 import com.diagbot.dto.StaticKnowledgeDTO;
 import com.diagbot.dto.StaticKnowledgeDetailDTO;
 import com.diagbot.dto.StaticKnowledgeIndexPageDTO;
@@ -35,7 +34,6 @@ import com.diagbot.vo.GetDetailVO;
 import com.diagbot.vo.IdVO;
 import com.diagbot.vo.KlConceptStaticPageVO;
 import com.diagbot.vo.KlConceptStaticVO;
-import com.diagbot.vo.KlScaleByIdVO;
 import com.diagbot.vo.StaticKnowledgeIndexPageVO;
 import com.diagbot.vo.StaticKnowledgeVO;
 import com.google.common.collect.Lists;
@@ -766,20 +764,25 @@ public class KlConceptStaticFacade extends KlConceptStaticServiceImpl {
      * @param getDetailVO
      * @return
      */
-    public Map<String, KlScaleByIdDTO> getScaleDetailByConcept(GetDetailVO getDetailVO) {
-        Map<String, KlScaleByIdDTO> retMap = new HashMap<>();
+    public Map<String, ConceptScaleDTO> getScaleDetailByConcept(GetDetailVO getDetailVO) {
+        Map<String, ConceptScaleDTO> retMap = new HashMap<>();
         List<DictionaryInfoDTO> dicTypeName = klDictionaryInfoFacade.getListByGroupType(13);
         Map<String, String> dicTypeNameMap
                 = EntityUtil.makeMapWithKeyValue(dicTypeName, "val", "name");
 
-        if(ListUtil.isNotEmpty(getDetailVO.getNameList())) {
-            KlScaleByIdVO klScaleByIdVO = new KlScaleByIdVO();
-            for (String name : getDetailVO.getNameList()) {
-                klScaleByIdVO.setName(name);
-                List<KlScaleByIdDTO> scaleList = klScaleFacade.getKlScaleById(klScaleByIdVO);
-                if (ListUtil.isNotEmpty(scaleList)) {
-                    retMap.put(name + "_" + dicTypeNameMap.get(LexiconEnum.Scale.getName()), scaleList.get(0));
-                }
+        QueryWrapper<KlConcept> conceptQueryWrapper = new QueryWrapper<>();
+        conceptQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("status", 1)
+                .eq("lib_type", LexiconEnum.Scale.getKey());
+        if (ListUtil.isNotEmpty(getDetailVO.getNameList())) {
+            conceptQueryWrapper.in("lib_name", getDetailVO.getNameList());
+        }
+        List<KlConcept> conceptList = klConceptFacade.list(conceptQueryWrapper);
+
+        if (ListUtil.isNotEmpty(conceptList)) {
+            for (KlConcept concept : conceptList) {
+                retMap.put(concept.getLibName() + "_" + dicTypeNameMap.get(LexiconEnum.Scale.getName()),
+                        getScaleStructure(concept.getId()));
             }
         }
         return retMap;

src/main/java/com/diagbot/web/KlConceptStaticController.java

@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.ConceptDetailDTO;
+import com.diagbot.dto.ConceptScaleDTO;
 import com.diagbot.dto.KlConceptStaticDTO;
-import com.diagbot.dto.KlScaleByIdDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.StaticKnowledgeDTO;
 import com.diagbot.dto.StaticKnowledgeIndexPageDTO;
@@ -142,8 +142,8 @@ public class KlConceptStaticController {
             notes = "nameList： 术语名称 <br>")
     @PostMapping("/getScaleDetailByConcept")
     @SysLogger("getScaleDetailByConcept")
-    public RespDTO<Map<String, KlScaleByIdDTO>> getScaleDetailByConcept(@RequestBody @Valid GetDetailVO getDetailVO) {
-        Map<String, KlScaleByIdDTO> data = klConceptStaticFacade.getScaleDetailByConcept(getDetailVO);
+    public RespDTO<Map<String, ConceptScaleDTO>> getScaleDetailByConcept(@RequestBody @Valid GetDetailVO getDetailVO) {
+        Map<String, ConceptScaleDTO> data = klConceptStaticFacade.getScaleDetailByConcept(getDetailVO);
         return RespDTO.onSuc(data);
     }
 }