Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/diagbot/enums/ConceptTypeEnum.java

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

@@ -224,11 +224,11 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
                     = EntityUtil.makeEntityListMap(staticKnowledgeIndexDTOList, "typeName");
             for (DictionaryInfoDTO dic : dicStaticIndexList) {
                 if (dic.getName().equals("检验")) {
-                    if (map.containsKey("检验套餐")) {
-                        retList.addAll(map.get("检验套餐"));
+                    if (map.containsKey(ConceptTypeEnum.LisPack.getName())) {
+                        retList.addAll(map.get(ConceptTypeEnum.LisPack.getName()));
                     }
-                    if (map.containsKey("检验明细")) {
-                        retList.addAll(map.get("检验明细"));
+                    if (map.containsKey(ConceptTypeEnum.Lis.getName())) {
+                        retList.addAll(map.get(ConceptTypeEnum.Lis.getName()));
                     }
                 } else if (map.containsKey(dic.getName())) {
                     retList.addAll(map.get(dic.getName()));