Merge remote-tracking branch 'origin/dev/mapping20210603' into test

cdssman-service/src/main/java/com/diagbot/entity/OperationConfig.java

@@ -72,7 +72,7 @@ public class OperationConfig{
     /**
      * 对应项编码
      */
-    //@Excel(name = "对应项编码", width = 40, orderNum = "2")
+    @Excel(name = "手术和操作代码", width = 40, orderNum = "2", isImportField = "true")
     private String code;
 
     /**

cdssman-service/src/main/java/com/diagbot/entity/TransfusionConfig.java

@@ -78,13 +78,13 @@ public class TransfusionConfig {
     /**
      * 是否匹配（0-未匹配、1-已匹配）
      */
-    @Excel(name = "是否匹配", width = 20, orderNum = "4", replace = { "未匹配_0", "已匹配_1" }, isImportField = "true")
+    @Excel(name = "是否匹配【未匹配、已匹配】", width = 20, orderNum = "4", replace = { "未匹配_0", "已匹配_1" }, isImportField = "true")
     private Integer isMatch;
 
     /**
      * 数据来源（1-标准词、2-同义词、3-编码、4-历史数据、5-相似词、99-数据迁移）
      */
-    @Excel(name = "数据来源", width = 20, orderNum = "5", replace = { "标准词_1", "同义词_2", "编码_3", "历史数据_4", "相似词_5", "数据迁移_99", "_null" }, isImportField = "true")
+    @Excel(name = "数据来源【不填、标准词、同义词、编码、历史数据、相似词】", width = 20, orderNum = "5", replace = { "标准词_1", "同义词_2", "编码_3", "历史数据_4", "相似词_5", "数据迁移_99", "_null" }, isImportField = "true")
     private Integer source;
 
     @Override