1、映射关系导入过滤空行

src/main/java/com/diagbot/entity/DeptConfig.java

@@ -4,6 +4,7 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.diagbot.util.StringUtil;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
@@ -192,10 +193,12 @@ public class DeptConfig implements Serializable {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o)
+        if (this == o) {
             return true;
-        if (o == null || getClass() != o.getClass())
+        }
+        if (o == null || getClass() != o.getClass()) {
             return false;
+        }
         DeptConfig deptConfig = (DeptConfig) o;
         return Objects.equals(id, deptConfig.id)
                 && Objects.equals(isDeleted, deptConfig.isDeleted)
@@ -210,4 +213,13 @@ public class DeptConfig implements Serializable {
     public int hashCode() {
         return Objects.hash(id, isDeleted, hospitalId, hisName, hisCode, uniqueName, uniqueCode);
     }
+
+    public static boolean nonNull(DeptConfig o) {
+        return !(o == null
+                || (o.hospitalId == null
+                && StringUtil.isBlank(o.hisName)
+                && StringUtil.isBlank(o.hisCode)
+                && StringUtil.isBlank(o.uniqueName)
+                && StringUtil.isBlank(o.uniqueCode)));
+    }
 }

src/main/java/com/diagbot/entity/DiseaseConfig.java

@@ -4,6 +4,7 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.diagbot.util.StringUtil;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
@@ -196,4 +197,12 @@ public class DiseaseConfig implements Serializable {
     public int hashCode() {
         return Objects.hash(id, isDeleted, hospitalId, hisName, uniqueName, icdCode);
     }
+
+    public static boolean nonNull(DiseaseConfig o) {
+        return !(o == null
+                || (o.hospitalId == null
+                && StringUtil.isBlank(o.hisName)
+                && StringUtil.isBlank(o.uniqueName)
+                && StringUtil.isBlank(o.icdCode)));
+    }
 }

src/main/java/com/diagbot/entity/DrugConfig.java

@@ -6,9 +6,9 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.diagbot.util.StringUtil;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.Objects;
@@ -198,10 +198,12 @@ public class DrugConfig implements Serializable {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o)
+        if (this == o) {
             return true;
-        if (o == null || getClass() != o.getClass())
+        }
+        if (o == null || getClass() != o.getClass()) {
             return false;
+        }
         DrugConfig drugConfig = (DrugConfig) o;
         return Objects.equals(id, drugConfig.id)
                 && Objects.equals(isDeleted, drugConfig.isDeleted)
@@ -216,4 +218,13 @@ public class DrugConfig implements Serializable {
     public int hashCode() {
         return Objects.hash(id, isDeleted, hospitalId, hisName, form, uniqueName, uniqueCode);
     }
+
+    public static boolean nonNull(DrugConfig o) {
+        return !(o == null
+                || (o.hospitalId == null
+                && StringUtil.isBlank(o.hisName)
+                && StringUtil.isBlank(o.uniqueName)
+                && StringUtil.isBlank(o.uniqueCode)
+                && StringUtil.isBlank(o.form)));
+    }
 }

src/main/java/com/diagbot/entity/LisConfig.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.diagbot.util.StringUtil;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -197,10 +198,12 @@ public class LisConfig implements Serializable {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o)
+        if (this == o) {
             return true;
-        if (o == null || getClass() != o.getClass())
+        }
+        if (o == null || getClass() != o.getClass()) {
             return false;
+        }
         LisConfig lisConfig = (LisConfig) o;
         return Objects.equals(id, lisConfig.id)
                 && Objects.equals(isDeleted, lisConfig.isDeleted)
@@ -215,4 +218,13 @@ public class LisConfig implements Serializable {
     public int hashCode() {
         return Objects.hash(id, isDeleted, hospitalId, hisName, hisDetailName, uniqueName, uniqueCode);
     }
+
+    public static boolean nonNull(LisConfig o) {
+        return !(o == null
+                || (o.hospitalId == null
+                && StringUtil.isBlank(o.hisName)
+                && StringUtil.isBlank(o.hisDetailName)
+                && StringUtil.isBlank(o.uniqueName)
+                && StringUtil.isBlank(o.uniqueCode)));
+    }
 }

src/main/java/com/diagbot/entity/NurseConfig.java

@@ -4,6 +4,7 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.diagbot.util.StringUtil;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
@@ -195,4 +196,12 @@ public class NurseConfig implements Serializable {
     public int hashCode() {
         return Objects.hash(id, isDeleted, hospitalId, hisName, uniqueName, uniqueCode);
     }
+
+    public static boolean nonNull(NurseConfig o) {
+        return !(o == null
+                || (o.hospitalId == null
+                && StringUtil.isBlank(o.hisName)
+                && StringUtil.isBlank(o.uniqueName)
+                && StringUtil.isBlank(o.uniqueCode)));
+    }
 }

src/main/java/com/diagbot/entity/OperationConfig.java

@@ -4,6 +4,7 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.diagbot.util.StringUtil;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
@@ -196,4 +197,12 @@ public class OperationConfig implements Serializable {
     public int hashCode() {
         return Objects.hash(id, isDeleted, hospitalId, hisName, uniqueName, uniqueCode);
     }
+
+    public static boolean nonNull(OperationConfig o) {
+        return !(o == null
+                || (o.hospitalId == null
+                && StringUtil.isBlank(o.hisName)
+                && StringUtil.isBlank(o.uniqueName)
+                && StringUtil.isBlank(o.uniqueCode)));
+    }
 }

src/main/java/com/diagbot/entity/PacsConfig.java

@@ -4,6 +4,7 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.diagbot.util.StringUtil;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
@@ -177,10 +178,12 @@ public class PacsConfig implements Serializable {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o)
+        if (this == o) {
             return true;
-        if (o == null || getClass() != o.getClass())
+        }
+        if (o == null || getClass() != o.getClass()) {
             return false;
+        }
         PacsConfig pacsConfig = (PacsConfig) o;
         return Objects.equals(id, pacsConfig.id)
                 && Objects.equals(isDeleted, pacsConfig.isDeleted)
@@ -194,4 +197,12 @@ public class PacsConfig implements Serializable {
     public int hashCode() {
         return Objects.hash(id, isDeleted, hospitalId, hisName, uniqueName, uniqueCode);
     }
+
+    public static boolean nonNull(PacsConfig o) {
+        return !(o == null
+                || (o.hospitalId == null
+                && StringUtil.isBlank(o.hisName)
+                && StringUtil.isBlank(o.uniqueName)
+                && StringUtil.isBlank(o.uniqueCode)));
+    }
 }

src/main/java/com/diagbot/entity/ScaleConfig.java

@@ -4,6 +4,7 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.diagbot.util.StringUtil;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
@@ -195,4 +196,12 @@ public class ScaleConfig implements Serializable {
     public int hashCode() {
         return Objects.hash(id, isDeleted, hospitalId, hisName, uniqueName, uniqueCode);
     }
+
+    public static boolean nonNull(ScaleConfig o) {
+        return !(o == null
+                || (o.hospitalId == null
+                && StringUtil.isBlank(o.hisName)
+                && StringUtil.isBlank(o.uniqueName)
+                && StringUtil.isBlank(o.uniqueCode)));
+    }
 }

src/main/java/com/diagbot/entity/TcmdiseaseConfig.java

@@ -4,6 +4,7 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.diagbot.util.StringUtil;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
@@ -196,4 +197,12 @@ public class TcmdiseaseConfig implements Serializable {
     public int hashCode() {
         return Objects.hash(id, isDeleted, hospitalId, hisName, uniqueName, uniqueCode);
     }
+
+    public static boolean nonNull(TcmdiseaseConfig o) {
+        return !(o == null
+                || (o.hospitalId == null
+                && StringUtil.isBlank(o.hisName)
+                && StringUtil.isBlank(o.uniqueName)
+                && StringUtil.isBlank(o.uniqueCode)));
+    }
 }

src/main/java/com/diagbot/entity/TcmsyndromeConfig.java

@@ -4,6 +4,7 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.diagbot.util.StringUtil;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
@@ -196,4 +197,12 @@ public class TcmsyndromeConfig implements Serializable {
     public int hashCode() {
         return Objects.hash(id, isDeleted, hospitalId, hisName, uniqueName, uniqueCode);
     }
+
+    public static boolean nonNull(TcmsyndromeConfig o) {
+        return !(o == null
+                || (o.hospitalId == null
+                && StringUtil.isBlank(o.hisName)
+                && StringUtil.isBlank(o.uniqueName)
+                && StringUtil.isBlank(o.uniqueCode)));
+    }
 }

src/main/java/com/diagbot/entity/TransfusionConfig.java

@@ -4,6 +4,7 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.diagbot.util.StringUtil;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
@@ -177,10 +178,12 @@ public class TransfusionConfig implements Serializable {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o)
+        if (this == o) {
             return true;
-        if (o == null || getClass() != o.getClass())
+        }
+        if (o == null || getClass() != o.getClass()) {
             return false;
+        }
         TransfusionConfig transfusionConfig = (TransfusionConfig) o;
         return Objects.equals(id, transfusionConfig.id)
                 && Objects.equals(isDeleted, transfusionConfig.isDeleted)
@@ -194,4 +197,12 @@ public class TransfusionConfig implements Serializable {
     public int hashCode() {
         return Objects.hash(id, isDeleted, hospitalId, hisName, uniqueName, uniqueCode);
     }
+
+    public static boolean nonNull(TransfusionConfig o) {
+        return !(o == null
+                || (o.hospitalId == null
+                && StringUtil.isBlank(o.hisName)
+                && StringUtil.isBlank(o.uniqueName)
+                && StringUtil.isBlank(o.uniqueCode)));
+    }
 }

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

@@ -251,10 +251,7 @@ public class DeptConfigFacade {
         //2、去除前后空格
         //过滤空数据，保留重复数据，方便计行
         deptConfigList = deptConfigList.stream()
-                .filter(i -> StringUtil.isNotBlank(i.getHisName())
-                        || StringUtil.isNotBlank(i.getHisCode())
-                        || StringUtil.isNotBlank(i.getUniqueCode())
-                        || StringUtil.isNotBlank(i.getUniqueName()))
+                .filter(DeptConfig::nonNull)
                 .collect(Collectors.toList());
         if (ListUtil.isEmpty(deptConfigList)) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "校验失败，导入数据不能为空");

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

@@ -253,9 +253,7 @@ public class DiseaseConfigFacade {
         //2、去除前后空格
         //过滤空数据，保留重复数据，方便计行
         diseaseConfigList = diseaseConfigList.stream()
-                .filter(i -> StringUtil.isNotBlank(i.getHisName())
-                        || StringUtil.isNotBlank(i.getIcdCode())
-                        || StringUtil.isNotBlank(i.getUniqueName()))
+                .filter(DiseaseConfig::nonNull)
                 .collect(Collectors.toList());
         if (ListUtil.isEmpty(diseaseConfigList)) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "校验失败，导入数据不能为空");

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

@@ -280,10 +280,7 @@ public class DrugConfigFacade {
         //2、去除前后空格
         //过滤空数据，保留重复数据，方便计行
         drugConfigList = drugConfigList.stream()
-                .filter(i -> StringUtil.isNotBlank(i.getHisName())
-                        || StringUtil.isNotBlank(i.getForm())
-                        || StringUtil.isNotBlank(i.getUniqueCode())
-                        || StringUtil.isNotBlank(i.getUniqueName()))
+                .filter(DrugConfig::nonNull)
                 .collect(Collectors.toList());
         if (ListUtil.isEmpty(drugConfigList)) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "校验失败，导入数据不能为空");

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

@@ -283,10 +283,7 @@ public class LisConfigFacade {
         //2、去除前后空格
         //过滤空数据，保留重复数据，方便计行
         lisConfigList = lisConfigList.stream()
-                .filter(i -> StringUtil.isNotBlank(i.getHisName())
-                        || StringUtil.isNotBlank(i.getHisDetailName())
-                        || StringUtil.isNotBlank(i.getUniqueCode())
-                        || StringUtil.isNotBlank(i.getUniqueName()))
+                .filter(LisConfig::nonNull)
                 .collect(Collectors.toList());
         if (ListUtil.isEmpty(lisConfigList)) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "校验失败，导入数据不能为空");

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

@@ -252,9 +252,7 @@ public class NurseConfigFacade {
         //2、去除前后空格
         //过滤空数据，保留重复数据，方便计行
         nurseConfigList = nurseConfigList.stream()
-                .filter(i -> StringUtil.isNotBlank(i.getHisName())
-                        || StringUtil.isNotBlank(i.getUniqueCode())
-                        || StringUtil.isNotBlank(i.getUniqueName()))
+                .filter(NurseConfig::nonNull)
                 .collect(Collectors.toList());
         if (ListUtil.isEmpty(nurseConfigList)) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "校验失败，导入数据不能为空");

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

@@ -252,9 +252,7 @@ public class OperationConfigFacade {
         //2、去除前后空格
         //过滤空数据，保留重复数据，方便计行
         operationConfigList = operationConfigList.stream()
-                .filter(i -> StringUtil.isNotBlank(i.getHisName())
-                        || StringUtil.isNotBlank(i.getUniqueCode())
-                        || StringUtil.isNotBlank(i.getUniqueName()))
+                .filter(OperationConfig::nonNull)
                 .collect(Collectors.toList());
         if (ListUtil.isEmpty(operationConfigList)) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "校验失败，导入数据不能为空");

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

@@ -251,9 +251,7 @@ public class PacsConfigFacade {
         //2、去除前后空格
         //过滤空数据，保留重复数据，方便计行
         pacsConfigList = pacsConfigList.stream()
-                .filter(i -> StringUtil.isNotBlank(i.getHisName())
-                        || StringUtil.isNotBlank(i.getUniqueCode())
-                        || StringUtil.isNotBlank(i.getUniqueName()))
+                .filter(PacsConfig::nonNull)
                 .collect(Collectors.toList());
         if (ListUtil.isEmpty(pacsConfigList)) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "校验失败，导入数据不能为空");

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

@@ -252,9 +252,7 @@ public class ScaleConfigFacade {
         //2、去除前后空格
         //过滤空数据，保留重复数据，方便计行
         scaleConfigList = scaleConfigList.stream()
-                .filter(i -> StringUtil.isNotBlank(i.getHisName())
-                        || StringUtil.isNotBlank(i.getUniqueCode())
-                        || StringUtil.isNotBlank(i.getUniqueName()))
+                .filter(ScaleConfig::nonNull)
                 .collect(Collectors.toList());
         if (ListUtil.isEmpty(scaleConfigList)) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "校验失败，导入数据不能为空");

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

@@ -7,6 +7,7 @@ import com.diagbot.client.CdssCoreClient;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.TcmdiseaseInfoDTO;
 import com.diagbot.entity.TcmdiseaseConfig;
+import com.diagbot.entity.TcmsyndromeConfig;
 import com.diagbot.enums.ConceptTypeEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.exception.CommonErrorCode;
@@ -253,9 +254,7 @@ public class TcmdiseaseConfigFacade {
         //2、去除前后空格
         //过滤空数据，保留重复数据，方便计行
         tcmdiseaseConfigList = tcmdiseaseConfigList.stream()
-                .filter(i -> StringUtil.isNotBlank(i.getHisName())
-                        || StringUtil.isNotBlank(i.getUniqueCode())
-                        || StringUtil.isNotBlank(i.getUniqueName()))
+                .filter(TcmdiseaseConfig::nonNull)
                 .collect(Collectors.toList());
         if (ListUtil.isEmpty(tcmdiseaseConfigList)) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "校验失败，导入数据不能为空");

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

@@ -253,9 +253,7 @@ public class TcmsyndromeConfigFacade {
         //2、去除前后空格
         //过滤空数据，保留重复数据，方便计行
         tcmsyndromeConfigList = tcmsyndromeConfigList.stream()
-                .filter(i -> StringUtil.isNotBlank(i.getHisName())
-                        || StringUtil.isNotBlank(i.getUniqueCode())
-                        || StringUtil.isNotBlank(i.getUniqueName()))
+                .filter(TcmsyndromeConfig::nonNull)
                 .collect(Collectors.toList());
         if (ListUtil.isEmpty(tcmsyndromeConfigList)) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "校验失败，导入数据不能为空");

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

@@ -251,9 +251,7 @@ public class TransfusionConfigFacade {
         //2、去除前后空格
         //过滤空数据，保留重复数据，方便计行
         transfusionConfigList = transfusionConfigList.stream()
-                .filter(i -> StringUtil.isNotBlank(i.getHisName())
-                        || StringUtil.isNotBlank(i.getUniqueCode())
-                        || StringUtil.isNotBlank(i.getUniqueName()))
+                .filter(TransfusionConfig::nonNull)
                 .collect(Collectors.toList());
         if (ListUtil.isEmpty(transfusionConfigList)) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "校验失败，导入数据不能为空");