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

cdssman-service/src/main/java/com/diagbot/facade/MedRuleConvertFacade.java

@@ -476,14 +476,18 @@ public class MedRuleConvertFacade {
                                 conflictDiseases = diseaseConfigMap.keySet().stream()
                                         .filter(i -> i.contains(result.getRuleBaseLibName())).collect(Collectors.toList());
                             }
-                            for (String conflictDisease : conflictDiseases) {
-                                ResultRule convertResult = new ResultRule();
-                                BeanUtil.copyProperties(result, convertResult);
-                                convertResult.setReferenceValue(convertResult.getRuleBaseLibType() + "_" + convertResult.getRuleBaseLibTypeName() + "_" + convertResult.getRuleBaseLibName());
-                                convertResult.setRuleBaseLibName(conflictDisease);
-                                convertResult.setRuleBaseLibType(LexiconEnum.Disease.getKey());
-                                convertResult.setRuleBaseLibTypeName(LexiconEnum.Disease.getName());
-                                tempList.add(convertResult);
+                            if (ListUtil.isNotEmpty(conflictDiseases)) {
+                                for (String conflictDisease : conflictDiseases) {
+                                    ResultRule convertResult = new ResultRule();
+                                    BeanUtil.copyProperties(result, convertResult);
+                                    convertResult.setReferenceValue(convertResult.getRuleBaseLibType() + "_" + convertResult.getRuleBaseLibTypeName() + "_" + convertResult.getRuleBaseLibName());
+                                    convertResult.setRuleBaseLibName(conflictDisease);
+                                    convertResult.setRuleBaseLibType(LexiconEnum.Disease.getKey());
+                                    convertResult.setRuleBaseLibTypeName(LexiconEnum.Disease.getName());
+                                    tempList.add(convertResult);
+                                }
+                            } else {
+                                tempList.add(result);
                             }
                         } else {
                             tempList.add(result);