Merge remote-tracking branch 'origin/dev/knowledge' into debug

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

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

@@ -48,8 +48,9 @@ public class ConceptFacade extends ConceptServiceImpl {
      */
     public ConceptDTO getConceptInfo(@RequestBody TermVo termvo) {
 
+//        List<ConceptDTO> conceptDTOs = new ArrayList<>();
         ConceptDTO conceptDTO = new ConceptDTO();
-        List<LibraryInfo> libraryinfos = new ArrayList<>();
+        List<LibraryInfo> libraryinfos;
 
         // 获取医学术语的基本信息
         QueryWrapper<LibraryInfo> query = new QueryWrapper<>();
@@ -58,26 +59,19 @@ public class ConceptFacade extends ConceptServiceImpl {
         query.eq("is_concept", 1);
         LibraryInfo libraryInfo = libraryinfoFacade.getOne(query);
 
-        if (libraryInfo != null) {
+        if ( libraryInfo != null ) {
 
-            conceptDTO = new ConceptDTO();
             conceptDTO.setId(libraryInfo.getConceptId());
             conceptDTO.setLibId(libraryInfo.getId().intValue());
             conceptDTO.setName(libraryInfo.getName());
 
             query = new QueryWrapper<>();
             query.eq("concept_id", libraryInfo.getConceptId());
-            query.eq("is_deleted", "N");
             query.isNull("is_concept");
-            libraryinfos = libraryinfoFacade.list(query);
 
+            libraryinfos = libraryinfoFacade.list(query);
             conceptDTO.setLibraryInfo(libraryinfos);
-        }
-        else {
-            List<String> message = new ArrayList<>();
-            message.add("术语:\"" + termvo.getTerm() +
-                    "\" 类型:\"" + termvo.getType() + "\" 不存在! ");
-            conceptDTO.setMessage(message);
+
         }
 
         return conceptDTO;