修改加在词库语句和查找标准词类型

graphdb/src/main/java/org/diagbot/pub/Ciku.java

@@ -2,7 +2,7 @@ package org.diagbot.pub;
 
 public enum Ciku {
     SYMPTOM("1","1,70"),VITAL_RESULT("2","35,70"),BIGlIS("3","12"),SUBLIS("subLis","13")
-    ,RESULTLIS("resultLis","14,70"),PACS("4","16"),RESULTPACS("resultPacs","17,70"),DISEASE("5","18")
+    ,RESULTLIS("resultLis","14"),PACS("4","16"),RESULTPACS("resultPacs","17"),DISEASE("5","18")
     ,HISTORY("6","18,70"),CAUSE("7","5,70"),PROGNOSIS("8","70"),OTHER("9","70");
     private String name;
     private String label;

graphdb/src/main/java/org/diagbot/service/impl/KnowledgeServiceImpl.java

@@ -1569,9 +1569,9 @@ public class    KnowledgeServiceImpl implements KnowledgeService {
         ResultSet rs = null;
         try {
             String tongName, type,  isConcept,stand;
-            String sql = "SELECT name, type_id,is_concept,IF(is_concept=1,a.name,(select lib_name from kl_concept b where b.id = a.concept_id) ) lib_name \n" +
-                    "from kl_library_info a where  a.is_deleted = 'N'\n" +
-                    "and type_id in (1,5,12,13,14,16,17,18,35,70)";
+            String sql = "SELECT a.name,a.type_id,a.is_concept, b.lib_name  from kl_library_info a, kl_concept b\n" +
+                    " where a.is_deleted = 'N' and b.is_deleted = 'N' and a.concept_id = b.id\n" +
+                    " and a.type_id in (1,5,12,13,14,16,17,18,35,70)";
             st = connection.createStatement();
             rs = st.executeQuery(sql);
             Map<String,String> detail =null;