Merge branch 'develop' into dev/subhos_defplan_20211009

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

@@ -132,13 +132,16 @@ public class KlConceptStaticFacade {
             StaticKnowledgeVO staticKnowledgeVO = new StaticKnowledgeVO();
             BeanUtil.copyProperties(staticKnowledgeHISVO, staticKnowledgeVO);
             staticKnowledgeVO.setName(uniqueName);
-            StaticKnowledgeDTO staticKnowledgeDTO = getStaticKnowledge(staticKnowledgeVO);
-            if (staticKnowledgeDTO != null) {
-                StaticKnowledgeHISDTO staticKnowledgeHISDTO = new StaticKnowledgeHISDTO();
-                BeanUtil.copyProperties(staticKnowledgeDTO, staticKnowledgeHISDTO);
-                staticKnowledgeHISDTO.setHisName(staticKnowledgeHISVO.getHisName());
-                staticKnowledgeHISDTO.setHisDetailName(staticKnowledgeHISVO.getHisDetailName());
-                retList.add(staticKnowledgeHISDTO);
+            try {
+                StaticKnowledgeDTO staticKnowledgeDTO = getStaticKnowledge(staticKnowledgeVO);
+                if (staticKnowledgeDTO != null) {
+                    StaticKnowledgeHISDTO staticKnowledgeHISDTO = new StaticKnowledgeHISDTO();
+                    BeanUtil.copyProperties(staticKnowledgeDTO, staticKnowledgeHISDTO);
+                    staticKnowledgeHISDTO.setHisName(staticKnowledgeHISVO.getHisName());
+                    staticKnowledgeHISDTO.setHisDetailName(staticKnowledgeHISVO.getHisDetailName());
+                    retList.add(staticKnowledgeHISDTO);
+                }
+            } catch (CommonException e) {
             }
         }
         return retList;