Browse Source

1、术语关联映射-预匹配

zhaops 3 years ago
parent
commit
33842d9ceb

+ 1 - 1
src/main/java/com/diagbot/entity/DrugConfig.java

@@ -88,6 +88,6 @@ public class DrugConfig {
     /**
      * 数据来源(1-标准词、2-同义词、3-编码、4-历史数据、5-相似词、99-数据迁移)
      */
-    @Excel(name = "数据来源【不填、标准词、同义词、编码、历史数据、相似词】", width = 20, orderNum = "6", replace = { "标准词_1", "同义词_2", "编码_3", "历史数据_4", "相似词_5", "国药准字_6", "数据迁移_99", "_null" }, isImportField = "true")
+    @Excel(name = "数据来源【不填、标准词、同义词、编码、历史数据、相似词、国药准字】", width = 20, orderNum = "6", replace = { "标准词_1", "同义词_2", "编码_3", "历史数据_4", "相似词_5", "国药准字_6", "数据迁移_99", "_null" }, isImportField = "true")
     private Integer source;
 }

+ 3 - 2
src/main/java/com/diagbot/facade/MappingConfigFacade.java

@@ -877,12 +877,13 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
         Pattern pattern = Pattern.compile(regex);
 
         Map<String, IndexBatchDTO> approvalMap = new HashMap<>();
-        for (IndexBatchDTO indexDTO : indexBatchDTOList) {
+        approvalMap = indexBatchDTOList.stream().collect(Collectors.toMap(IndexBatchDTO::getApproval, v -> v));
+        /*for (IndexBatchDTO indexDTO : indexBatchDTOList) {
             Matcher matcher = pattern.matcher(indexDTO.getApproval());
             if (matcher.find()) {
                 approvalMap.put(matcher.group(), indexDTO);
             }
-        }
+        }*/
 
         for (MappingConfigWrapper item : list) {
             if (StringUtil.isBlank(item.getApproval())) {