1、预匹配数据过滤空行

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

@@ -475,6 +475,14 @@ public class DeptConfigFacade {
         List<String> hisNameList = originList.stream().map(i -> i.getHisName()).distinct().collect(Collectors.toList());
         Map<String, List<DeptConfig>> allMap = getAll(hisNameList);
 
+        if (ListUtil.isEmpty(originList)) {
+            return retList;
+        }
+        //去除空行
+        originList = originList.stream().filter(DeptConfig::nonNull).collect(Collectors.toList());
+        if (ListUtil.isEmpty(originList)) {
+            return retList;
+        }
         //去除空格
         originList.forEach(item -> {
             item.setHisName(item.getHisName().trim());

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

@@ -490,6 +490,14 @@ public class DiseaseConfigFacade {
         List<String> hisNameList = originList.stream().map(i -> i.getHisName()).distinct().collect(Collectors.toList());
         Map<String, List<DiseaseConfig>> allMap = getAll(hisNameList);
 
+        if (ListUtil.isEmpty(originList)) {
+            return retList;
+        }
+        //去除空行
+        originList = originList.stream().filter(DiseaseConfig::nonNull).collect(Collectors.toList());
+        if (ListUtil.isEmpty(originList)) {
+            return retList;
+        }
         //去除空格
         originList.forEach(item -> {
             item.setHisName(item.getHisName().trim());

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

@@ -741,6 +741,17 @@ public class DrugConfigFacade {
                 .distinct()
                 .collect(Collectors.toList());
 
+        if (ListUtil.isEmpty(originList)) {
+            return retList;
+        }
+        //去除空行
+        originList = originList.stream().filter(DrugConfig::nonNull).collect(Collectors.toList());
+        if (ListUtil.isEmpty(originList)) {
+            return retList;
+        }
+        if (ListUtil.isEmpty(originList)) {
+            return retList;
+        }
         //去除空格
         originList.forEach(item -> {
             item.setHisName(item.getHisName().trim());

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

@@ -586,6 +586,14 @@ public class LisConfigFacade{
         List<String> hisNameList = originList.stream().map(i -> i.getHisName()).distinct().collect(Collectors.toList());
         Map<String, Map<String, List<LisConfig>>> allMap = getAll(hisNameList);
 
+        if (ListUtil.isEmpty(originList)) {
+            return retList;
+        }
+        //去除空行
+        originList = originList.stream().filter(LisConfig::nonNull).collect(Collectors.toList());
+        if (ListUtil.isEmpty(originList)) {
+            return retList;
+        }
         //去除空格
         originList.forEach(item -> {
             item.setHisName(item.getHisName().trim());

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

@@ -498,6 +498,14 @@ public class NurseConfigFacade {
         List<String> hisNameList = originList.stream().map(i -> i.getHisName()).distinct().collect(Collectors.toList());
         Map<String, List<NurseConfig>> allMap = getAll(hisNameList);
 
+        if (ListUtil.isEmpty(originList)) {
+            return retList;
+        }
+        //去除空行
+        originList = originList.stream().filter(NurseConfig::nonNull).collect(Collectors.toList());
+        if (ListUtil.isEmpty(originList)) {
+            return retList;
+        }
         //去除空格
         originList.forEach(item -> {
             item.setHisName(item.getHisName().trim());

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

@@ -498,6 +498,14 @@ public class OperationConfigFacade {
         List<String> hisNameList = originList.stream().map(i -> i.getHisName()).distinct().collect(Collectors.toList());
         Map<String, List<OperationConfig>> allMap = getAll(hisNameList);
 
+        if (ListUtil.isEmpty(originList)) {
+            return retList;
+        }
+        //去除空行
+        originList = originList.stream().filter(OperationConfig::nonNull).collect(Collectors.toList());
+        if (ListUtil.isEmpty(originList)) {
+            return retList;
+        }
         //去除空格
         originList.forEach(item -> {
             item.setHisName(item.getHisName().trim());

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

@@ -496,6 +496,14 @@ public class PacsConfigFacade {
         List<String> hisNameList = originList.stream().map(i -> i.getHisName()).distinct().collect(Collectors.toList());
         Map<String, List<PacsConfig>> allMap = getAll(hisNameList);
 
+        if (ListUtil.isEmpty(originList)) {
+            return retList;
+        }
+        //去除空行
+        originList = originList.stream().filter(PacsConfig::nonNull).collect(Collectors.toList());
+        if (ListUtil.isEmpty(originList)) {
+            return retList;
+        }
         //去除空格
         originList.forEach(item -> {
             item.setHisName(item.getHisName().trim());

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

@@ -498,6 +498,14 @@ public class ScaleConfigFacade {
         List<String> hisNameList = originList.stream().map(i -> i.getHisName()).distinct().collect(Collectors.toList());
         Map<String, List<ScaleConfig>> allMap = getAll(hisNameList);
 
+        if (ListUtil.isEmpty(originList)) {
+            return retList;
+        }
+        //去除空行
+        originList = originList.stream().filter(ScaleConfig::nonNull).collect(Collectors.toList());
+        if (ListUtil.isEmpty(originList)) {
+            return retList;
+        }
         //去除空格
         originList.forEach(item -> {
             item.setHisName(item.getHisName().trim());

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

@@ -487,6 +487,14 @@ public class TcmdiseaseConfigFacade {
         List<String> hisNameList = originList.stream().map(i -> i.getHisName()).distinct().collect(Collectors.toList());
         Map<String, List<TcmdiseaseConfig>> allMap = getAll(hisNameList);
 
+        if (ListUtil.isEmpty(originList)) {
+            return retList;
+        }
+        //去除空行
+        originList = originList.stream().filter(TcmdiseaseConfig::nonNull).collect(Collectors.toList());
+        if (ListUtil.isEmpty(originList)) {
+            return retList;
+        }
         //去除空格
         originList.forEach(item -> {
             item.setHisName(item.getHisName().trim());

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

@@ -487,6 +487,14 @@ public class TcmsyndromeConfigFacade {
         List<String> hisNameList = originList.stream().map(i -> i.getHisName()).distinct().collect(Collectors.toList());
         Map<String, List<TcmsyndromeConfig>> allMap = getAll(hisNameList);
 
+        if (ListUtil.isEmpty(originList)) {
+            return retList;
+        }
+        //去除空行
+        originList = originList.stream().filter(TcmsyndromeConfig::nonNull).collect(Collectors.toList());
+        if (ListUtil.isEmpty(originList)) {
+            return retList;
+        }
         //去除空格
         originList.forEach(item -> {
             item.setHisName(item.getHisName().trim());

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

@@ -496,6 +496,14 @@ public class TransfusionConfigFacade {
         List<String> hisNameList = originList.stream().map(i -> i.getHisName()).distinct().collect(Collectors.toList());
         Map<String, List<TransfusionConfig>> allMap = getAll(hisNameList);
 
+        if (ListUtil.isEmpty(originList)) {
+            return retList;
+        }
+        //去除空行
+        originList = originList.stream().filter(TransfusionConfig::nonNull).collect(Collectors.toList());
+        if (ListUtil.isEmpty(originList)) {
+            return retList;
+        }
         //去除空格
         originList.forEach(item -> {
             item.setHisName(item.getHisName().trim());