导入未匹配数据去重

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

@@ -878,8 +878,6 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
                 it.remove();
             }
         }
-        tempList.addAll(matchList);
-        tempList.addAll(unMatchList);
 
         // 验证数据是否已存在，已存在的先删除
         // 没id的删除重新插入，有id的更新
@@ -942,7 +940,24 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
                         deleteIds.add(item.getId());
                     }
                 }
+
+                //数据库中已存在匹配项，去除导入文件中未匹配项
+                it = unMatchList.iterator();
+                while (it.hasNext()) {
+                    MappingConfigWrapper item = it.next();
+                    String matchKey = item.getHisName() + "_"
+                            + item.getHisCode() + "_"
+                            + item.getHisDetailName();
+                    if (db_matchMap.containsKey(matchKey)) {
+                        it.remove();
+                    }
+                }
             }
+
+            //过滤后的导入结果集
+            tempList.addAll(matchList);
+            tempList.addAll(unMatchList);
+
             //标准术语校验
             ConceptVO conceptVO = new ConceptVO();
             conceptVO.setSource(MatchSourceEnum.StandWord.getKey());