|
@@ -450,6 +450,14 @@ public class CommonFacade {
|
|
|
pacsResList.add(itemModificationRe);
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ // 辅检项目去重
|
|
|
+ if (ListUtil.isNotEmpty(pacsLabel.getRes())) {
|
|
|
+ dealMsgWithItem(pacsLabel.getRes());
|
|
|
+ }
|
|
|
+ if (ListUtil.isNotEmpty(pacsLabel.getItem())) {
|
|
|
+ dealMsgWithItem(pacsLabel.getItem());
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
//处理辅检
|
|
@@ -540,5 +548,25 @@ public class CommonFacade {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 提示信息去重
|
|
|
+ *
|
|
|
+ * @param itemList
|
|
|
+ */
|
|
|
+ public void dealMsgWithItem(List<Item> itemList) {
|
|
|
+ if (ListUtil.isNotEmpty(itemList)) {
|
|
|
+ List<String> msgList = new ArrayList<>();
|
|
|
+ Iterator<Item> it = itemList.iterator();
|
|
|
+ while (it.hasNext()) {
|
|
|
+ String msg = it.next().getName();
|
|
|
+ if (msgList.contains(msg)) {
|
|
|
+ it.remove();
|
|
|
+ } else {
|
|
|
+ msgList.add(msg);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
|