导入数据预匹配

cdssman-service/src/main/java/com/diagbot/facade/DeptConfigFacade.java

@@ -333,7 +333,7 @@ public class DeptConfigFacade {
         }
         if (ListUtil.isNotEmpty(errorNumList)) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL,
-                    "以下行数（不计入空行）标准术语与数据库术语不匹配："
+                    "以下行数（不计空行）标准术语在数据库中不存在："
                             + errorNumList.stream().collect(Collectors.joining("、"))
                             + "。导入取消，请修改后再试。");
         }
@@ -431,6 +431,11 @@ public class DeptConfigFacade {
         List<DeptConfig> originList = ExcelUtils.importExcel(file, 0, 1, DeptConfig.class);
         Map<String, List<DeptConfig>> allMap = getAll();
 
+        //去除空格
+        originList.forEach(item -> {
+            item.setHisName(item.getHisName().trim());
+        });
+
         //获取标准术语
         List<String> precUniqueName = Lists.newArrayList();
         if (allMap != null) {

cdssman-service/src/main/java/com/diagbot/facade/DiseaseConfigFacade.java

@@ -321,7 +321,7 @@ public class DiseaseConfigFacade {
         }
         if (ListUtil.isNotEmpty(errorNumList)) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL,
-                    "以下行数（不计入空行）标准术语与数据库术语不匹配："
+                    "以下行数（不计空行）标准术语在数据库中不存在："
                             + errorNumList.stream().collect(Collectors.joining("、"))
                             + "。导入取消，请修改后再试。");
         }
@@ -418,6 +418,11 @@ public class DiseaseConfigFacade {
         List<DiseaseConfig> originList = ExcelUtils.importExcel(file, 0, 1, DiseaseConfig.class);
         Map<String, List<DiseaseConfig>> allMap = getAll();
 
+        //去除空格
+        originList.forEach(item -> {
+            item.setHisName(item.getHisName().trim());
+        });
+
         //获取标准术语
         List<String> precUniqueName = Lists.newArrayList();
         if (allMap != null) {

cdssman-service/src/main/java/com/diagbot/facade/DrugConfigFacade.java

@@ -389,7 +389,7 @@ public class DrugConfigFacade {
         }
         if (ListUtil.isNotEmpty(errorNumList)) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL,
-                    "以下行数（不计入空行）标准术语与数据库术语不匹配："
+                    "以下行数（不计空行）标准术语在数据库中不存在："
                             + errorNumList.stream().collect(Collectors.joining("、"))
                             + "。导入取消，请修改后再试。");
         }
@@ -646,6 +646,11 @@ public class DrugConfigFacade {
         List<DrugConfig> originList = ExcelUtils.importExcel(file, 1, 1, DrugConfig.class);
         Map<String, List<DrugConfig>> allMap = getAll();
 
+        //去除空格
+        originList.forEach(item -> {
+            item.setHisName(item.getHisName().trim());
+        });
+
         //获取标准术语
         List<String> precUniqueName = Lists.newArrayList();
         if (allMap != null) {

cdssman-service/src/main/java/com/diagbot/facade/LisConfigFacade.java

@@ -381,7 +381,7 @@ public class LisConfigFacade{
         }
         if (ListUtil.isNotEmpty(errorNumList)) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL,
-                    "以下行数（不计入空行）标准术语与数据库术语不匹配："
+                    "以下行数（不计空行）标准术语在数据库中不存在："
                             + errorNumList.stream().collect(Collectors.joining("、"))
                             + "。导入取消，请修改后再试。");
         }
@@ -496,6 +496,12 @@ public class LisConfigFacade{
         List<LisConfig> originList = ExcelUtils.importExcel(file, 0, 1, LisConfig.class);
         Map<String,Map<String, List<LisConfig>>> allMap = getAll();
 
+        //去除空格
+        originList.forEach(item -> {
+            item.setHisName(item.getHisName().trim());
+            item.setHisDetailName(item.getHisDetailName().trim());
+        });
+
         //标准术语校验
         List<String> precUniqueName = Lists.newArrayList();
         if (allMap != null) {

cdssman-service/src/main/java/com/diagbot/facade/OperationConfigFacade.java

@@ -330,7 +330,7 @@ public class OperationConfigFacade {
         }
         if (ListUtil.isNotEmpty(errorNumList)) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL,
-                    "以下行数（不计入空行）标准术语与数据库术语不匹配："
+                    "以下行数（不计空行）标准术语在数据库中不存在："
                             + errorNumList.stream().collect(Collectors.joining("、"))
                             + "。导入取消，请修改后再试。");
         }
@@ -427,6 +427,11 @@ public class OperationConfigFacade {
         List<OperationConfig> originList = ExcelUtils.importExcel(file, 0, 1, OperationConfig.class);
         Map<String, List<OperationConfig>> allMap = getAll();
 
+        //去除空格
+        originList.forEach(item -> {
+            item.setHisName(item.getHisName().trim());
+        });
+
         //获取标准术语
         List<String> precUniqueName = Lists.newArrayList();
         if (allMap != null) {

cdssman-service/src/main/java/com/diagbot/facade/PacsConfigFacade.java

@@ -328,7 +328,7 @@ public class PacsConfigFacade {
         }
         if (ListUtil.isNotEmpty(errorNumList)) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL,
-                    "以下行数（不计入空行）标准术语与数据库术语不匹配："
+                    "以下行数（不计空行）标准术语在数据库中不存在："
                             + errorNumList.stream().collect(Collectors.joining("、"))
                             + "。导入取消，请修改后再试。");
         }
@@ -425,6 +425,11 @@ public class PacsConfigFacade {
         List<PacsConfig> originList = ExcelUtils.importExcel(file, 0, 1, PacsConfig.class);
         Map<String, List<PacsConfig>> allMap = getAll();
 
+        //去除空格
+        originList.forEach(item -> {
+            item.setHisName(item.getHisName().trim());
+        });
+
         //获取标准术语
         List<String> precUniqueName = Lists.newArrayList();
         if (allMap != null) {

cdssman-service/src/main/java/com/diagbot/facade/TransfusionConfigFacade.java

@@ -328,7 +328,7 @@ public class TransfusionConfigFacade {
         }
         if (ListUtil.isNotEmpty(errorNumList)) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL,
-                    "以下行数（不计入空行）标准术语与数据库术语不匹配："
+                    "以下行数（不计空行）标准术语在数据库中不存在："
                             + errorNumList.stream().collect(Collectors.joining("、"))
                             + "。导入取消，请修改后再试。");
         }
@@ -425,6 +425,11 @@ public class TransfusionConfigFacade {
         List<TransfusionConfig> originList = ExcelUtils.importExcel(file, 0, 1, TransfusionConfig.class);
         Map<String, List<TransfusionConfig>> allMap = getAll();
 
+        //去除空格
+        originList.forEach(item -> {
+            item.setHisName(item.getHisName().trim());
+        });
+
         //获取标准术语
         List<String> precUniqueName = Lists.newArrayList();
         if (allMap != null) {