Merge remote-tracking branch 'origin/dev/diagbotcloud20190918_vital' into dev/diagbotcloud20190918_vital

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

@@ -53,7 +53,7 @@
 			a.lib_type AS typeId
 		FROM kl_concept a LEFT JOIN kl_concept_detail b
 		ON a.id=b.concept_id
-		WHERE b.id IS NULL 
+		WHERE a.is_deleted='N' and  b.id IS NULL
 		<if test="name != null and name != ''">
             AND a.lib_name like concat('%',#{name} ,'%' )
         </if>