概念查询修改

knowledgeman-service/src/main/java/com/diagbot/enums/LexiconTypeEnum.java

@@ -98,11 +98,25 @@ public enum LexiconTypeEnum implements KeyedNamed {
         }
         return null;
     }
+    
+    public static LexiconTypeEnum getEnum(String name) {
+        for (LexiconTypeEnum item : LexiconTypeEnum.values()) {
+            if (item.name.equals(name)) {
+                return item;
+            }
+        }
+        return null;
+    }
 
     public static String getName(Integer key) {
         LexiconTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }
+    
+    public static Integer getKey(String name) {
+        LexiconTypeEnum item = getEnum(name);
+        return item != null ? item.key : null;
+    }
 
     @Override
     public int getKey() {

knowledgeman-service/src/main/java/com/diagbot/facade/ConceptFacade.java

@@ -203,9 +203,9 @@ public class ConceptFacade extends ConceptServiceImpl {
                 relationQe.in("start_id", conceptIdList);
                 relationQe.eq(getAllForRelationVO.getRelationConceptId() != null, "end_id", getAllForRelationVO.getRelationConceptId());
                 reCouMap = relationFacade.list(relationQe).stream().collect(Collectors.groupingBy(Relation::getStartId, Collectors.counting()));
-            } else {
+            } else if(getAllForRelationVO.getRelationConceptId() != null) {
                 relationQe.in("end_id", conceptIdList);
-                relationQe.eq(getAllForRelationVO.getRelationConceptId() != null, "start_id", getAllForRelationVO.getRelationConceptId());
+                relationQe.eq("start_id", getAllForRelationVO.getRelationConceptId());
                 reCouMap = relationFacade.list(relationQe).stream().collect(Collectors.groupingBy(Relation::getEndId, Collectors.counting()));
             }
         }

knowledgeman-service/src/main/resources/mapper/RelationMapper.xml

@@ -102,7 +102,7 @@
 		WHERE b.id IS NULL <!-- AND c.id IS NULL AND d.id IS NULL -->) t1
 		JOIN kl_concept t2 ON t1.start_id=t2.id
 		JOIN kl_concept t3 ON t1.end_id=t3.id
-		JOIN kl_lexicon t4 ON t3.lib_type=t4.id
+		JOIN kl_lexicon t4 ON t2.lib_type=t4.id
 		where t2.is_deleted='N' AND t3.is_deleted='N' AND t4.is_deleted='N'
 		GROUP BY t2.id) tab
 		where 1=1
@@ -136,7 +136,7 @@
 		WHERE c.id IS NULL) t1
 		JOIN kl_concept t2 ON t1.start_id=t2.id
 		JOIN kl_concept t3 ON t1.end_id=t3.id
-		JOIN kl_lexicon t4 ON t3.lib_type=t4.id
+		JOIN kl_lexicon t4 ON t2.lib_type=t4.id
 		LEFT JOIN kl_relation_order t5 ON t1.id=t5.t_relation_id
 		where t2.is_deleted='N' AND t3.is_deleted='N' AND t4.is_deleted='N'
 		GROUP BY t2.id) tab