获取量表

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

@@ -599,11 +599,13 @@ public class KlConceptStaticFacade extends KlConceptStaticServiceImpl {
                 : new ArrayList<>());
 
         //获取量表结构
-        KlScaleByIdVO klScaleByIdVO = new KlScaleByIdVO();
-        klScaleByIdVO.setId(staticInfo.getId());
-        List<KlScaleByIdDTO> scaleList = klScaleFacade.getKlScaleById(klScaleByIdVO);
-        if (ListUtil.isNotEmpty(scaleList)) {
-            klConceptStaticDTO.setScale(scaleList.get(0));
+        if (concept.getLibType().equals(LexiconEnum.Scale.getKey())) {
+            KlScaleByIdVO klScaleByIdVO = new KlScaleByIdVO();
+            klScaleByIdVO.setId(staticInfo.getId());
+            List<KlScaleByIdDTO> scaleList = klScaleFacade.getKlScaleById(klScaleByIdVO);
+            if (ListUtil.isNotEmpty(scaleList)) {
+                klConceptStaticDTO.setScale(scaleList.get(0));
+            }
         }
         return klConceptStaticDTO;
     }

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

@@ -68,6 +68,9 @@ public class KlScaleFacade {
         KlScaleDetailMenuVO detailMenuVO = new KlScaleDetailMenuVO();
         detailMenuVO.setConceptId(conceptId);
         List<KlScaleDetailWrapper> vteFormDetailData = klConceptScaleFacade.getKlScaleDetailData(detailMenuVO);
+        if (ListUtil.isEmpty(vteFormDetailData)) {
+            return null;
+        }
         Map<Long, Map<Integer, List<KlScaleDetailWrapper>>> collect = vteFormDetailData.stream().filter(i -> !i.getParentId().equals(-1)).collect(Collectors.groupingBy(KlScaleDetailWrapper::getConceptId, Collectors.groupingBy(KlScaleDetailWrapper::getGroupNum)));
         //把子级数据，放在父级下
         Map<Long, List<KlScaleDetailWrapper>> mapParentId = vteFormDetailData.stream().collect(Collectors.groupingBy(KlScaleDetailWrapper::getConceptId));