Merge remote-tracking branch 'origin/master'

src/main/java/com/diagbot/repository/PacsCriticalNode.java

@@ -31,9 +31,7 @@ public class PacsCriticalNode {
 			List<String> removelt = new ArrayList<>();
 
 			for (Item item : pacsres) {
-
 				String name = item.getUniqueName();
-
 				if (StringUtil.isNotBlank(name)) {
 					List<PacsCritical> pacslist = pacsCriticalRepository.findByResult(name);
 
@@ -43,6 +41,8 @@ public class PacsCriticalNode {
 				}
 			}
 
+			// 结果留下最完整的记录，移除完全包含的内容，
+			// 例如：右下叶后基底段支气管异物，支气管异物，气管异物，只留下“右下叶后基底段支气管异物”
 			for (String x : rules) {
 				for (String y : rules) {
 					if (!y.equals(x) && y.contains(x)) {
@@ -50,9 +50,8 @@ public class PacsCriticalNode {
 					}
 				}
 			}
-
 			for (String rule : rules) {
-				if (removelt.indexOf(rule)==-1) {
+				if (!removelt.contains(rule)) {
 					criticalNeoDTO = new CriticalNeoDTO();
 					criticalNeoDTO.setName(rule);
 					criticalNeoDTO.setStandname(rule);