Merge remote-tracking branch 'origin/master'

src/main/java/com/diagbot/process/OtherTipProcess.java

@@ -68,8 +68,13 @@ public class OtherTipProcess {
                         } else {
                             content += CoreUtil.subZeroAndDot(otherTipNeoDTO.getValue().toString());
                         }
-                        BillMsg billMsg = MsgUtil.getCommonOtherTipLisMsg(content, (String)map.get("msg"), nodeNeoDTO.getTermtype());
-                        res.getOtherList().add(billMsg);
+                        List<String> msgList = (List<String>)map.get("msg");
+                        if (ListUtil.isNotEmpty(msgList)) {
+                            for (String msg : msgList) {
+                                BillMsg billMsg = MsgUtil.getCommonOtherTipLisMsg(content, msg, nodeNeoDTO.getTermtype());
+                                res.getOtherList().add(billMsg);
+                            }
+                        }
                     }
                 }
             }

src/main/java/com/diagbot/util/CoreUtil.java

@@ -277,16 +277,17 @@ public class CoreUtil {
     public static Map compareNameWithNode(NodeNeoDTO nodeNeoDTO, List<? extends Item> item) {
         Map<String, Object> map = new LinkedHashMap<>();
         boolean flag = false;
+        List<String> msgList = new ArrayList<>();
         if (ListUtil.isNotEmpty(item) && nodeNeoDTO != null) {
             for (Item it : item) {
                 if (it.getUniqueName().equals(nodeNeoDTO.getName())) {
                     flag = true;
-                    map.put("msg", it.getName());
-                    break;
+                    msgList.add(it.getName());
                 }
             }
         }
         map.put("flag", flag);
+        map.put("msg", msgList);
         return map;
     }