类名重复导致的bug

src/main/java/com/diagbot/aggregate/IndicationAggregate.java

@@ -7,7 +7,7 @@ import com.diagbot.facade.CriticalFacade;
 import com.diagbot.facade.HighRiskFacade;
 import com.diagbot.facade.OtherTipFacade;
 import com.diagbot.util.CoreUtil;
-import com.diagbot.util.StringUtil;
+import com.diagbot.util.StringUtil2B;
 import com.diagbot.vo.IndicationPushVO;
 import io.github.lvyahui8.spring.annotation.DataConsumer;
 import io.github.lvyahui8.spring.annotation.DataProvider;
@@ -84,7 +84,7 @@ public class IndicationAggregate {
                 billFacade.billFac(wordCrfDTO, res);
                 CoreUtil.getDebugStr(start, "开单规则耗时", res.getDebug());
             } catch (Exception e) {
-                String errMsg = StringUtil.isNotBlank(indicationPushVO.getIdNum()) ?
+                String errMsg = StringUtil2B.isNotBlank(indicationPushVO.getIdNum()) ?
                         "行号【" + indicationPushVO.getIdNum() + "】" : "";
                 log.error("【开单规则出错】" + errMsg, e);
                 CoreUtil.getDebugStr("【开单规则出错】", errMsg + e, res.getDebug());

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

@@ -1,7 +1,7 @@
 package com.diagbot.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
-import com.diagbot.util.StringUtil;
+import com.diagbot.util.StringUtil2B;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -285,9 +285,9 @@ public class MappingConfig implements Serializable {
         return !(o == null
                 || (o.hospitalId == null
                 && o.type == null
-                && StringUtil.isBlank(o.hisName)
-                && StringUtil.isBlank(o.hisCode)
-                && StringUtil.isBlank(o.hisDetailName)
+                && StringUtil2B.isBlank(o.hisName)
+                && StringUtil2B.isBlank(o.hisCode)
+                && StringUtil2B.isBlank(o.hisDetailName)
                 && o.conceptId == null
                 && o.formConceptId == null
                 && o.isMatch == null

src/main/java/com/diagbot/entity/wrapper/MappingConfigWrapper.java

@@ -1,7 +1,7 @@
 package com.diagbot.entity.wrapper;
 
 import com.diagbot.entity.MappingConfig;
-import com.diagbot.util.StringUtil;
+import com.diagbot.util.StringUtil2B;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -41,9 +41,9 @@ public class MappingConfigWrapper extends MappingConfig {
 
     public static boolean nonNull(MappingConfigWrapper o) {
         return !(o == null
-                || (StringUtil.isBlank(o.uniqueName)
-                && StringUtil.isBlank(o.form)
-                && StringUtil.isBlank(o.code)))
+                || (StringUtil2B.isBlank(o.uniqueName)
+                && StringUtil2B.isBlank(o.form)
+                && StringUtil2B.isBlank(o.code)))
                 || MappingConfig.nonNull(o);
     }
 }

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

@@ -13,7 +13,7 @@ import com.diagbot.rule.DrugRule;
 import com.diagbot.rule.OtherRule;
 import com.diagbot.util.MsgNewUtil;
 import com.diagbot.util.RedisUtil;
-import com.diagbot.util.StringUtil;
+import com.diagbot.util.StringUtil2B;
 import com.diagbot.vo.Drug;
 import com.diagbot.vo.ItemExt;
 import com.diagbot.vo.RuleVO;
@@ -77,7 +77,7 @@ public class BillFacade {
         // 药品
         List<Drug> drugOrder = wordCrfDTO.getDrugOrder();
         for (Drug item : drugOrder) {
-            if (StringUtil.isNotBlank(item.getUniqueName())) {
+            if (StringUtil2B.isNotBlank(item.getUniqueName())) {
                 RuleVO ruleVO = new RuleVO();
                 ruleVO.setInputName(item.getName());
                 ruleVO.setLibName(item.getUniqueName());
@@ -94,7 +94,7 @@ public class BillFacade {
         // 辅检
         List<Pacs> pacsOrder = wordCrfDTO.getPacsOrder();
         for (Pacs pacs : pacsOrder) {
-            if (StringUtil.isNotBlank(pacs.getUniqueName())) {
+            if (StringUtil2B.isNotBlank(pacs.getUniqueName())) {
                 RuleVO ruleVO = new RuleVO();
                 ruleVO.setInputName(pacs.getName());
                 ruleVO.setLibName(pacs.getUniqueName());
@@ -117,7 +117,7 @@ public class BillFacade {
         // 化验套餐
         List<Lis> lisOrder = wordCrfDTO.getLisOrder();
         for (Lis lis : lisOrder) {
-            if (StringUtil.isNotBlank(lis.getUniqueName())) {
+            if (StringUtil2B.isNotBlank(lis.getUniqueName())) {
                 RuleVO ruleVO = new RuleVO();
                 ruleVO.setInputName(lis.getName());
                 ruleVO.setLibName(lis.getUniqueName());
@@ -140,7 +140,7 @@ public class BillFacade {
         // 手术和操作开单项
         List<Item> operations = wordCrfDTO.getOperationOrder();
         for (Item item : operations) {
-            if (StringUtil.isNotBlank(item.getUniqueName())) {
+            if (StringUtil2B.isNotBlank(item.getUniqueName())) {
                 RuleVO ruleVO = new RuleVO();
                 ruleVO.setInputName(item.getName());
                 ruleVO.setLibName(item.getUniqueName());
@@ -154,7 +154,7 @@ public class BillFacade {
         // 输血开单项
         List<ItemExt> transfusions = wordCrfDTO.getTransfusionOrder();
         for (ItemExt item : transfusions) {
-            if (StringUtil.isNotBlank(item.getUniqueName())) {
+            if (StringUtil2B.isNotBlank(item.getUniqueName())) {
                 RuleVO ruleVO = new RuleVO();
                 ruleVO.setInputName(item.getName());
                 ruleVO.setLibName(item.getUniqueName());

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

@@ -12,7 +12,7 @@ import com.diagbot.enums.StandConvertEnum;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.RedisUtil;
-import com.diagbot.util.StringUtil;
+import com.diagbot.util.StringUtil2B;
 import com.diagbot.vo.DecodeRedisVO;
 import com.google.common.collect.Lists;
 import org.apache.commons.collections4.map.LinkedMap;
@@ -90,7 +90,7 @@ public class CacheFacade {
      * @return
      */
     public Object decodeRedis(DecodeRedisVO decodeRedisVO) {
-        if (StringUtil.isNotBlank(decodeRedisVO.getKey()) && StringUtil.isNotBlank(decodeRedisVO.getField())) {
+        if (StringUtil2B.isNotBlank(decodeRedisVO.getKey()) && StringUtil2B.isNotBlank(decodeRedisVO.getField())) {
             return redisUtil.getByKeyAndField(decodeRedisVO.getKey(), decodeRedisVO.getField());
         }
         return redisUtil.get(decodeRedisVO.getKey());
@@ -151,7 +151,7 @@ public class CacheFacade {
             Map<String, List<DictionaryInfoDTO>> map = EntityUtil.makeEntityListMap(dictionaryInfoDTOList, "name");
             for (String key : map.keySet()) {
                 redisUtil.set(RedisEnum.vteAdvice.getName() + key, map.get(key).stream().map(r -> r.getVal())
-                        .filter(r -> StringUtil.isNotBlank(r)).distinct().collect(Collectors.toList()));
+                        .filter(r -> StringUtil2B.isNotBlank(r)).distinct().collect(Collectors.toList()));
             }
         }
     }

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

@@ -4,7 +4,7 @@ import com.diagbot.dto.Cn2SpellDTO;
 import com.diagbot.dto.Cn2SpellDetailDTO;
 import com.diagbot.util.Cn2SpellUtil;
 import com.diagbot.util.ListUtil;
-import com.diagbot.util.StringUtil;
+import com.diagbot.util.StringUtil2B;
 import com.diagbot.vo.Cn2SpellVO;
 import org.springframework.stereotype.Component;
 
@@ -29,7 +29,7 @@ public class Cn2SpellFacade {
         if (null != cn2SpellVO && ListUtil.isNotEmpty(cn2SpellVO.getCnList())) {
             List<Cn2SpellDetailDTO> cn2SpellDetailDTOList = new ArrayList<>();
             for (String cn : cn2SpellVO.getCnList()) {
-                if (StringUtil.isNotBlank(cn)) {
+                if (StringUtil2B.isNotBlank(cn)) {
                     Cn2SpellDetailDTO cn2SpellDetailDTO = new Cn2SpellDetailDTO();
                     cn2SpellDetailDTO.setCn(cn);
                     cn2SpellDetailDTO.setSpell(Cn2SpellUtil.converterToFirstSpell(cn));

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

@@ -38,7 +38,7 @@ import com.diagbot.util.ExtUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.RedisUtil;
 import com.diagbot.util.ReflectUtil;
-import com.diagbot.util.StringUtil;
+import com.diagbot.util.StringUtil2B;
 import com.diagbot.vo.LibConceptVO;
 import com.diagbot.vo.NeoPushVO;
 import com.diagbot.vo.RuleVO;
@@ -106,16 +106,16 @@ public class CommonFacade {
         AIAnalyze aiAnalyze = new AIAnalyze(crfServiceClient);
         // 合并既往史：既往史+传染病史+手术外伤史+过敏史+接种史
         String unionPasts = searchData.getPasts();
-        if (StringUtil.isNotBlank(searchData.getInfectious())) { // 传染病史
+        if (StringUtil2B.isNotBlank(searchData.getInfectious())) { // 传染病史
             unionPasts = unionPasts + "。" + searchData.getInfectious();
         }
-        if (StringUtil.isNotBlank(searchData.getSurgical())) { // 手术外伤史
+        if (StringUtil2B.isNotBlank(searchData.getSurgical())) { // 手术外伤史
             unionPasts = unionPasts + "。" + searchData.getSurgical();
         }
-        if (StringUtil.isNotBlank(searchData.getAllergy())) { // 过敏史
+        if (StringUtil2B.isNotBlank(searchData.getAllergy())) { // 过敏史
             unionPasts = unionPasts + "。" + searchData.getAllergy();
         }
-        if (StringUtil.isNotBlank(searchData.getVaccination())) { // 接种史
+        if (StringUtil2B.isNotBlank(searchData.getVaccination())) { // 接种史
             unionPasts = unionPasts + "。" + searchData.getVaccination();
         }
         searchData.setPasts(unionPasts);
@@ -237,7 +237,7 @@ public class CommonFacade {
         // 6、结构化诊断
         CoreUtil.addList(diagList, CoreUtil.filterUniqueList(wordCrfDTO.getDiag()));
         // 7、选中诊断
-        if (wordCrfDTO.getDiseaseName() != null && StringUtil.isNotBlank(wordCrfDTO.getDiseaseName().getName())
+        if (wordCrfDTO.getDiseaseName() != null && StringUtil2B.isNotBlank(wordCrfDTO.getDiseaseName().getName())
                 && StringUtils.isBlank(wordCrfDTO.getDiseaseName().getUniqueName())) {
             diagList.add(wordCrfDTO.getDiseaseName().getName());
         }
@@ -469,7 +469,7 @@ public class CommonFacade {
             for (String s : convertList) {
                 boolean convertFlag = false;
                 String lastS = s;
-                if (StringUtil.isBlank(s)) {
+                if (StringUtil2B.isBlank(s)) {
                     continue;
                 }
                 if (crfMap != null) {
@@ -480,7 +480,7 @@ public class CommonFacade {
                             redisUtil.updateValue(type + "Conv:" + s, "");
                         } else {
                             String rateStr = standConvertCrfDTO.getStandard_words().get(0).get("rate");
-                            if (StringUtil.isBlank(rateStr)) {
+                            if (StringUtil2B.isBlank(rateStr)) {
                                 redisUtil.updateValue(type + "Conv:" + s, "");
                             } else {
                                 BigDecimal rate = new BigDecimal(rateStr);
@@ -564,7 +564,7 @@ public class CommonFacade {
             Map<String, StandConvertCrfDTO> crfMap = crfDTO.get(type);
             for (String s : convertList) {
                 String lastS = s;
-                if (StringUtil.isBlank(s)) {
+                if (StringUtil2B.isBlank(s)) {
                     continue;
                 }
                 if (crfMap != null) {
@@ -575,7 +575,7 @@ public class CommonFacade {
                             redisUtil.updateValue(type + "Conv:" + s, s);
                         } else {
                             String rateStr = standConvertCrfDTO.getStandard_words().get(0).get("rate");
-                            if (StringUtil.isBlank(rateStr)) {
+                            if (StringUtil2B.isBlank(rateStr)) {
                                 redisUtil.updateValue(type + "Conv:" + s, s);
                             } else {
                                 BigDecimal rate = new BigDecimal(rateStr);
@@ -655,8 +655,8 @@ public class CommonFacade {
             setListProperty(wordCrfDTO, "operationOrder", ConceptTypeEnum.Operation.getKey(), "UniqueName", operstionMap);
             // 6、选中手术
             if (wordCrfDTO.getOperationName() != null &&
-                    StringUtil.isNotBlank(wordCrfDTO.getOperationName().getName()) &&
-                    StringUtil.isBlank(wordCrfDTO.getOperationName().getUniqueName())) {
+                    StringUtil2B.isNotBlank(wordCrfDTO.getOperationName().getName()) &&
+                    StringUtil2B.isBlank(wordCrfDTO.getOperationName().getUniqueName())) {
                 wordCrfDTO.getOperationName().setUniqueName(wordCrfDTO.getOperationName().getName());
             }
         }
@@ -701,14 +701,14 @@ public class CommonFacade {
         List<Lis> lisList = wordCrfDTO.getLis();
         if (ListUtil.isNotEmpty(lisList)) {
             lisHisNameList.addAll(lisList.stream()
-                    .filter(i -> StringUtil.isNotBlank(i.getName()) && StringUtil.isBlank(i.getUniqueName()))
+                    .filter(i -> StringUtil2B.isNotBlank(i.getName()) && StringUtil2B.isBlank(i.getUniqueName()))
                     .map(i -> i.getName())
                     .collect(Collectors.toList()));
         }
         List<Lis> lisOrderList = wordCrfDTO.getLisOrder();
         if (ListUtil.isNotEmpty(lisOrderList)) {
             lisHisNameList.addAll(lisOrderList.stream()
-                    .filter(i -> StringUtil.isNotBlank(i.getName()) && StringUtil.isBlank(i.getUniqueName()))
+                    .filter(i -> StringUtil2B.isNotBlank(i.getName()) && StringUtil2B.isBlank(i.getUniqueName()))
                     .map(i -> i.getName())
                     .collect(Collectors.toList()));
         }
@@ -724,8 +724,8 @@ public class CommonFacade {
         List<String> lisConvertList = Lists.newArrayList();
         if (ListUtil.isNotEmpty(lisList)) {
             for (Lis lis : lisList) {
-                if (StringUtil.isNotBlank(lis.getName()) && StringUtil.isNotBlank(lis.getDetailName())
-                        && StringUtil.isBlank(lis.getUniqueName())) {
+                if (StringUtil2B.isNotBlank(lis.getName()) && StringUtil2B.isNotBlank(lis.getDetailName())
+                        && StringUtil2B.isBlank(lis.getUniqueName())) {
                     lisConvertList.add(lis.getDetailName());
                 }
             }
@@ -736,8 +736,8 @@ public class CommonFacade {
                 List<LibConceptDTO> libConceptList = klLibraryInfoFacade.convertLibConceptFac(libConceptVO);
                 Map<String, String> libConceptMap = ExtUtil.getKeyValue(libConceptList, "name", "conceptName");
                 for (Lis lis : lisList) {
-                    if (StringUtil.isNotBlank(lis.getName()) && StringUtil.isNotBlank(lis.getDetailName())
-                            && StringUtil.isBlank(lis.getUniqueName())) {
+                    if (StringUtil2B.isNotBlank(lis.getName()) && StringUtil2B.isNotBlank(lis.getDetailName())
+                            && StringUtil2B.isBlank(lis.getUniqueName())) {
                         if (MapUtils.isNotEmpty(libConceptMap) && libConceptMap.containsKey(lis.getDetailName())) {
                             lis.setUniqueName(libConceptMap.get(lis.getDetailName()));
                         } else { // 如果标准词、同义词关系还是找不到，用细项给uniqueName赋值
@@ -780,13 +780,13 @@ public class CommonFacade {
             }
             for (T item : list) {
                 String name = ReflectUtil.getProperty(item, "name");
-                if (StringUtil.isBlank(name)) {
+                if (StringUtil2B.isBlank(name)) {
                     retList.add(item);
                     continue;
                 }
                 if (fieldName.equals("uniqueName")) {
                     String uniqueName = ReflectUtil.getProperty(item, "uniqueName");
-                    if (StringUtil.isNotBlank(uniqueName)) {
+                    if (StringUtil2B.isNotBlank(uniqueName)) {
                         retList.add(item);
                         continue;
                     }
@@ -836,7 +836,7 @@ public class CommonFacade {
         try {
             for (T item : list) {
                 String name = ReflectUtil.getProperty(item, "name");
-                if (StringUtil.isBlank(name)) {
+                if (StringUtil2B.isBlank(name)) {
                     retList.add(item);
                     continue;
                 }
@@ -844,7 +844,7 @@ public class CommonFacade {
                 //                String uniqueName = item.getClass().getMethod("getUniqueName").invoke(item).toString();
 
                 String uniqueName = ReflectUtil.getProperty(item, "uniqueName");
-                if (StringUtil.isNotBlank(uniqueName) && !"StandName".equals(propertyName)) {
+                if (StringUtil2B.isNotBlank(uniqueName) && !"StandName".equals(propertyName)) {
                     retList.add(item);
                     continue;
                 }
@@ -852,7 +852,7 @@ public class CommonFacade {
                 String hisDetailName = "";
                 if (type.equals(ConceptTypeEnum.LisPack.getKey())) {
                     hisDetailName = ReflectUtil.getProperty(item, "detailName");
-                    if (StringUtil.isBlank(hisDetailName)) {
+                    if (StringUtil2B.isBlank(hisDetailName)) {
                         hisDetailName = "";
                     }
                 }
@@ -892,13 +892,13 @@ public class CommonFacade {
                         }
                     } else {
                         // 化验细项如果没有找到映射，由于大数据同义词转换效果差关闭，通过标准词和同义词关系进行转换
-                        if (!(type.equals(ConceptTypeEnum.LisPack.getKey()) && StringUtil.isNotBlank(hisDetailName))) {
+                        if (!(type.equals(ConceptTypeEnum.LisPack.getKey()) && StringUtil2B.isNotBlank(hisDetailName))) {
                             setUniqueNameNoMapping(item, propertyName, name, hisDetailName);
                         }
                         retList.add(item);
                     }
                 } else {
-                    if (!(type.equals(ConceptTypeEnum.LisPack.getKey()) && StringUtil.isNotBlank(hisDetailName))) {
+                    if (!(type.equals(ConceptTypeEnum.LisPack.getKey()) && StringUtil2B.isNotBlank(hisDetailName))) {
                         setUniqueNameNoMapping(item, propertyName, name, hisDetailName);
                     }
                     retList.add(item);
@@ -922,7 +922,7 @@ public class CommonFacade {
     public <T> void setUniqueNameNoMapping(T item, String propertyName, String name, String detailName) {
         try {
             if (propertyName.equals("UniqueName")) {
-                if (StringUtil.isNotBlank(detailName)) {
+                if (StringUtil2B.isNotBlank(detailName)) {
                     BeanUtils.copyProperty(item, "uniqueName", detailName);
                 } else {
                     BeanUtils.copyProperty(item, "uniqueName", name);

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

@@ -16,7 +16,7 @@ import com.diagbot.service.impl.FollowupPlanInfoServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.ListUtil;
-import com.diagbot.util.StringUtil;
+import com.diagbot.util.StringUtil2B;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -55,8 +55,8 @@ public class FollowupPlanInfoFacade extends FollowupPlanInfoServiceImpl {
         PushPlanDTO pushPlanDTO = new PushPlanDTO();
         List<PushPlansDTO> pushPlans = new ArrayList<>();
         if (operationName == null
-                || StringUtil.isBlank(operationName.getUniqueName())
-                || StringUtil.isBlank(operationName.getDateValue())) {
+                || StringUtil2B.isBlank(operationName.getUniqueName())
+                || StringUtil2B.isBlank(operationName.getDateValue())) {
             return pushPlanDTO;
         }
         Date date = null;

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

@@ -24,7 +24,7 @@ import com.diagbot.util.BeanUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.ExtUtil;
 import com.diagbot.util.ListUtil;
-import com.diagbot.util.StringUtil;
+import com.diagbot.util.StringUtil2B;
 import com.diagbot.vo.ConceptVO;
 import com.diagbot.vo.FilterVO;
 import com.diagbot.vo.IdsVO;
@@ -504,7 +504,7 @@ public class KlConceptFacade extends KlConceptServiceImpl {
         if (StringUtils.isNotBlank(name) && libType != null) {
             List<KlConcept> conceptList = this.list(new QueryWrapper<KlConcept>()
                     .eq("is_deleted", IsDeleteEnum.N.getKey())
-                    .like(StringUtil.isNotBlank(name), "lib_name", name.trim())
+                    .like(StringUtil2B.isNotBlank(name), "lib_name", name.trim())
                     .eq("lib_type", libType)
                     .eq("status", StatusEnum.Enable.getKey())
                     .notIn(ListUtil.isNotEmpty(excludedConceptIds), "id", excludedConceptIds)
@@ -533,7 +533,7 @@ public class KlConceptFacade extends KlConceptServiceImpl {
 
 
     public List<GetAllForRelationDTO> searchCollectionConceptFac(SearchCollectionConceptVO searchCollectionConceptVO) {
-        searchCollectionConceptVO.setNames(searchCollectionConceptVO.getNames().stream().filter(x -> StringUtil.isNotBlank(x)).collect(Collectors.toList()));
+        searchCollectionConceptVO.setNames(searchCollectionConceptVO.getNames().stream().filter(x -> StringUtil2B.isNotBlank(x)).collect(Collectors.toList()));
         List<GetAllForRelationDTO> getAllForRelationDTOS = this.searchCollectionConcept(searchCollectionConceptVO);
         return getAllForRelationDTOS;
     }

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

@@ -31,7 +31,7 @@ import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.ListUtil;
-import com.diagbot.util.StringUtil;
+import com.diagbot.util.StringUtil2B;
 import com.diagbot.vo.ChangeStatusVO;
 import com.diagbot.vo.GetDetailVO;
 import com.diagbot.vo.IdVO;
@@ -220,12 +220,12 @@ public class KlConceptStaticFacade extends KlConceptStaticServiceImpl {
                     sql = "";
                     break;
                 }
-                if (StringUtil.isNotBlank(sql)) {
+                if (StringUtil2B.isNotBlank(sql)) {
                     sql += " or ";
                 }
                 sql += "find_in_set(" + contentType + ",content_type)";
             }
-            if (StringUtil.isNotBlank(sql)) {
+            if (StringUtil2B.isNotBlank(sql)) {
                 sql = "(" + sql + ")";
             }
         }

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

@@ -244,7 +244,7 @@ public class KlDiagnoseDetailFacade {
                         exportDiagnoseDTO.setRelation(kdl.getStandard());
                     }
                     exportDiagnoseDTO.setEq(kdl.getMidResult());
-                    if (("G".equals(tType) || "H".equals(tType)) && StringUtil.isNotBlank(relation)) {
+                    if (("G".equals(tType) || "H".equals(tType)) && StringUtil2B.isNotBlank(relation)) {
                         exportDiagnoseDTO.setRule(kdl.getStandard() + "|" + kdl.getRelation().replaceAll("\\、", "|"));
                         exportDiagnoseDTO.setRelation("");
                     }
@@ -301,10 +301,10 @@ public class KlDiagnoseDetailFacade {
             String code = next.getCode();//1.0
             Integer type = next.getType();//1
             String relation = next.getRelation();
-            if (!regexData.contains(code) && StringUtil.isNotBlank(code)) {
+            if (!regexData.contains(code) && StringUtil2B.isNotBlank(code)) {
                 iterator.remove();
             } else {
-                if (StringUtil.isNotBlank(relation) && types.contains(type)) {
+                if (StringUtil2B.isNotBlank(relation) && types.contains(type)) {
                     List<String> checks = Lists.newArrayList();
                     List<String> relationNames = Lists.newArrayList(relation.split("\\、"));
                     relationNames.add(0, standard);
@@ -327,7 +327,7 @@ public class KlDiagnoseDetailFacade {
     private List<String> getAllFormula(List<KlDiagnoseDetail> klDiagnoseDetails) {
         List<String> formulas = Lists.newArrayList();
         if (ListUtil.isNotEmpty(klDiagnoseDetails)) {
-            formulas = klDiagnoseDetails.stream().filter(x -> StringUtil.isBlank(x.getCode()) && StringUtil.isNotBlank(x.getFormula()))
+            formulas = klDiagnoseDetails.stream().filter(x -> StringUtil2B.isBlank(x.getCode()) && StringUtil2B.isNotBlank(x.getFormula()))
                     .map(x -> x.getFormula()).collect(Collectors.toList());
 
         }

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

@@ -20,7 +20,7 @@ import com.diagbot.service.KlDiagnoseBaseRelationService;
 import com.diagbot.service.impl.KlDiagnoseServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.ListUtil;
-import com.diagbot.util.StringUtil;
+import com.diagbot.util.StringUtil2B;
 import com.diagbot.vo.DiagnosesFindVO;
 import com.diagbot.vo.KlDiagnoseByIdVO;
 import com.diagbot.vo.KlDiagnoseClearVO;
@@ -185,8 +185,8 @@ public class KlDiagnoseFacade extends KlDiagnoseServiceImpl {
             UpdateWrapper<KlDiagnose> klDiagnoseUpdate = new UpdateWrapper<>();
             klDiagnoseUpdate.eq("is_deleted", IsDeleteEnum.N.getKey())
                     .eq("id", klDiagnoseSaveVO.getId())
-                    .set(StringUtil.isNotBlank(klDiagnoseSaveVO.getDescription()), "description", klDiagnoseSaveVO.getDescription())
-                    .set(StringUtil.isNotBlank(klDiagnoseSaveVO.getConceptId().toString()), "concept_id", klDiagnoseSaveVO.getConceptId())
+                    .set(StringUtil2B.isNotBlank(klDiagnoseSaveVO.getDescription()), "description", klDiagnoseSaveVO.getDescription())
+                    .set(StringUtil2B.isNotBlank(klDiagnoseSaveVO.getConceptId().toString()), "concept_id", klDiagnoseSaveVO.getConceptId())
                     .set("modifier", klDiagnoseSaveVO.getModifier())
                     .set("gmt_modified", now);
             res = this.update(klDiagnoseUpdate);

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

@@ -17,7 +17,7 @@ import com.diagbot.util.EntityUtil;
 import com.diagbot.util.ExcelUtils;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.RegexUtil;
-import com.diagbot.util.StringUtil;
+import com.diagbot.util.StringUtil2B;
 import com.diagbot.util.VerifyUtil;
 import com.diagbot.vo.DiagnoseImportVO;
 import com.diagbot.vo.ImportDiagnoseResVO;
@@ -68,7 +68,7 @@ public class KlDiagnoseImportFacade {
         long t1 = System.currentTimeMillis();
         Map<String, Object> message = new LinkedHashMap<>(); // 提示信息
         List<ImportDiagnoseResVO> allData = Lists.newArrayList();  // 最终需要保存的数据
-        if (StringUtil.isNotBlank(diagnoseImportVO.getDiagStr())) {
+        if (StringUtil2B.isNotBlank(diagnoseImportVO.getDiagStr())) {
             List<String> diagList = CoreUtil.getSplit(diagnoseImportVO.getDiagStr());
             diagnoseImportVO.setDiags(diagList);
         }
@@ -125,7 +125,7 @@ public class KlDiagnoseImportFacade {
         for (ImportDiagnoseVO importDiagnoseVO : data) {
             String type = importDiagnoseVO.getType();
             if (type != null && type.startsWith("【") && type.endsWith("】")) {
-                if (StringUtil.isNotBlank(addDisName)) {
+                if (StringUtil2B.isNotBlank(addDisName)) {
                     groupData.put(addDisName, importDiagnoseVOList); // 存放上一个疾病数据
                 }
                 importDiagnoseVOList = new ArrayList<>();
@@ -182,7 +182,7 @@ public class KlDiagnoseImportFacade {
                     BeanUtil.copyProperties(importDiagnoseVO, klDiagnoseRecordDTO);
                     klDiagnoseRecordDTO.setCode(importDiagnoseVO.getOrderNo());
                     if ("确诊".equals(importDiagnoseVO.getType())) {
-                        if (StringUtil.isNotBlank(importDiagnoseVO.getParentRule())) {
+                        if (StringUtil2B.isNotBlank(importDiagnoseVO.getParentRule())) {
                             klDiagnoseRecordDTO.setRule(importDiagnoseVO.getParentRule());
                         }
                     }
@@ -224,7 +224,7 @@ public class KlDiagnoseImportFacade {
                 String orderNo = next.getOrderNo();
                 String rule = next.getRule();
                 Integer rowNum = next.getRowNum() - 1;
-                if (!diagtypes.contains(type) && StringUtil.isNotBlank(type) && StringUtil.isNotBlank(orderNo)) {
+                if (!diagtypes.contains(type) && StringUtil2B.isNotBlank(type) && StringUtil2B.isNotBlank(orderNo)) {
                     orderList.add(orderNo);
                 }
                 if ("拟诊".equals(type) && StringUtils.isNotBlank(rule)) {
@@ -294,7 +294,7 @@ public class KlDiagnoseImportFacade {
             String type = idv.getType();
             String orderNo = idv.getOrderNo();
             String rule = idv.getRule();
-            if (StringUtil.isBlank(type) && StringUtil.isBlank(orderNo)) {
+            if (StringUtil2B.isBlank(type) && StringUtil2B.isBlank(orderNo)) {
                 continue;
             }
             if (!type.contains("正则") && !diagtypes.contains(type)) {
@@ -334,11 +334,11 @@ public class KlDiagnoseImportFacade {
                 String maxSymbol = imd.getMaxOperator();
                 String minSymbol = imd.getMinOperator();
                 String parentRule = imd.getParentRule();
-                if (StringUtil.isBlank(type) && StringUtil.isBlank(orderNo)) {
+                if (StringUtil2B.isBlank(type) && StringUtil2B.isBlank(orderNo)) {
                     continue;
                 }
 
-                if (StringUtil.isNotBlank(type) && StringUtil.isNotBlank(rule) && StringUtil.isNotBlank(orderNo)) {
+                if (StringUtil2B.isNotBlank(type) && StringUtil2B.isNotBlank(rule) && StringUtil2B.isNotBlank(orderNo)) {
                     LexiconExtEnum anEnum = LexiconExtEnum.getEnum(type);
                     if (anEnum == null) {
                         currentErrMsg.add(String.format("第%d行【%s】类型错误", rowNum, type));
@@ -363,11 +363,11 @@ public class KlDiagnoseImportFacade {
                         currentErrMsg.add(String.format("第%d行类型【%s】和序号【%s】对应错误", rowNum, type, orderNo));
                     }
                 }
-                if (StringUtil.isNotBlank(maxSymbol) &&
+                if (StringUtil2B.isNotBlank(maxSymbol) &&
                         !"<=".equals(maxSymbol) && !"<".equals(maxSymbol)) {
                     currentErrMsg.add(String.format("第%d行%s的【最大值符号】不正确", rowNum, rule));
                 }
-                if (StringUtil.isNotBlank(minSymbol) &&
+                if (StringUtil2B.isNotBlank(minSymbol) &&
                         !">=".equals(minSymbol) && !">".equals(minSymbol)) {
                     currentErrMsg.add(String.format("第%d行%s的【最小值符号】不正确", rowNum, rule));
                 }
@@ -390,10 +390,10 @@ public class KlDiagnoseImportFacade {
                 if (StringUtils.isNotBlank(type) && !diagtypes.contains(type) && StringUtils.isBlank(rule)) {
                     currentErrMsg.add(String.format("第%d行【规则】不能为空", rowNum));
                 }
-                if (diagtypes.contains(type) && StringUtil.isNotBlank(rule)) {
+                if (diagtypes.contains(type) && StringUtil2B.isNotBlank(rule)) {
                     String s = VerifyUtil.verifyFormula(orderNums, rule);
-                    if (StringUtil.isNotBlank(s)) {
-                        if (StringUtil.isNotBlank(parentRule)) {
+                    if (StringUtil2B.isNotBlank(s)) {
+                        if (StringUtil2B.isNotBlank(parentRule)) {
                             s = s.replace(rule, parentRule);
                         }
                         currentErrMsg.add(s);
@@ -450,7 +450,7 @@ public class KlDiagnoseImportFacade {
                 for (ImportDiagnoseVO importDiagnoseVO : data) {
                     String type = importDiagnoseVO.getType();
                     String rule = importDiagnoseVO.getRule();
-                    if (StringUtil.isNotBlank(type) && StringUtil.isNotBlank(rule)) {
+                    if (StringUtil2B.isNotBlank(type) && StringUtil2B.isNotBlank(rule)) {
                         if ("拟诊".equals(type) || "确诊".equals(type) || "警惕".equals(type)) {
                             KlDiagnoseTypeVO klDiagnoseTypeVO = new KlDiagnoseTypeVO();
                             if ("拟诊".equals(type)) {
@@ -617,20 +617,20 @@ public class KlDiagnoseImportFacade {
                     case Vital: // 体格检查项目
                     case Age: // 年龄
                         klDiagnoseDetailVO.setBasConceptId(current.getConceptId());
-                        if (StringUtil.isNotBlank(current.getMinValue())) {
+                        if (StringUtil2B.isNotBlank(current.getMinValue())) {
                             klDiagnoseDetailVO.setMinVal(current.getMinValue());
                         }
-                        if (StringUtil.isNotBlank(current.getMinOperator())) {
+                        if (StringUtil2B.isNotBlank(current.getMinOperator())) {
                             klDiagnoseDetailVO.setMinOperator(current.getMinOperator());
                         }
-                        if (StringUtil.isNotBlank(current.getUnit())) {
+                        if (StringUtil2B.isNotBlank(current.getUnit())) {
                             klDiagnoseDetailVO.setMinUnit(current.getUnit());
                             klDiagnoseDetailVO.setMaxUnit(current.getUnit());
                         }
-                        if (StringUtil.isNotBlank(current.getMaxValue())) {
+                        if (StringUtil2B.isNotBlank(current.getMaxValue())) {
                             klDiagnoseDetailVO.setMaxVal(current.getMaxValue());
                         }
-                        if (StringUtil.isNotBlank(current.getMaxOperator())) {
+                        if (StringUtil2B.isNotBlank(current.getMaxOperator())) {
                             klDiagnoseDetailVO.setMaxOperator(String.valueOf(current.getMaxOperator()));
                         }
                         klDiagnoseDetailVO.setBasDescription(current.getRule());

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

@@ -21,7 +21,7 @@ import com.diagbot.service.impl.KlRegularConfigServiceImpl;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.RegexUtil;
-import com.diagbot.util.StringUtil;
+import com.diagbot.util.StringUtil2B;
 import com.diagbot.vo.IndicationPushVO;
 import com.diagbot.vo.RegularConfigSaveVO;
 import com.google.common.collect.Lists;
@@ -47,7 +47,7 @@ public class KlRegularConfigFacade extends KlRegularConfigServiceImpl {
 
     public List<RegularValueDTO> getRegularConfigDatas(String text, List<KlRegularConfig> regularConfigs) {
         List<RegularValueDTO> listData = new ArrayList<>();
-        if (StringUtil.isBlank(text)) {
+        if (StringUtil2B.isBlank(text)) {
             return Lists.newArrayList();
         }
         if (ListUtil.isNotEmpty(regularConfigs)) {
@@ -129,8 +129,8 @@ public class KlRegularConfigFacade extends KlRegularConfigServiceImpl {
         VitalLabel vitalLabel = wordCrfDTO.getVitalLabel();
         List<Vital> vitals = vitalLabel.getVitals();
 
-        if (StringUtil.isBlank(symptom) && StringUtil.isBlank(pasts) && StringUtil.isBlank(pacs)
-        && StringUtil.isBlank(vital)) {
+        if (StringUtil2B.isBlank(symptom) && StringUtil2B.isBlank(pasts) && StringUtil2B.isBlank(pacs)
+        && StringUtil2B.isBlank(vital)) {
             return wordCrfDTO;
         }
 
@@ -176,7 +176,7 @@ public class KlRegularConfigFacade extends KlRegularConfigServiceImpl {
                         String value = pd.getValue();
                         String key = name + "_" + value;
                         if (rulePacsCompiles.containsKey(key)) {
-                            if (StringUtil.isNotBlank(rulePacsCompiles.get(key))) {
+                            if (StringUtil2B.isNotBlank(rulePacsCompiles.get(key))) {
                                 pd.setUnit(rulePacsCompiles.get(key));
                             }
                             rulePacsCompiles.remove(key);
@@ -213,7 +213,7 @@ public class KlRegularConfigFacade extends KlRegularConfigServiceImpl {
                         String value = pd.getValue();
                         String key = name + "_" + value;
                         if (rulevitalsCompiles.containsKey(key)) {
-                            if (StringUtil.isNotBlank(rulevitalsCompiles.get(key))) {
+                            if (StringUtil2B.isNotBlank(rulevitalsCompiles.get(key))) {
                                 pd.setUnit(rulevitalsCompiles.get(key));
                             }
                             rulevitalsCompiles.remove(key);

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

@@ -32,7 +32,7 @@ import com.diagbot.util.ExtUtil;
 import com.diagbot.util.IntegerUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.RedisUtil;
-import com.diagbot.util.StringUtil;
+import com.diagbot.util.StringUtil2B;
 import com.diagbot.vo.ExportDafaultVO;
 import com.diagbot.vo.GatherVO;
 import com.diagbot.vo.KlRuleByIdVO;
@@ -130,12 +130,12 @@ public class KlRuleFacade extends KlRuleServiceImpl {
             UpdateWrapper<KlRule> klRuleUpdate = new UpdateWrapper<>();
             klRuleUpdate.eq("is_deleted", IsDeleteEnum.N.getKey())
                     .eq("id", klRuleInfoSaveVO.getParId())
-                    .set(StringUtil.isNotBlank(klRuleInfoSaveVO.getParDescription()), "description", klRuleInfoSaveVO.getParDescription())
-                    .set(StringUtil.isNotBlank(klRuleInfoSaveVO.getParConceptId().toString()), "concept_id", klRuleInfoSaveVO.getParConceptId())
-                    .set(StringUtil.isNotBlank(klRuleInfoSaveVO.getParRuleType().toString()), "rule_type", klRuleInfoSaveVO.getParRuleType())
-                    .set(StringUtil.isNotBlank(klRuleInfoSaveVO.getParHasSub().toString()), "has_sub_cond", klRuleInfoSaveVO.getParHasSub())
-                    .set(StringUtil.isNotBlank(klRuleInfoSaveVO.getParStatus().toString()), "status", klRuleInfoSaveVO.getParStatus())
-                    .set(StringUtil.isNotBlank(klRuleInfoSaveVO.getParMsg()), "msg", klRuleInfoSaveVO.getParMsg())
+                    .set(StringUtil2B.isNotBlank(klRuleInfoSaveVO.getParDescription()), "description", klRuleInfoSaveVO.getParDescription())
+                    .set(StringUtil2B.isNotBlank(klRuleInfoSaveVO.getParConceptId().toString()), "concept_id", klRuleInfoSaveVO.getParConceptId())
+                    .set(StringUtil2B.isNotBlank(klRuleInfoSaveVO.getParRuleType().toString()), "rule_type", klRuleInfoSaveVO.getParRuleType())
+                    .set(StringUtil2B.isNotBlank(klRuleInfoSaveVO.getParHasSub().toString()), "has_sub_cond", klRuleInfoSaveVO.getParHasSub())
+                    .set(StringUtil2B.isNotBlank(klRuleInfoSaveVO.getParStatus().toString()), "status", klRuleInfoSaveVO.getParStatus())
+                    .set(StringUtil2B.isNotBlank(klRuleInfoSaveVO.getParMsg()), "msg", klRuleInfoSaveVO.getParMsg())
                     .set("modifier", klRuleInfoSaveVO.getModifier())
                     .set("gmt_modified", now);
             res = this.update(klRuleUpdate);
@@ -455,7 +455,7 @@ public class KlRuleFacade extends KlRuleServiceImpl {
      * @return
      */
     public IPage<RuleQueryDTO> getRulePageFac(RuleQueryVO ruleQueryVO) {
-        if (StringUtil.isNotBlank(ruleQueryVO.getBaseLibName()) || !IntegerUtil.isNull(ruleQueryVO.getBaseLibType())) {
+        if (StringUtil2B.isNotBlank(ruleQueryVO.getBaseLibName()) || !IntegerUtil.isNull(ruleQueryVO.getBaseLibType())) {
             try {
                 //取得所有基础规则条目的上级规则的ID
                 Map<String, Object> invokeParams = new HashMap<>();
@@ -491,13 +491,13 @@ public class KlRuleFacade extends KlRuleServiceImpl {
         Integer baseLibTypeVO = ruleQueryKeyVO.getBaseLibType();
 
         // 有条件才去遍历筛选
-        if (StringUtil.isNotEmpty(descriptionVO) || StringUtil.isNotEmpty(baseLibNameVO) || baseLibTypeVO != null) {
+        if (StringUtil2B.isNotEmpty(descriptionVO) || StringUtil2B.isNotEmpty(baseLibNameVO) || baseLibTypeVO != null) {
             List<RuleConditionDTO> ruleConditionDTOList = ruleDTO.getRuleConditionDTOList();
             Iterator<RuleConditionDTO> iterator = ruleConditionDTOList.iterator();
             while (iterator.hasNext()) {
                 RuleConditionDTO ruleConditionDTO = iterator.next();
                 // 过滤规则名称
-                if (StringUtil.isNotBlank(descriptionVO)) {
+                if (StringUtil2B.isNotBlank(descriptionVO)) {
                     if (!toUpperCase(ruleConditionDTO.getDescription()).contains(descriptionVO)) {
                         iterator.remove();
                         continue;
@@ -505,7 +505,7 @@ public class KlRuleFacade extends KlRuleServiceImpl {
                 }
 
                 // 过滤基础术语类型和名称
-                if ((baseLibTypeVO != null || StringUtil.isNotEmpty(ruleQueryKeyVO.getBaseLibName()))) {
+                if ((baseLibTypeVO != null || StringUtil2B.isNotEmpty(ruleQueryKeyVO.getBaseLibName()))) {
                     if (ListUtil.isEmpty(ruleConditionDTO.getRuleBaseDTOList())) {
                         iterator.remove();
                         continue;
@@ -516,12 +516,12 @@ public class KlRuleFacade extends KlRuleServiceImpl {
                         Integer baseLibType = ruleBaseDTO.getBaseLibType();
                         String baseLibName = toUpperCase(ruleBaseDTO.getBaseLibName());
 
-                        if (StringUtil.isNotBlank(baseLibNameVO) && baseLibTypeVO != null) {
+                        if (StringUtil2B.isNotBlank(baseLibNameVO) && baseLibTypeVO != null) {
                             if (baseLibName.contains(baseLibNameVO) && baseLibTypeVO.equals(baseLibType)) {
                                 hasFlag = true;
                                 break;
                             }
-                        } else if (StringUtil.isNotBlank(baseLibNameVO)) {
+                        } else if (StringUtil2B.isNotBlank(baseLibNameVO)) {
                             if (baseLibName.contains(baseLibNameVO)) {
                                 hasFlag = true;
                                 break;
@@ -550,7 +550,7 @@ public class KlRuleFacade extends KlRuleServiceImpl {
      * @return
      */
     public String toUpperCase(String name) {
-        if (StringUtil.isNotBlank(name)) {
+        if (StringUtil2B.isNotBlank(name)) {
             return name.toUpperCase();
         }
         return "";

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

@@ -7,7 +7,7 @@ import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.MappingConfigService;
 import com.diagbot.service.impl.MappingConfigServiceImpl;
 import com.diagbot.util.ListUtil;
-import com.diagbot.util.StringUtil;
+import com.diagbot.util.StringUtil2B;
 import com.diagbot.vo.ConceptVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -65,7 +65,7 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
         }
 
         for (MappingConfig item : list) {
-            if (StringUtil.isBlank(item.getHisDetailName())) {
+            if (StringUtil2B.isBlank(item.getHisDetailName())) {
                 item.setHisDetailName("");
             }
         }

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

@@ -12,7 +12,7 @@ import com.diagbot.exception.CommonException;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.ListUtil;
-import com.diagbot.util.StringUtil;
+import com.diagbot.util.StringUtil2B;
 import com.diagbot.vo.MedRetrievalVO;
 import com.diagbot.vo.RetrievalVO;
 import com.diagbot.vo.StaticKnowledgeIndexVO;
@@ -51,7 +51,7 @@ public class MedRetrievalFacade {
             retrievalVO.setSize(100);
         }
         if (retrievalVO.getDefaultList().equals(0)
-                && StringUtil.isBlank(retrievalVO.getInputStr())) {
+                && StringUtil2B.isBlank(retrievalVO.getInputStr())) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "请输入检索内容");
         }
         RetrievalDTO retrievalDTO = new RetrievalDTO();
@@ -87,7 +87,7 @@ public class MedRetrievalFacade {
                         lisDetail.setName(item.getPackName());
                         lisDetail.setUniqueName(item.getName());
                         //默认套餐名称
-                        if (StringUtil.isBlank(lisDetail.getName())) {
+                        if (StringUtil2B.isBlank(lisDetail.getName())) {
                             lisDetail.setName(lisDetail.getUniqueName());
                         }
                         lisDetails.add(lisDetail);

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

@@ -25,7 +25,7 @@ import com.diagbot.service.TranHospitalFilterService;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.NeoUtil;
 import com.diagbot.util.RedisUtil;
-import com.diagbot.util.StringUtil;
+import com.diagbot.util.StringUtil2B;
 import com.diagbot.vo.DiseaseItemVO;
 import com.diagbot.vo.NeoPushVO;
 import com.diagbot.vo.neoPushEntity.ChiefPushVo;
@@ -48,7 +48,7 @@ import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import static com.diagbot.util.StringUtil.permutationNoRepeat;
+import static com.diagbot.util.StringUtil2B.permutationNoRepeat;
 
 /**
  * @Description: 缓存等相关装饰层
@@ -290,7 +290,7 @@ public class NeoFacade {
     }
 
     public void searchWord(String color, String regionWord, String patternFild, List<String> datas) {
-        if (StringUtil.isNotEmpty(color)) {
+        if (StringUtil2B.isNotEmpty(color)) {
             String[] splitsData = color.split(patternFild);
             for (String fils : splitsData) {
                 if (regionWord.contains(fils)) {

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

@@ -18,7 +18,7 @@ import com.diagbot.util.CoreUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.ParamUtil;
 import com.diagbot.util.RedisUtil;
-import com.diagbot.util.StringUtil;
+import com.diagbot.util.StringUtil2B;
 import com.diagbot.vo.PushNewVO;
 import com.diagbot.vo.PushPlanVO;
 import com.diagbot.vo.PushVO;
@@ -78,7 +78,7 @@ public class PushFacade {
                 List<Item> deptList = pushVO.getDept();
                 String modelType = "0";
                 if (ListUtil.isNotEmpty(deptList)) {
-                    if (StringUtil.isNotBlank(deptList.get(0).getUniqueName())) {
+                    if (StringUtil2B.isNotBlank(deptList.get(0).getUniqueName())) {
                         modelType = redisUtil.getByKeyAndField(RedisEnum.deptPush.getName(),
                                 deptList.get(0).getUniqueName());
                     }
@@ -284,7 +284,7 @@ public class PushFacade {
         pushNewVO.setPresent(wordCrfDTO.getSymptom());
         pushNewVO.setAge(wordCrfDTO.getAgeNum());
         pushNewVO.setSex(wordCrfDTO.getSex());
-        if (StringUtil.isNotBlank(modelType)) {
+        if (StringUtil2B.isNotBlank(modelType)) {
             pushNewVO.setHospitalType(modelType);
         }
         return pushNewVO;

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

@@ -13,7 +13,7 @@ import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.ListUtil;
-import com.diagbot.util.StringUtil;
+import com.diagbot.util.StringUtil2B;
 import com.diagbot.vo.StandConvertCrfVO;
 import com.diagbot.vo.TermMatchingListVO;
 import com.diagbot.vo.TermMatchingVO;
@@ -63,7 +63,7 @@ public class TermMatchingFacade {
             StandConvertCrfVO standConvertCrfVO = new StandConvertCrfVO();
             // 类型，疾病: disease，症状: symptom，手术和操作:operation，药品: drug，实验室检查：lis，辅助检查：pacs， 辅助检查：vital
             String wordType = wordType(termMatchingVO.getType());
-            if (StringUtil.isNotBlank(wordType)) {
+            if (StringUtil2B.isNotBlank(wordType)) {
                 standConvertCrfVO.setWord_type(wordType);
                 standConvertCrfVO.setWord(termMatchingVO.getInputStr());
                 standConvertCrfVO.setNumber(5);

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

@@ -17,7 +17,7 @@ import com.diagbot.util.BeanUtil;
 import com.diagbot.util.ExcelUtils;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.RedisUtil;
-import com.diagbot.util.StringUtil;
+import com.diagbot.util.StringUtil2B;
 import com.diagbot.vo.Drug;
 import com.diagbot.vo.IndicationPushVO;
 import com.diagbot.vo.ItemExt;
@@ -98,7 +98,7 @@ public class TestFacade {
         List<IndicationPushVO> indicationPushVOList = new ArrayList<>();
         List<TestIndicationVO> data = ExcelUtils.importExcelMultiSheets(file, 0, 1, testLineVO.getSheetIndex(), TestIndicationVO.class);
         for (TestIndicationVO bean : data) {
-            if (StringUtil.isNotEmpty(testLineVO.getIdNum()) && !testLineVO.getIdNum().equals(bean.getIdNum())) {
+            if (StringUtil2B.isNotEmpty(testLineVO.getIdNum()) && !testLineVO.getIdNum().equals(bean.getIdNum())) {
                 continue;
             }
             if ("删除".equals(bean.getStatus())) {
@@ -107,11 +107,11 @@ public class TestFacade {
             IndicationPushVO indicationPushVO = new IndicationPushVO();
             indicationPushVO.setRuleType("2");
             indicationPushVO.setIdNum(bean.getIdNum());
-            if (StringUtil.isBlank(bean.getStandName()) || bean.getNeoName().contains("本品")) {
+            if (StringUtil2B.isBlank(bean.getStandName()) || bean.getNeoName().contains("本品")) {
                 continue;
             }
             bean.setStandName(bean.getStandName().trim());
-            if (StringUtil.isNotBlank(bean.getOrderType())) {
+            if (StringUtil2B.isNotBlank(bean.getOrderType())) {
                 switch (bean.getOrderType()) {
                     case "实验室检查名称": // 细项
                         List<Lis> lisDetailOrder = new ArrayList<>();
@@ -162,7 +162,7 @@ public class TestFacade {
 
             indicationPushVO.setMsg(bean.getNeoName());
 
-            if (StringUtil.isNotEmpty(bean.getNeoType())) {
+            if (StringUtil2B.isNotEmpty(bean.getNeoType())) {
                 switch (bean.getNeoType()) {
                     case "1": // 性别
                         if ("男".equals(bean.getNeoName())) {
@@ -335,16 +335,16 @@ public class TestFacade {
         List<IndicationPushVO> indicationPushVOList = new ArrayList<>();
         List<TestIndicationVO> data = ExcelUtils.importExcelMultiSheets(file, 0, 1, testLineVO.getSheetIndex(), TestIndicationVO.class);
         for (TestIndicationVO bean : data) {
-            if (StringUtil.isNotEmpty(testLineVO.getIdNum()) && !testLineVO.getIdNum().equals(bean.getIdNum())) {
+            if (StringUtil2B.isNotEmpty(testLineVO.getIdNum()) && !testLineVO.getIdNum().equals(bean.getIdNum())) {
                 continue;
             }
-            if (StringUtil.isBlank(bean.getTransfusionNodeName())) {
+            if (StringUtil2B.isBlank(bean.getTransfusionNodeName())) {
                 continue;
             }
             IndicationPushVO indicationPushVO = new IndicationPushVO();
             indicationPushVO.setRuleType("2");
             indicationPushVO.setIdNum(bean.getIdNum());
-            if (StringUtil.isNotBlank(bean.getTransfusionName())) {
+            if (StringUtil2B.isNotBlank(bean.getTransfusionName())) {
                 List<ItemExt> transfusionOrder = new ArrayList<>();
                 ItemExt item = new ItemExt();
                 item.setName(bean.getTransfusionName());
@@ -353,7 +353,7 @@ public class TestFacade {
                 indicationPushVO.setTransfusionOrder(transfusionOrder);
             }
 
-            if (StringUtil.isNotEmpty(bean.getTransfusionNodeName())) {
+            if (StringUtil2B.isNotEmpty(bean.getTransfusionNodeName())) {
                 switch (bean.getTransfusionNodeName()) {
                     case "医保手术和操作名称": // 医保手术和操作名称
                         List<Item> operation = new ArrayList<>();
@@ -402,11 +402,11 @@ public class TestFacade {
         List<IndicationPushVO> indicationPushVOList = new ArrayList<>();
         List<TestIndicationVO> data = ExcelUtils.importExcelMultiSheets(file, 0, 1, testLineVO.getSheetIndex(), TestIndicationVO.class);
         for (TestIndicationVO bean : data) {
-            if (StringUtil.isNotEmpty(testLineVO.getIdNum()) && !testLineVO.getIdNum().equals(bean.getIdNum())) {
+            if (StringUtil2B.isNotEmpty(testLineVO.getIdNum()) && !testLineVO.getIdNum().equals(bean.getIdNum())) {
                 continue;
             }
             // 3,4是高危手术
-            if (StringUtil.isBlank(bean.getOperationLevel()) || "0".equals(bean.getOperationLevel()) || "1".equals(bean.getOperationLevel()) || "2".equals(bean.getOperationLevel())) {
+            if (StringUtil2B.isBlank(bean.getOperationLevel()) || "0".equals(bean.getOperationLevel()) || "1".equals(bean.getOperationLevel()) || "2".equals(bean.getOperationLevel())) {
                 continue;
             }
             IndicationPushVO indicationPushVO = new IndicationPushVO();
@@ -436,7 +436,7 @@ public class TestFacade {
         List<IndicationPushVO> indicationPushVOList = new ArrayList<>();
         List<TestIndicationVO> data = ExcelUtils.importExcelMultiSheets(file, 0, 1, testLineVO.getSheetIndex(), TestIndicationVO.class);
         for (TestIndicationVO bean : data) {
-            if (StringUtil.isNotEmpty(testLineVO.getIdNum()) && !testLineVO.getIdNum().equals(bean.getIdNum())) {
+            if (StringUtil2B.isNotEmpty(testLineVO.getIdNum()) && !testLineVO.getIdNum().equals(bean.getIdNum())) {
                 continue;
             }
             IndicationPushVO indicationPushVO = new IndicationPushVO();
@@ -490,7 +490,7 @@ public class TestFacade {
         List<IndicationPushVO> indicationPushVOList = new ArrayList<>();
         List<TestIndicationVO> data = ExcelUtils.importExcelMultiSheets(file, 0, 1, testLineVO.getSheetIndex(), TestIndicationVO.class);
         for (TestIndicationVO bean : data) {
-            if (StringUtil.isNotEmpty(testLineVO.getIdNum()) && !testLineVO.getIdNum().equals(bean.getIdNum())) {
+            if (StringUtil2B.isNotEmpty(testLineVO.getIdNum()) && !testLineVO.getIdNum().equals(bean.getIdNum())) {
                 continue;
             }
             IndicationPushVO indicationPushVO = new IndicationPushVO();
@@ -502,7 +502,7 @@ public class TestFacade {
             } else if ("女".equals(bean.getSexStr())) {
                 indicationPushVO.setSex(2);
             }
-            if (StringUtil.isNotBlank(bean.getDisName())) {
+            if (StringUtil2B.isNotBlank(bean.getDisName())) {
                 List<Item> diag = new ArrayList<>();
                 Item item = new Item();
                 item.setUniqueName(bean.getDisName());
@@ -525,7 +525,7 @@ public class TestFacade {
                     }
                 }
             }
-            if (StringUtil.isNotBlank(bean.getPacsDesc())) {
+            if (StringUtil2B.isNotBlank(bean.getPacsDesc())) {
                 Pacs pacs = new Pacs();
                 pacs.setName("胸部CT");
                 pacs.setUniqueName("胸部CT");
@@ -533,7 +533,7 @@ public class TestFacade {
                 indicationPushVO.getPacs().add(pacs);
             }
 
-            if (StringUtil.isNotBlank(bean.getPacsDescHas())) {
+            if (StringUtil2B.isNotBlank(bean.getPacsDescHas())) {
                 Pacs pacs = new Pacs();
                 pacs.setName("CT");
                 pacs.setUniqueName("CT");
@@ -558,14 +558,14 @@ public class TestFacade {
         List<IndicationPushVO> indicationPushVOList = new ArrayList<>();
         List<TestIndicationVO> data = ExcelUtils.importExcelMultiSheets(file, 0, 1, testLineVO.getSheetIndex(), TestIndicationVO.class);
         for (TestIndicationVO bean : data) {
-            if (StringUtil.isNotEmpty(testLineVO.getIdNum()) && !testLineVO.getIdNum().equals(bean.getIdNum())) {
+            if (StringUtil2B.isNotEmpty(testLineVO.getIdNum()) && !testLineVO.getIdNum().equals(bean.getIdNum())) {
                 continue;
             }
             IndicationPushVO indicationPushVO = new IndicationPushVO();
             indicationPushVO.setRuleType("4");
             indicationPushVO.setIdNum(bean.getIdNum());
 
-            if (StringUtil.isNotBlank(bean.getDisName())) {
+            if (StringUtil2B.isNotBlank(bean.getDisName())) {
                 List<Item> diag = new ArrayList<>();
                 Item item = new Item();
                 item.setUniqueName(bean.getDisName());
@@ -573,7 +573,7 @@ public class TestFacade {
                 diag.add(item);
                 indicationPushVO.setDiag(diag);
             }
-            if (StringUtil.isNotBlank(bean.getOperationName())) {
+            if (StringUtil2B.isNotBlank(bean.getOperationName())) {
                 List<Item> operation = new ArrayList<>();
                 Item item = new Item();
                 item.setUniqueName(bean.getOperationName());
@@ -609,10 +609,10 @@ public class TestFacade {
         List<TestIndicationVO> data = ExcelUtils.importExcelMultiSheets(file, 0, 1, testLineVO.getSheetIndex(), TestIndicationVO.class);
         List<String> drugForm = Arrays.asList("注射剂", "片剂", "缓释剂", "胶囊剂", "滴丸剂");
         for (TestIndicationVO bean : data) {
-            if (StringUtil.isNotEmpty(testLineVO.getIdNum()) && !testLineVO.getIdNum().equals(bean.getIdNum())) {
+            if (StringUtil2B.isNotEmpty(testLineVO.getIdNum()) && !testLineVO.getIdNum().equals(bean.getIdNum())) {
                 continue;
             }
-            if (StringUtil.isEmpty(bean.getDrugLevel())) {
+            if (StringUtil2B.isEmpty(bean.getDrugLevel())) {
                 continue;
             }
             if (!drugForm.contains(bean.getDrugForm())) {
@@ -646,14 +646,14 @@ public class TestFacade {
         List<IndicationPushVO> indicationPushVOList = new ArrayList<>();
         List<TestIndicationVO> data = ExcelUtils.importExcelMultiSheets(file, 0, 1, testLineVO.getSheetIndex(), TestIndicationVO.class);
         for (TestIndicationVO bean : data) {
-            if (StringUtil.isNotEmpty(testLineVO.getIdNum()) && !testLineVO.getIdNum().equals(bean.getIdNum())) {
+            if (StringUtil2B.isNotEmpty(testLineVO.getIdNum()) && !testLineVO.getIdNum().equals(bean.getIdNum())) {
                 continue;
             }
             IndicationPushVO indicationPushVO = new IndicationPushVO();
             indicationPushVO.setRuleType("1");
-            if (StringUtil.isNotBlank(bean.getCriticalAge()) && "成人".equals(bean.getCriticalAge())) {
+            if (StringUtil2B.isNotBlank(bean.getCriticalAge()) && "成人".equals(bean.getCriticalAge())) {
                 indicationPushVO.setAgeNum(20.0D);
-            } else if (StringUtil.isNotBlank(bean.getCriticalAge()) && "新生儿".equals(bean.getCriticalAge())) {
+            } else if (StringUtil2B.isNotBlank(bean.getCriticalAge()) && "新生儿".equals(bean.getCriticalAge())) {
                 indicationPushVO.setAgeNum(1.0D);
             } else {
                 indicationPushVO.setAgeNum(20.0D);
@@ -705,7 +705,7 @@ public class TestFacade {
         List<IndicationPushVO> indicationPushVOList = new ArrayList<>();
         List<TestIndicationVO> data = ExcelUtils.importExcelMultiSheets(file, 0, 1, testLineVO.getSheetIndex(), TestIndicationVO.class);
         for (TestIndicationVO bean : data) {
-            if (StringUtil.isNotEmpty(testLineVO.getIdNum()) && !testLineVO.getIdNum().equals(bean.getIdNum())) {
+            if (StringUtil2B.isNotEmpty(testLineVO.getIdNum()) && !testLineVO.getIdNum().equals(bean.getIdNum())) {
                 continue;
             }
             IndicationPushVO indicationPushVO = new IndicationPushVO();
@@ -829,7 +829,7 @@ public class TestFacade {
         List<IndicationPushVO> indicationPushVOList = new ArrayList<>();
         List<TestIndicationVO> data = ExcelUtils.importExcelMultiSheets(file, 0, 1, testLineVO.getSheetIndex(), TestIndicationVO.class);
         for (TestIndicationVO bean : data) {
-            if (StringUtil.isNotEmpty(testLineVO.getIdNum()) && !testLineVO.getIdNum().equals(bean.getIdNum())) {
+            if (StringUtil2B.isNotEmpty(testLineVO.getIdNum()) && !testLineVO.getIdNum().equals(bean.getIdNum())) {
                 continue;
             }
             // 只留下等级为2的数据
@@ -852,7 +852,7 @@ public class TestFacade {
             //年龄
             IndicationPushVO indicationPushVOAge = new IndicationPushVO();
             String ageAll = bean.getAgeAll();
-            if (StringUtil.isNotBlank(ageAll)) {
+            if (StringUtil2B.isNotBlank(ageAll)) {
                 String[] split = ageAll.split(",");
                 setname(indicationPushVOAge, bean);
                 indicationPushVOAge.setAgeNum(getValueNum(split));
@@ -863,7 +863,7 @@ public class TestFacade {
             }
             //体格
             String physique = bean.getPhysique();
-            if (StringUtil.isNotBlank(physique)) {
+            if (StringUtil2B.isNotBlank(physique)) {
                 String[] physiqueStrArray = physique.split("，");
                 for (int i = 0; i < physiqueStrArray.length; i++) {
                     String str = physiqueStrArray[i];
@@ -932,7 +932,7 @@ public class TestFacade {
             }
             //化验
             String lisAll = bean.getLisAll();
-            if (StringUtil.isNotBlank(lisAll)) {
+            if (StringUtil2B.isNotBlank(lisAll)) {
                 String[] physiquelisAll = lisAll.split("，");
                 for (int i = 0; i < physiquelisAll.length; i++) {
 
@@ -980,7 +980,7 @@ public class TestFacade {
             }
             //辅检
             String pacsAll = bean.getPacsAll();
-            if (StringUtil.isNotBlank(pacsAll)) {
+            if (StringUtil2B.isNotBlank(pacsAll)) {
                 String[] physiquepacsAll = pacsAll.split("，");
                 //indicationPushVO.setSymptom(pacsAll);
 
@@ -1012,7 +1012,7 @@ public class TestFacade {
             }
             //诊断"腹部CT"
             String disease = bean.getDisease();
-            if (StringUtil.isNotBlank(disease)) {
+            if (StringUtil2B.isNotBlank(disease)) {
                 String[] physiquedisease = disease.split("#");
 
                 for (int i = 0; i < physiquedisease.length; i++) {
@@ -1057,13 +1057,13 @@ public class TestFacade {
         List<IndicationPushVO> indicationPushVOList = new ArrayList<>();
         List<TestIndicationVO> data = ExcelUtils.importExcelMultiSheets(file, 0, 1, testLineVO.getSheetIndex(), TestIndicationVO.class);
         for (TestIndicationVO bean : data) {
-            if (StringUtil.isNotEmpty(testLineVO.getIdNum()) && !testLineVO.getIdNum().equals(bean.getIdNum())) {
+            if (StringUtil2B.isNotEmpty(testLineVO.getIdNum()) && !testLineVO.getIdNum().equals(bean.getIdNum())) {
                 continue;
             }
             IndicationPushVO indicationPushVO = new IndicationPushVO();
             indicationPushVO.setRuleType("2");
             indicationPushVO.setIdNum(bean.getIdNum());
-            if (StringUtil.isNotBlank(bean.getPacsOrderName())) {
+            if (StringUtil2B.isNotBlank(bean.getPacsOrderName())) {
                 List<Pacs> pacsOrder = new ArrayList<>();
                 Pacs pacsBean = new Pacs();
                 pacsBean.setName(bean.getPacsOrderName());
@@ -1108,25 +1108,25 @@ public class TestFacade {
                     case "1":
                         if (ListUtil.isEmpty(indicationDTO.getCriticalValList())) {
                             msg.add("第【" + indicationPushVO.getIdNum() + "】行未匹配，"
-                                    + (StringUtil.isNotBlank(indicationPushVO.getMsg()) ? indicationPushVO.getMsg() : ""));
+                                    + (StringUtil2B.isNotBlank(indicationPushVO.getMsg()) ? indicationPushVO.getMsg() : ""));
                         }
                         break;
                     case "2":
                         if (ListUtil.isEmpty(indicationDTO.getBillMsgList())) {
                             msg.add("第【" + indicationPushVO.getIdNum() + "】行未匹配。"
-                                    + (StringUtil.isNotBlank(indicationPushVO.getMsg()) ? indicationPushVO.getMsg() : ""));
+                                    + (StringUtil2B.isNotBlank(indicationPushVO.getMsg()) ? indicationPushVO.getMsg() : ""));
                         }
                         break;
                     case "3":
                         if (ListUtil.isEmpty(indicationDTO.getHighRiskList())) {
                             msg.add("第【" + indicationPushVO.getIdNum() + "】行未匹配。"
-                                    + (StringUtil.isNotBlank(indicationPushVO.getMsg()) ? indicationPushVO.getMsg() : ""));
+                                    + (StringUtil2B.isNotBlank(indicationPushVO.getMsg()) ? indicationPushVO.getMsg() : ""));
                         }
                         break;
                     case "4":
                         if (ListUtil.isEmpty(indicationDTO.getOtherList())) {
                             msg.add("第【" + indicationPushVO.getIdNum() + "】行未匹配。"
-                                    + (StringUtil.isNotBlank(indicationPushVO.getMsg()) ? indicationPushVO.getMsg() : ""));
+                                    + (StringUtil2B.isNotBlank(indicationPushVO.getMsg()) ? indicationPushVO.getMsg() : ""));
                         }
                         break;
                     default:
@@ -1214,7 +1214,7 @@ public class TestFacade {
     }
 
     public Map testAll(TestAllVO testAllVO) {
-        if (StringUtil.isBlank(testAllVO.getPath())) {
+        if (StringUtil2B.isBlank(testAllVO.getPath())) {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "参数为空，未填写【文件所在路径】");
         }
         long start = System.currentTimeMillis();
@@ -1349,7 +1349,7 @@ public class TestFacade {
         String sc = "删除";
         String idnum = "3";
 
-        if (StringUtil.isNotBlank(testLineVO.getIdNum())) {
+        if (StringUtil2B.isNotBlank(testLineVO.getIdNum())) {
             idnum = testLineVO.getIdNum();
         }
 
@@ -1360,10 +1360,10 @@ public class TestFacade {
 
             if (null != bean.getOrderType() && null != bean.getNeoName()) {
                 if (bean.getOrderType().contains(xg) || bean.getNeoName().contains(xg)
-                        || (StringUtil.isNotBlank(bean.getStatus()) && bean.getStatus().contains(xg))) {
+                        || (StringUtil2B.isNotBlank(bean.getStatus()) && bean.getStatus().contains(xg))) {
                     item.put("status", xg);
                 } else if (bean.getOrderType().contains(sc) || bean.getNeoName().contains(sc)
-                        || (StringUtil.isNotBlank(bean.getStatus()) && bean.getStatus().contains(sc))) {
+                        || (StringUtil2B.isNotBlank(bean.getStatus()) && bean.getStatus().contains(sc))) {
                     item.put("status", sc);
                 }
             }

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

@@ -20,7 +20,7 @@ import com.diagbot.util.CoreUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.ListUtil;
-import com.diagbot.util.StringUtil;
+import com.diagbot.util.StringUtil2B;
 import com.diagbot.vo.StandConvertCrfVO;
 import com.diagbot.vo.SymptomFeatureVO;
 import com.diagbot.vo.TestStandVO;
@@ -505,7 +505,7 @@ public class TestwordInfoFacade extends TestwordInfoServiceImpl {
             List<Map<String, String>> listMap = convertCrfDTOMap.get(testwordRes.getWord()).getStandard_words();
             int size = 0;
             for (Map<String, String> map : listMap) {
-                if (size < 3 && StringUtil.isNotBlank(map.get("standard_word"))) {
+                if (size < 3 && StringUtil2B.isNotBlank(map.get("standard_word"))) {
                     typeList.add(map.get("standard_word"));
                 }
                 size++;
@@ -521,7 +521,7 @@ public class TestwordInfoFacade extends TestwordInfoServiceImpl {
             List<Map<String, String>> listMap = convertCrfDTOMap.get(testwordRes.getWord()).getStandard_words();
             int size = 0;
             for (Map<String, String> map : listMap) {
-                if (size < 3 && StringUtil.isNotBlank(map.get("standard_words"))) {
+                if (size < 3 && StringUtil2B.isNotBlank(map.get("standard_words"))) {
                     typeList.add(map.get("standard_words"));
                 }
                 size++;
@@ -542,7 +542,7 @@ public class TestwordInfoFacade extends TestwordInfoServiceImpl {
             return new ArrayList<>();
         }
         return list.stream()
-                .filter(r -> StringUtil.isNotBlank((String) CoreUtil.getFieldValue(r, "detailName")))
+                .filter(r -> StringUtil2B.isNotBlank((String) CoreUtil.getFieldValue(r, "detailName")))
                 .map(r -> (String) CoreUtil.getFieldValue(r, "detailName"))
                 .collect(Collectors.toList());
     }
@@ -553,7 +553,7 @@ public class TestwordInfoFacade extends TestwordInfoServiceImpl {
      * @param symptomFeatureVO
      */
     public void getSymptom(SymptomFeatureVO symptomFeatureVO) {
-        if (StringUtil.isBlank(symptomFeatureVO.getPath())) {
+        if (StringUtil2B.isBlank(symptomFeatureVO.getPath())) {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "文件目录不能为空");
         }
         Map<String, SymptomFeatureList> listMap = new LinkedHashMap<>();
@@ -573,7 +573,7 @@ public class TestwordInfoFacade extends TestwordInfoServiceImpl {
 
                 // 3、将文件结构化
                 while ((line = br.readLine()) != null) {
-                    if (StringUtil.isNotBlank(line)) {
+                    if (StringUtil2B.isNotBlank(line)) {
                         String[] arr = line.split(" |\\t");
                         Ann ann = new Ann();
                         ann.setId(arr[0]);

src/main/java/com/diagbot/model/ai/BeHospitalizedAI.java

@@ -33,7 +33,7 @@ import com.diagbot.model.label.PresentLabel;
 import com.diagbot.model.label.VitalLabel;
 import com.diagbot.util.Content;
 import com.diagbot.util.ListUtil;
-import com.diagbot.util.StringUtil;
+import com.diagbot.util.StringUtil2B;
 import com.diagbot.vo.SearchData;
 import com.diagbot.vo.TestCrfVO;
 import org.apache.commons.lang3.StringUtils;
@@ -94,8 +94,8 @@ public class BeHospitalizedAI extends ModelAI {
             /* 主诉 */
             if (StringUtils.isNotBlank(inputInfo.getChief())) {
                 String chiefText = inputInfo.getChief();
-                if (StringUtil.isNotBlank(chiefText)) {
-                    chiefText = "主诉：" + StringUtil.removeBlank(chiefText);//主诉入参 文本前需加 "主诉："
+                if (StringUtil2B.isNotBlank(chiefText)) {
+                    chiefText = "主诉：" + StringUtil2B.removeBlank(chiefText);//主诉入参 文本前需加 "主诉："
                     ChiefLabel chiefLabel = new ChiefLabel();
                     chiefLabel.setText(chiefText);
                     chiefLabel.setAiText(chiefText);
@@ -216,7 +216,7 @@ public class BeHospitalizedAI extends ModelAI {
                 diagLabel.setText(initialDiagText);
                 diagLabel.setAiText(initialDiagText);
                 wordCrfDTO.setDiagLabel(diagLabel);
-                if (StringUtil.isNotBlank(initialDiagText)) {
+                if (StringUtil2B.isNotBlank(initialDiagText)) {
                     putContent(crfContent, medicalTextType.get(6), initialDiagText, Content.initial_diag);
                 }
             }
@@ -245,39 +245,39 @@ public class BeHospitalizedAI extends ModelAI {
                 throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "CRF解析文本【超时】或【服务出错】!");
             }
             /* 处理主诉 */
-            if (StringUtil.isNotBlank(wordCrfDTO.getChiefLabel().getText())) {
+            if (StringUtil2B.isNotBlank(wordCrfDTO.getChiefLabel().getText())) {
                 putChiefCrfData(midData.getJSONObject(Content.chief), wordCrfDTO);
             }
             /* 处理现病史 */
-            if (StringUtil.isNotBlank(wordCrfDTO.getPresentLabel().getText())) {
+            if (StringUtil2B.isNotBlank(wordCrfDTO.getPresentLabel().getText())) {
                 putPresentCrfData(midData.getJSONObject(Content.present), wordCrfDTO);
             }
             /* 处理既往史 */
-            if (StringUtil.isNotBlank(wordCrfDTO.getPastLabel().getText())) {
+            if (StringUtil2B.isNotBlank(wordCrfDTO.getPastLabel().getText())) {
                 putPastCrfData(midData.getJSONObject(Content.past), wordCrfDTO);
             }
             /* 处理个人史 */
-            if (StringUtil.isNotBlank(wordCrfDTO.getPersonalLabel().getText())) {
+            if (StringUtil2B.isNotBlank(wordCrfDTO.getPersonalLabel().getText())) {
                 putPersonalCrfData(midData.getJSONObject(Content.personal), wordCrfDTO);
             }
             /* 处理月经史 */
-            if (StringUtil.isNotBlank(wordCrfDTO.getMenstrualLabel().getText())) {
+            if (StringUtil2B.isNotBlank(wordCrfDTO.getMenstrualLabel().getText())) {
                 putMensesCrfData(midData.getJSONObject(Content.menses), wordCrfDTO);
             }
             /* 处理家族史 */
-            if (StringUtil.isNotBlank(wordCrfDTO.getFamilyLabel().getText())) {
+            if (StringUtil2B.isNotBlank(wordCrfDTO.getFamilyLabel().getText())) {
                 putFamilyCrfData(midData.getJSONObject(Content.family), wordCrfDTO);
             }
             /* 处理婚育史 */
-            if (StringUtil.isNotBlank(wordCrfDTO.getMaritalLabel().getText())) {
+            if (StringUtil2B.isNotBlank(wordCrfDTO.getMaritalLabel().getText())) {
                 putMaritalCrfData(midData.getJSONObject(Content.marriage), wordCrfDTO);
             }
             //处理初步诊断
-            if (StringUtil.isNotBlank(wordCrfDTO.getDiagLabel().getText())) {
+            if (StringUtil2B.isNotBlank(wordCrfDTO.getDiagLabel().getText())) {
                 putInitialDiagCrfData(midData.getJSONObject(Content.initial_diag), wordCrfDTO);
             }
             //处理查体数据
-            if (StringUtil.isNotBlank(wordCrfDTO.getVitalLabel().getText())) {
+            if (StringUtil2B.isNotBlank(wordCrfDTO.getVitalLabel().getText())) {
                 putInitialVitalCrfData(midData.getJSONObject(Content.phys_exam), wordCrfDTO);
             }
              /*//处理修正诊断
@@ -293,7 +293,7 @@ public class BeHospitalizedAI extends ModelAI {
                 putPacsCrfData(midData.getJSONObject(Content.pacs), wordCrfDTO);
             }*/
             // 处理辅检
-            if (StringUtil.isNotBlank(wordCrfDTO.getPacsLabel().getText())) {
+            if (StringUtil2B.isNotBlank(wordCrfDTO.getPacsLabel().getText())) {
                 putInitialPacsCrfData(midData.getJSONObject(Content.pacs), wordCrfDTO.getPacsLabel());
             }
         }

src/main/java/com/diagbot/model/ai/ModelAI.java

@@ -6,7 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.diagbot.client.CRFServiceClient;
 import com.diagbot.model.entity.Annotation;
 import com.diagbot.util.CatalogueUtil;
-import com.diagbot.util.StringUtil;
+import com.diagbot.util.StringUtil2B;
 import com.diagbot.vo.CRFVo;
 import lombok.extern.slf4j.Slf4j;
 
@@ -55,7 +55,7 @@ public class ModelAI {
 
     protected void putContent(JSONArray crfContent, String medicalTextType, String text, String sign) {
         String move_text = CatalogueUtil.removeSpecialChar(text);
-        if (StringUtil.isEmpty(move_text)) {
+        if (StringUtil2B.isEmpty(move_text)) {
             return;
         }
         JSONObject detailContent = new JSONObject();
@@ -68,7 +68,7 @@ public class ModelAI {
     protected void putContent(JSONArray crfContent, String medicalTextType, String firstText, String secondText, String sign) {
         String firstMoveText = CatalogueUtil.removeSpecialChar(firstText);
         String secondMoveText = CatalogueUtil.removeSpecialChar(secondText);
-        if (StringUtil.isEmpty(firstMoveText) && StringUtil.isEmpty(secondMoveText)) {
+        if (StringUtil2B.isEmpty(firstMoveText) && StringUtil2B.isEmpty(secondMoveText)) {
             return;
         }
         JSONObject detailContent = new JSONObject();
@@ -89,7 +89,7 @@ public class ModelAI {
         for (int i = 0; i < data.size(); i++) {
             JSONObject detailContent = data.getJSONObject(i);
             String detail_title = detailContent.getString("detail_title");
-            if (StringUtil.isNotEmpty(detail_title) && midData.get(detail_title) == null) {
+            if (StringUtil2B.isNotEmpty(detail_title) && midData.get(detail_title) == null) {
                 midData.put(detail_title, detailContent);
             }
         }
@@ -108,7 +108,7 @@ public class ModelAI {
     public void putContent(JSONArray similarContent, String firstText, String secondText) {
         String moveFirstText = CatalogueUtil.removeSpecialChar(firstText);
         String moveSecondText = CatalogueUtil.removeSpecialChar(secondText);
-        if (StringUtil.isEmpty(moveFirstText) || StringUtil.isEmpty(moveSecondText)) {
+        if (StringUtil2B.isEmpty(moveFirstText) || StringUtil2B.isEmpty(moveSecondText)) {
             return;
         }
         JSONObject detailContent = new JSONObject();
@@ -165,7 +165,7 @@ public class ModelAI {
      * 存放主诉现病史症状文本相似度入参内容
      */
     public void putContent(JSONObject similarContent, String firstText, List<String> clinicArr) {
-        if (StringUtil.isEmpty(firstText) || clinicArr.size() == 0) {
+        if (StringUtil2B.isEmpty(firstText) || clinicArr.size() == 0) {
             return;
         }
         similarContent.put("string1", firstText);

src/main/java/com/diagbot/model/ai/process/EntityProcess.java

@@ -8,7 +8,7 @@ import com.diagbot.model.ai.model.Relation;
 import com.diagbot.model.entity.Negative;
 import com.diagbot.model.entity.PD;
 import com.diagbot.util.CatalogueUtil;
-import com.diagbot.util.StringUtil;
+import com.diagbot.util.StringUtil2B;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
@@ -397,7 +397,7 @@ public class EntityProcess {
     public PD getPd(String text) {
         PD pd = new PD();
         String[] val_unit = new String[2];
-        if (StringUtil.isNotBlank(text)) {
+        if (StringUtil2B.isNotBlank(text)) {
             val_unit = extract_digit_new(text);
             pd.setName(text);
             pd.setValue(val_unit[0]);

src/main/java/com/diagbot/model/ai/process/EntityProcessPacs.java

@@ -11,7 +11,7 @@ import com.diagbot.model.entity.Pacs;
 import com.diagbot.model.entity.PacsNum;
 import com.diagbot.model.label.PacsLabel;
 import com.diagbot.util.ListUtil;
-import com.diagbot.util.StringUtil;
+import com.diagbot.util.StringUtil2B;
 import com.google.common.collect.Lists;
 
 import java.util.ArrayList;
@@ -91,7 +91,7 @@ public class EntityProcessPacs extends EntityProcess {
                 for (Lemma relationLemma : lemma.getRelationLemmas()) {
                     if (relationLemma.getProperty().equals(EntityEnum.INDEX_VALUE.toString())) { // 体征结果
                         String value = relationLemma.getText();
-                        if (StringUtil.isNotBlank(value)) {
+                        if (StringUtil2B.isNotBlank(value)) {
                             PacsNum pacsNum = new PacsNum();
                             pacsNum.setName(lemma.getText());
                             pacsNum.setStandName(lemma.getText());

src/main/java/com/diagbot/model/ai/process/EntityProcessVital.java

@@ -5,7 +5,7 @@ import com.diagbot.model.ai.model.EntityEnum;
 import com.diagbot.model.ai.model.Lemma;
 import com.diagbot.model.entity.*;
 import com.diagbot.model.label.VitalLabel;
-import com.diagbot.util.StringUtil;
+import com.diagbot.util.StringUtil2B;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
@@ -46,7 +46,7 @@ public class EntityProcessVital extends EntityProcess {
                     case INDEX_VALUE:
                         PD pd = new PD();
                         String[] val_unit = new String[2];
-                        if (StringUtil.isNotBlank(entity)) {
+                        if (StringUtil2B.isNotBlank(entity)) {
                             val_unit = extract_digit_new(entity);
                             pd.setValue(val_unit[0]);
                             pd.setUnit(val_unit[1]);
@@ -146,7 +146,7 @@ public class EntityProcessVital extends EntityProcess {
                     case INDEX_VALUE:
                         PD pd = new PD();
                         String[] val_unit = new String[2];
-                        if (StringUtil.isNotBlank(entity)) {
+                        if (StringUtil2B.isNotBlank(entity)) {
                             val_unit = extract_digit_new(entity);
                             pd.setValue(val_unit[0]);
                             pd.setUnit(val_unit[1]);

src/main/java/com/diagbot/process/CriticalProcess.java

@@ -15,7 +15,7 @@ import com.diagbot.facade.CommonFacade;
 import com.diagbot.model.label.PacsLabel;
 import com.diagbot.rule.LisRule;
 import com.diagbot.rule.PacsRule;
-import com.diagbot.util.StringUtil;
+import com.diagbot.util.StringUtil2B;
 import com.diagbot.vo.RuleVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -113,7 +113,7 @@ public class CriticalProcess {
      * @return
      */
     public RuleVO getRuleVO(Lis lis) {
-        if (StringUtil.isNotBlank(lis.getUniqueName())) {
+        if (StringUtil2B.isNotBlank(lis.getUniqueName())) {
             RuleVO ruleVO = new RuleVO();
             ruleVO.setInputName(lis.getName());
             ruleVO.setLibName(lis.getUniqueName());
@@ -133,7 +133,7 @@ public class CriticalProcess {
      * @return
      */
     public RuleVO getRuleVO(Item item) {
-        if (StringUtil.isNotBlank(item.getUniqueName())) {
+        if (StringUtil2B.isNotBlank(item.getUniqueName())) {
             RuleVO ruleVO = new RuleVO();
             ruleVO.setInputName(item.getName());
             ruleVO.setLibName(item.getUniqueName());

src/main/java/com/diagbot/process/HighRiskProcess.java

@@ -19,7 +19,7 @@ import com.diagbot.rule.LisRule;
 import com.diagbot.rule.VitalRule;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.MsgUtil;
-import com.diagbot.util.StringUtil;
+import com.diagbot.util.StringUtil2B;
 import com.diagbot.vo.Drug;
 import com.diagbot.vo.RuleVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -147,7 +147,7 @@ public class HighRiskProcess {
      * @return
      */
     public RuleVO getRuleVO(Drug bean) {
-        if (StringUtil.isNotBlank(bean.getUniqueName())) {
+        if (StringUtil2B.isNotBlank(bean.getUniqueName())) {
             RuleVO ruleVO = new RuleVO();
             ruleVO.setInputName(bean.getName());
             ruleVO.setLibName(bean.getUniqueName());
@@ -168,7 +168,7 @@ public class HighRiskProcess {
      * @return
      */
     public RuleVO getRuleVO(Item bean) {
-        if (StringUtil.isNotBlank(bean.getUniqueName())) {
+        if (StringUtil2B.isNotBlank(bean.getUniqueName())) {
             RuleVO ruleVO = new RuleVO();
             ruleVO.setInputName(bean.getName());
             ruleVO.setLibName(bean.getUniqueName());

src/main/java/com/diagbot/process/OtherTipProcess.java

@@ -27,7 +27,7 @@ import com.diagbot.util.ListUtil;
 import com.diagbot.util.MsgUtil;
 import com.diagbot.util.RedisUtil;
 import com.diagbot.util.ReflectUtil;
-import com.diagbot.util.StringUtil;
+import com.diagbot.util.StringUtil2B;
 import com.diagbot.vo.ItemExt;
 import com.diagbot.vo.RuleVO;
 import com.google.common.collect.Lists;
@@ -255,7 +255,7 @@ public class OtherTipProcess {
         if (ListUtil.isNotEmpty(scaleList)) {
             for (Scale scale : scaleList) {
                 String result = scale.getResult();
-                if (StringUtil.isNotBlank(result)) {
+                if (StringUtil2B.isNotBlank(result)) {
                     if (result.matches("高危|中危|极高危")) {
                         vteResult = result;
                     } else if (result.matches("有|无")) {
@@ -266,7 +266,7 @@ public class OtherTipProcess {
         }
 
         // VTE评估结果 和 VTE出血风险都有值
-        if (StringUtil.isNotBlank(vteResult) && StringUtil.isNotBlank(vteBlood)) {
+        if (StringUtil2B.isNotBlank(vteResult) && StringUtil2B.isNotBlank(vteBlood)) {
             // 是否有药物医嘱
             Boolean drugAdviceFlag = false;
             // 是否有机械医嘱
@@ -307,7 +307,7 @@ public class OtherTipProcess {
         }
         for (T item : tList) {
             String name = ReflectUtil.getProperty(item, "name");
-            if (StringUtil.isNotBlank(name)) {
+            if (StringUtil2B.isNotBlank(name)) {
                 if (nameList.contains(name)) {
                     // 开单时间
                     String dateValue = ReflectUtil.getProperty(item, "dateValue");
@@ -339,7 +339,7 @@ public class OtherTipProcess {
         List<Item> itemList = pacsLabel.getRes();
         if (ListUtil.isNotEmpty(itemList)) {
             for (Item bean : itemList) {
-                if (StringUtil.isNotBlank(bean.getUniqueName())) {
+                if (StringUtil2B.isNotBlank(bean.getUniqueName())) {
                     RuleVO ruleVO = new RuleVO();
                     ruleVO.setInputName(bean.getName());
                     ruleVO.setLibName(bean.getUniqueName());
@@ -375,7 +375,7 @@ public class OtherTipProcess {
      * @return
      */
     public RuleVO getRuleVO(Lis lis, Integer key) {
-        if (StringUtil.isNotBlank(lis.getUniqueName())) {
+        if (StringUtil2B.isNotBlank(lis.getUniqueName())) {
             RuleVO ruleVO = new RuleVO();
             ruleVO.setInputName(lis.getName());
             ruleVO.setLibName(lis.getUniqueName());
@@ -395,7 +395,7 @@ public class OtherTipProcess {
      * @return
      */
     public RuleVO getRuleVO(ItemExt i, Integer key) {
-        if (StringUtil.isNotBlank(i.getUniqueName())) {
+        if (StringUtil2B.isNotBlank(i.getUniqueName())) {
             RuleVO ruleVO = new RuleVO();
             ruleVO.setInputName(i.getName());
             ruleVO.setLibName(i.getUniqueName());

src/main/java/com/diagbot/process/PushProcess.java

@@ -40,7 +40,7 @@ import com.diagbot.util.CoreUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.RedisUtil;
-import com.diagbot.util.StringUtil;
+import com.diagbot.util.StringUtil2B;
 import com.diagbot.vo.DiagnoseVO;
 import com.diagbot.vo.DiseaseItemVO;
 import com.diagbot.vo.IcssVo;
@@ -412,12 +412,12 @@ public class PushProcess {
         ReverseVO reverseVO = generateReverseVO(wordCrfDTO, featureType, dis, diseaseNameEqFirstFirstFlag);
 
         // 输出调试信息
-        if (StringUtil.isBlank(selectDisName)) {
+        if (StringUtil2B.isBlank(selectDisName)) {
             pushDTO.getDebug().put("选中诊断推送【一般治疗、药品、手术、护理】", "无"); // 调试信息
         } else {
             pushDTO.getDebug().put("选中诊断推送【一般治疗、药品、手术、护理】", selectDisName); // 调试信息
         }
-        if (StringUtil.isBlank(reverseVO.getLibName())) {
+        if (StringUtil2B.isBlank(reverseVO.getLibName())) {
             pushDTO.getDebug().put("第一诊断推送其他信息", "无"); // 调试信息
             return;
         } else {
@@ -457,7 +457,7 @@ public class PushProcess {
      * @return
      */
     public Boolean hasDiseaseName(Item item) {
-        if (item != null && StringUtil.isNotBlank(item.getUniqueName())) {
+        if (item != null && StringUtil2B.isNotBlank(item.getUniqueName())) {
             return true;
         }
         return false;
@@ -748,7 +748,7 @@ public class PushProcess {
         }
         reverseVO.setLibName(disName);
         // 诊断名称不为空才反推
-        if (StringUtil.isNotBlank(disName)) {
+        if (StringUtil2B.isNotBlank(disName)) {
             reverseVO.setAge(wordCrfDTO.getAgeNum());
             reverseVO.setSexType(wordCrfDTO.getSex());
             reverseVO.setLibType(LexiconEnum.Disease.getKey());

src/main/java/com/diagbot/rule/CommonRule.java

@@ -28,7 +28,7 @@ import com.diagbot.util.MsgUtil;
 import com.diagbot.util.RedisUtil;
 import com.diagbot.util.ReflectUtil;
 import com.diagbot.util.RegexUtil;
-import com.diagbot.util.StringUtil;
+import com.diagbot.util.StringUtil2B;
 import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -133,7 +133,7 @@ public class CommonRule {
      * @return
      */
     public <T> Boolean containsItem(List<T> input, String name) {
-        if (ListUtil.isNotEmpty(input) && StringUtil.isNotBlank(name)) {
+        if (ListUtil.isNotEmpty(input) && StringUtil2B.isNotBlank(name)) {
             for (T t : input) {
                 String c = (String) CoreUtil.getFieldValue(t, "uniqueName"); // 标准名称
                 if (c.contains(name)) {
@@ -259,11 +259,11 @@ public class CommonRule {
         if (ListUtil.isNotEmpty(pacsList)) {
             sortByProperty(pacsList, "dateValue");
             Pacs pacs = pacsList.get(pacsList.size() - 1); // 按时间排序，取最后一条
-            if (StringUtil.isNotBlank(pacs.getName())) {
+            if (StringUtil2B.isNotBlank(pacs.getName())) {
                 ruleSimpleDTO.setStructName(pacs.getName());
             }
             String result = pacs.getResult();
-            if (StringUtil.isNotBlank(result) && StringUtil.isNotBlank(ruleBaseDTO.getBaseEqValue())
+            if (StringUtil2B.isNotBlank(result) && StringUtil2B.isNotBlank(ruleBaseDTO.getBaseEqValue())
                     && RegexUtil.getRegexRes(result, ruleBaseDTO.getBaseEqValue())) {
                 String dateValue = pacs.getDateValue(); // 结果日期
                 String orderDateValue = ruleSimpleDTO.getDateValue(); // 开单项日期
@@ -336,10 +336,10 @@ public class CommonRule {
                 public int compare(T o1, T o2) {
                     String o1Str = (String) CoreUtil.getFieldValue(o1, property);
                     String o2Str = (String) CoreUtil.getFieldValue(o2, property);
-                    if (StringUtil.isBlank(o1Str)) {
+                    if (StringUtil2B.isBlank(o1Str)) {
                         return -1;
                     }
-                    if (StringUtil.isBlank(o2Str)) {
+                    if (StringUtil2B.isBlank(o2Str)) {
                         return 1;
                     }
                     return o1Str.compareTo(o2Str);
@@ -444,13 +444,13 @@ public class CommonRule {
                     // 化验明细项不为空的数据，说明是细项，舍弃
                     if (TypeEnum.lis.getName().equals(ruleSimpleDTO.getLibTypeName())) {
                         String detailName = ReflectUtil.getProperty(bean, "detailName");
-                        if (StringUtil.isNotBlank(detailName)) {
+                        if (StringUtil2B.isNotBlank(detailName)) {
                             continue;
                         }
                     }
                     String finishDateValue = ReflectUtil.getProperty(bean, "finishDateValue");
                     // 报告时间为空，再比较时间间隔
-                    if (StringUtil.isBlank(finishDateValue)) {
+                    if (StringUtil2B.isBlank(finishDateValue)) {
                         String orderDateValue = ReflectUtil.getProperty(ruleSimpleDTO, "dateValue");
                         String beanDateValue = ReflectUtil.getProperty(bean, "dateValue");
                         int dateFlag = CoreUtil.compareTime(beanDateValue, orderDateValue, 60L * 24, false, false);
@@ -483,7 +483,7 @@ public class CommonRule {
      * @return
      */
     public String getFrquenceType(String frequency) {
-        if (StringUtil.isEmpty(frequency)) {
+        if (StringUtil2B.isEmpty(frequency)) {
             frequency = "空";
         }
         List<DictionaryInfoDTO> listByGroupType = redisUtil.get(RedisEnum.frequency.getName());
@@ -518,11 +518,11 @@ public class CommonRule {
                 for (int i = 0; i < items.size() - 1; i++) {
                     T it = items.get(i);
                     String curDateValue = ReflectUtil.getProperty(it, "dateValue");
-                    if (StringUtil.isNotBlank(curDateValue)) {
+                    if (StringUtil2B.isNotBlank(curDateValue)) {
                         for (int j = i + 1; j < items.size(); j++) {
                             T itNext = items.get(j);
                             String nextDateValue = ReflectUtil.getProperty(itNext, "dateValue");
-                            if (StringUtil.isNotBlank(nextDateValue)) {
+                            if (StringUtil2B.isNotBlank(nextDateValue)) {
                                 int dateFlag = CoreUtil.compareTime(curDateValue, nextDateValue, repeatDate, false, true);
                                 if (dateFlag == 1
                                         && getFrquenceType(ReflectUtil.getProperty(it, "frequency"))
@@ -567,13 +567,13 @@ public class CommonRule {
                     // 化验明细项不为空的数据，说明是细项，舍弃
                     if (TypeEnum.lis.getName().equals(type)) {
                         String detailName = ReflectUtil.getProperty(order, "detailName");
-                        if (StringUtil.isNotBlank(detailName)) {
+                        if (StringUtil2B.isNotBlank(detailName)) {
                             continue;
                         }
                     }
                     String finishDateValue = ReflectUtil.getProperty(it, "finishDateValue");
                     // 报告时间为空，再比较时间间隔
-                    if (StringUtil.isBlank(finishDateValue)) {
+                    if (StringUtil2B.isBlank(finishDateValue)) {
                         String curDateValue = ReflectUtil.getProperty(order, "dateValue"); // 当前开单时间
                         String pastDateValue = ReflectUtil.getProperty(it, "dateValue"); // 历史开单时间
                         int dateFlag = CoreUtil.compareTime(pastDateValue, curDateValue, repeatDate, false, false);
@@ -670,7 +670,7 @@ public class CommonRule {
                 case regexPacs: // 辅检正则
                     if (ListUtil.isNotEmpty(wordCrfDTO.getPacs())) {
                         String content = wordCrfDTO.getPacs().stream().map(r -> r.getResult())
-                                .filter(r -> StringUtil.isNotBlank(r)).collect(Collectors.joining("。"));
+                                .filter(r -> StringUtil2B.isNotBlank(r)).collect(Collectors.joining("。"));
                         getRegexResPush(content, base.getBaseEqValue(), baseIdList, baseIds);
                     }
                     break;

src/main/java/com/diagbot/rule/GroupRule.java

@@ -8,7 +8,7 @@ import com.diagbot.enums.ConEnum;
 import com.diagbot.util.CoreUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.RegexUtil;
-import com.diagbot.util.StringUtil;
+import com.diagbot.util.StringUtil2B;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -141,10 +141,10 @@ public class GroupRule {
                 case "未经产妇": // 女性+（婚育史或既往史)数值累加为0
                     regex = "(\\d+)-(\\d+)-(\\d+)-(\\d+)";
                     if (sex == 2) {
-                        if (StringUtil.isNotBlank(marital) && RegexUtil.getRegexRes(marital, regex)) {
+                        if (StringUtil2B.isNotBlank(marital) && RegexUtil.getRegexRes(marital, regex)) {
                             // 婚育史判断
                             groupList = RegexUtil.getRegexDataList(marital, regex);
-                        } else if (StringUtil.isNotBlank(pasts) && RegexUtil.getRegexRes(pasts, regex)) {
+                        } else if (StringUtil2B.isNotBlank(pasts) && RegexUtil.getRegexRes(pasts, regex)) {
                             // 既往史判断
                             groupList = RegexUtil.getRegexDataList(pasts, regex);
                         }
@@ -159,10 +159,10 @@ public class GroupRule {
                 case "经产妇": // 女性+（婚育史或既往史)数值累加>=1
                     regex = "(\\d+)-(\\d+)-(\\d+)-(\\d+)";
                     if (sex == 2) {
-                        if (StringUtil.isNotBlank(marital) && RegexUtil.getRegexRes(marital, regex)) {
+                        if (StringUtil2B.isNotBlank(marital) && RegexUtil.getRegexRes(marital, regex)) {
                             // 婚育史判断
                             groupList = RegexUtil.getRegexDataList(marital, regex);
-                        } else if (StringUtil.isNotBlank(pasts) && RegexUtil.getRegexRes(pasts, regex)) {
+                        } else if (StringUtil2B.isNotBlank(pasts) && RegexUtil.getRegexRes(pasts, regex)) {
                             // 既往史判断
                             groupList = RegexUtil.getRegexDataList(pasts, regex);
                         }

src/main/java/com/diagbot/rule/LisRule.java

@@ -16,7 +16,7 @@ import com.diagbot.util.CoreUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.MsgNewUtil;
 import com.diagbot.util.MsgUtil;
-import com.diagbot.util.StringUtil;
+import com.diagbot.util.StringUtil2B;
 import com.diagbot.vo.ItemExt;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,7 +55,7 @@ public class LisRule {
     public Boolean bill(List<Lis> inputLis, RuleBaseDTO ruleBaseDTO, RuleSimpleDTO ruleSimpleDTO) {
         boolean flag = false;
         List<String> contentList = Lists.newArrayList();
-        if (ListUtil.isNotEmpty(inputLis) && StringUtil.isNotBlank(ruleBaseDTO.getBaseLibName())) {
+        if (ListUtil.isNotEmpty(inputLis) && StringUtil2B.isNotBlank(ruleBaseDTO.getBaseLibName())) {
             for (Lis lis : inputLis) {
                 MatchDTO matchDTO = CoreUtil.compareLis(ruleBaseDTO, lis);
                 if (matchDTO != null) {
@@ -81,7 +81,7 @@ public class LisRule {
      * @param ruleSimpleDTO
      */
     public void highOperation(List<Lis> inputLis, RuleBaseDTO ruleBaseDTO, List<BillMsg> highRiskList, RuleSimpleDTO ruleSimpleDTO) {
-        if (ListUtil.isNotEmpty(inputLis) && StringUtil.isNotBlank(ruleBaseDTO.getBaseLibName())) {
+        if (ListUtil.isNotEmpty(inputLis) && StringUtil2B.isNotBlank(ruleBaseDTO.getBaseLibName())) {
             for (Lis lis : inputLis) {
                 MatchDTO matchDTO = CoreUtil.compareLis(ruleBaseDTO, lis);
                 if (matchDTO != null) {
@@ -167,7 +167,7 @@ public class LisRule {
             }
         }
         // 条件全部符合
-        if (StringUtil.isNotBlank(lisOtherDTO.getName())) {
+        if (StringUtil2B.isNotBlank(lisOtherDTO.getName())) {
             String lisNameDetail = lisOtherDTO.getLisNameDetail(); // 化验套餐和明细
             // 就化验本身一个条件符合
             if (ruleBaseDTOList.size() == 1) {
@@ -208,7 +208,7 @@ public class LisRule {
                     }
                 }
                 // 性别
-                if (StringUtil.isNotBlank(lisOtherDTO.getSexMsg())) {
+                if (StringUtil2B.isNotBlank(lisOtherDTO.getSexMsg())) {
                     BillMsg billMsg = msgNewUtil.getCommonOtherMsg(TypeEnum.lis.getName(), lisOtherDTO.getName(),
                             lisOtherDTO.getSexMsg(), TypeEnum.gender.getName(), lisBean, msg, lisNameDetail);
                     CoreUtil.addBeanToList(otherList, billMsg);
@@ -285,7 +285,7 @@ public class LisRule {
             }
         }
         // 条件全部符合
-        if (StringUtil.isNotBlank(lisOtherDTO.getName())) {
+        if (StringUtil2B.isNotBlank(lisOtherDTO.getName())) {
             // 化验本身符合，其他不符合
             if (ListUtil.isEmpty(lisOtherDTO.getDiseaseMsg())
                     && ListUtil.isEmpty(lisOtherDTO.getOperationMsg())
@@ -427,7 +427,7 @@ public class LisRule {
                 return;
             }
         }
-        if (StringUtil.isNotBlank(lisCtritalDTO.getName())) {
+        if (StringUtil2B.isNotBlank(lisCtritalDTO.getName())) {
             // 就化验本身一个条件符合
             if (ruleBaseDTOList.size() == 1) {
                 BillMsg billMsg = msgNewUtil.getCriticalMsg(TypeEnum.lis.getName(),
@@ -443,13 +443,13 @@ public class LisRule {
                     }
                 }
                 // 人群
-                if (StringUtil.isNotBlank(lisCtritalDTO.getGroupMsg())) {
+                if (StringUtil2B.isNotBlank(lisCtritalDTO.getGroupMsg())) {
                     BillMsg billMsg = msgNewUtil.getCriticalMsg(TypeEnum.lis.getName(), lisCtritalDTO.getName(),
                             lisCtritalDTO.getGroupMsg(), TypeEnum.group.getName(), msg);
                     CoreUtil.addBeanToList(criticalList, billMsg);
                 }
                 // 年龄
-                if (StringUtil.isNotBlank(lisCtritalDTO.getAgeMsg())) {
+                if (StringUtil2B.isNotBlank(lisCtritalDTO.getAgeMsg())) {
                     BillMsg billMsg = msgNewUtil.getCriticalMsg(TypeEnum.lis.getName(), lisCtritalDTO.getName(),
                             lisCtritalDTO.getAgeMsg(), TypeEnum.age.getName(), msg);
                     CoreUtil.addBeanToList(criticalList, billMsg);
@@ -467,7 +467,7 @@ public class LisRule {
      * @param ids
      */
     public void push(List<Lis> inputLis, RuleBaseDTO ruleBaseDTO, List<Long> baseIdList, String ids) {
-        if (ListUtil.isNotEmpty(inputLis) && StringUtil.isNotBlank(ruleBaseDTO.getBaseLibName())) {
+        if (ListUtil.isNotEmpty(inputLis) && StringUtil2B.isNotBlank(ruleBaseDTO.getBaseLibName())) {
             for (Lis lis : inputLis) {
                 MatchDTO matchDTO = CoreUtil.compareLis(ruleBaseDTO, lis);
                 if (matchDTO != null) {

src/main/java/com/diagbot/rule/OtherRule.java

@@ -15,7 +15,7 @@ import com.diagbot.model.label.PastLabel;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.MsgNewUtil;
 import com.diagbot.util.RedisUtil;
-import com.diagbot.util.StringUtil;
+import com.diagbot.util.StringUtil2B;
 import com.diagbot.vo.Drug;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -61,7 +61,7 @@ public class OtherRule {
                 Negative negative = allergy.getNegative(); // null表示阳性
                 if (allergyMap == null || !allergyMap.containsKey(standName)) {
                     // 执行到这里说明自身过敏的规则没有维护
-                    if (negative == null && StringUtil.isNotBlank(drug.getUniqueName()) && drug.getUniqueName().equals(standName)) {
+                    if (negative == null && StringUtil2B.isNotBlank(drug.getUniqueName()) && drug.getUniqueName().equals(standName)) {
                         RuleSimpleDTO ruleSimpleDTO = new RuleSimpleDTO();
                         ruleSimpleDTO.setInputName(drug.getName());
                         ruleSimpleDTO.setLibName(drug.getUniqueName());

src/main/java/com/diagbot/rule/SexRule.java

@@ -5,7 +5,7 @@ import com.diagbot.dto.RuleSimpleDTO;
 import com.diagbot.dto.WordCrfDTO;
 import com.diagbot.enums.ConEnum;
 import com.diagbot.util.CoreUtil;
-import com.diagbot.util.StringUtil;
+import com.diagbot.util.StringUtil2B;
 import com.google.common.collect.Lists;
 import org.springframework.stereotype.Component;
 
@@ -47,7 +47,7 @@ public class SexRule {
      */
     public boolean getFlag(WordCrfDTO wordCrfDTO, RuleBaseDTO ruleBaseDTO) {
         String sex = ruleBaseDTO.getBaseLibName();
-        if (StringUtil.isNotBlank(sex) && wordCrfDTO.getSex() != null) {
+        if (StringUtil2B.isNotBlank(sex) && wordCrfDTO.getSex() != null) {
             String sexStr = "";
             if (1 == wordCrfDTO.getSex()) {
                 sexStr = "男";

src/main/java/com/diagbot/util/CatalogueUtil.java

@@ -24,11 +24,11 @@ public class CatalogueUtil {
                     .put(6, "六").put(7, "七").put(8, "八").put(9, "九").put(0, "零").build();
 
     public static boolean isEmpty(String content) {
-        return StringUtil.isBlank(removeSpecialChar(content));
+        return StringUtil2B.isBlank(removeSpecialChar(content));
     }
 
     public static String removeSpecialChar(String content) {
-        if (StringUtil.isEmpty(content)) {
+        if (StringUtil2B.isEmpty(content)) {
             return "";
         }
         return content.replaceAll("[\r\n|\n|\t]", " ").trim();
@@ -66,7 +66,7 @@ public class CatalogueUtil {
      */
     public static List<String> noInQuotes(List<String> words, String text) {
         List<String> retWords = Lists.newArrayList();
-        if (ListUtil.isNotEmpty(words) && StringUtil.isNotBlank(text)) {
+        if (ListUtil.isNotEmpty(words) && StringUtil2B.isNotBlank(text)) {
             List<String> sections = Lists.newArrayList();
             int index = 0;
             for (String txt : text.split("\"")) {
@@ -76,7 +76,7 @@ public class CatalogueUtil {
                 index++;
             }
             for (String word : words) {
-                if (StringUtil.isNotBlank(word)) {
+                if (StringUtil2B.isNotBlank(word)) {
                     String newWord = word.replaceAll("[“”]", "\"");
                     if (sections.stream().noneMatch(section -> section.contains(newWord))) {
                         retWords.add(word);
@@ -97,8 +97,8 @@ public class CatalogueUtil {
      */
     public static boolean equalsDate(String firstDateStr, String secondDateStr, String datePattren) {
         if (!isEmpty(firstDateStr) && !isEmpty(secondDateStr)) {
-            Date firstDate = StringUtil.parseDateTime(firstDateStr);
-            Date secondDate = StringUtil.parseDateTime(secondDateStr);
+            Date firstDate = StringUtil2B.parseDateTime(firstDateStr);
+            Date secondDate = StringUtil2B.parseDateTime(secondDateStr);
             SimpleDateFormat fmt = new SimpleDateFormat(datePattren);
             if (firstDate != null && secondDate != null && fmt.format(firstDate).equals(fmt.format(secondDate))) {
                 return true;
@@ -126,8 +126,8 @@ public class CatalogueUtil {
      */
     public static boolean compareDate(String firstDateStr, String secondDateStr, int symbol) {
         if (!isEmpty(firstDateStr) && !isEmpty(secondDateStr)) {
-            Date firstDate = StringUtil.parseDateTime(firstDateStr);
-            Date secondDate = StringUtil.parseDateTime(secondDateStr);
+            Date firstDate = StringUtil2B.parseDateTime(firstDateStr);
+            Date secondDate = StringUtil2B.parseDateTime(secondDateStr);
             if (symbol == 1) {
                 return firstDate != null && secondDate != null && firstDate.before(secondDate);
             } else if (symbol == -1) {
@@ -159,7 +159,7 @@ public class CatalogueUtil {
      * @return
      */
     public static String subTitle(String srcText) {
-        if (StringUtil.isNotBlank(srcText) && srcText.contains("代")) {
+        if (StringUtil2B.isNotBlank(srcText) && srcText.contains("代")) {
             srcText = srcText.substring(srcText.lastIndexOf("代") + 1);
         }
         return srcText;
@@ -255,10 +255,10 @@ public class CatalogueUtil {
     }
 
     public static Date parseStringDate(String dateStr) {
-        if (StringUtil.isBlank(dateStr)) {
+        if (StringUtil2B.isBlank(dateStr)) {
             return null;
         }
-        return StringUtil.parseDateTime(dateStr);
+        return StringUtil2B.parseDateTime(dateStr);
     }
 
     /**
@@ -318,7 +318,7 @@ public class CatalogueUtil {
     public static String structureMapJoin(Map<String, String> structureMap, List<String> keys) {
         String textJoin = "";
         for (String key : keys) {
-            if (StringUtil.isNotBlank(structureMap.get(key))) {
+            if (StringUtil2B.isNotBlank(structureMap.get(key))) {
                 textJoin += key + "：" + structureMap.get(key) + "\n";
             }
         }
@@ -333,7 +333,7 @@ public class CatalogueUtil {
      * @return
      */
     public static String concatInfo(String infoStr, String content) {
-        if (StringUtil.isBlank(infoStr)) {
+        if (StringUtil2B.isBlank(infoStr)) {
             infoStr += content;
         } else {
             if (!infoStr.contains(content)) {
@@ -359,7 +359,7 @@ public class CatalogueUtil {
 
     public static Set<String> getRegexWords(String word, String regex) {
         Set<String> ret = new HashSet<>();
-        if (StringUtil.isNotBlank(word) && StringUtil.isNotBlank(regex)) {
+        if (StringUtil2B.isNotBlank(word) && StringUtil2B.isNotBlank(regex)) {
             Pattern pattern = Pattern.compile(regex);
             Matcher matcher = pattern.matcher(word);
             if (matcher.find()) {

src/main/java/com/diagbot/util/CoreUtil.java

@@ -64,7 +64,7 @@ public class CoreUtil {
         for (T t : list) {
             try {
                 String val = (String) getFieldValue(t, propertyName);
-                if (StringUtil.isNotBlank(val)) {
+                if (StringUtil2B.isNotBlank(val)) {
                     res.add(val);
                 }
             } catch (Exception e) {
@@ -200,7 +200,7 @@ public class CoreUtil {
                 standField.setAccessible(true);
                 if ("uniqueName".equals(standName)) {
                     String uniqueName = (String) standField.get(object);
-                    if (StringUtil.isBlank(uniqueName)) {
+                    if (StringUtil2B.isBlank(uniqueName)) {
                         standField.set(object, value.get(key));
                     }
                 } else {
@@ -267,7 +267,7 @@ public class CoreUtil {
     public static <T> void setUninameFromDetail(List<T> list, String targetProperty) {
         for (T r : list) {
             String value = (String) getFieldValue(r, "uniqueName");
-            if (StringUtil.isBlank(value)) {
+            if (StringUtil2B.isBlank(value)) {
                 String detailName = (String) getFieldValue(r, targetProperty);
                 ReflectUtil.setProperty(r, "uniqueName", detailName);
             }
@@ -351,7 +351,7 @@ public class CoreUtil {
         }
         String uniqueName = lis.getUniqueName();
         // 标准名称相同
-        if (StringUtil.isNotBlank(uniqueName) && uniqueName.equals(ruleBaseDTO.getBaseLibName())) {
+        if (StringUtil2B.isNotBlank(uniqueName) && uniqueName.equals(ruleBaseDTO.getBaseLibName())) {
             int dateFlag = CoreUtil.compareTime(date, lis.getDateValue(), minute, false, false);
             if (dateFlag == 1) {
                 // 存在有效化验
@@ -377,18 +377,18 @@ public class CoreUtil {
         String content = ""; // 最终提示语
         String uniqueName = lis.getUniqueName();
         // 标准名称相同
-        if (StringUtil.isNotBlank(uniqueName) && uniqueName.equals(ruleBaseDTO.getBaseLibName())) {
+        if (StringUtil2B.isNotBlank(uniqueName) && uniqueName.equals(ruleBaseDTO.getBaseLibName())) {
             // 套餐和明细名称一样，优化提示语只取细项
-            if (StringUtil.isNotBlank(lis.getName()) && lis.getName().equals(lis.getDetailName())) {
+            if (StringUtil2B.isNotBlank(lis.getName()) && lis.getName().equals(lis.getDetailName())) {
                 unionName = lis.getDetailName(); // 取细项
             } else {
                 unionName = lis.getName() + lis.getDetailName(); // 套餐+细项
             }
-            if (StringUtil.isNotBlank(lis.getOtherValue())) {
+            if (StringUtil2B.isNotBlank(lis.getOtherValue())) {
                 // 文本比较
                 if (lis.getOtherValue().equals(ruleBaseDTO.getBaseEqValue())) {
                     // 有医院原值就提示医院值
-                    if (StringUtil.isNotBlank(lis.getResult())) {
+                    if (StringUtil2B.isNotBlank(lis.getResult())) {
                         content = unionName + "结果" + lis.getResult();
                     } else {
                         content = unionName + "结果" + lis.getOtherValue();
@@ -403,7 +403,7 @@ public class CoreUtil {
                     // 获取化验单位拼接，默认会返回空字符串
                     String unitsJoint = getJointUnits(lis);
                     // 有医院原值就提示医院值，例如: 医院result字段: >10,技术服务部会将value设置成10.1，但提示语还是>10
-                    if (StringUtil.isNotBlank(lis.getResult())) {
+                    if (StringUtil2B.isNotBlank(lis.getResult())) {
                         content = unionName + "结果" + lis.getResult() + unitsJoint;
                     } else {
                         content = unionName + "结果" + subZeroAndDot(String.valueOf(lis.getValue())) + unitsJoint;
@@ -429,7 +429,7 @@ public class CoreUtil {
      */
     public static String getJointUnits(Lis lis) {
         String unitsJoint = "";
-        if (lis == null || StringUtil.isBlank(lis.getUnits())) {
+        if (lis == null || StringUtil2B.isBlank(lis.getUnits())) {
             return unitsJoint;
         }
         // 单位以数字开头，拼接“×”
@@ -450,7 +450,7 @@ public class CoreUtil {
      */
     public static String getJointUnits(PD pd) {
         String unitsJoint = "";
-        if (pd == null || StringUtil.isBlank(pd.getUnit())) {
+        if (pd == null || StringUtil2B.isBlank(pd.getUnit())) {
             return unitsJoint;
         }
         boolean flag = RegexUtil.getRegexRes(pd.getUnit(), "^\\d");
@@ -497,7 +497,7 @@ public class CoreUtil {
                 String unitsJoint = "";
                 // String unitsJoint = getJointUnits(vital.getPd()); // 获取查体单位拼接，单位容易提取错乱，先注释
                 if (ruleBaseDTO.getBaseLibName().equals(vital.getStandName()) && vital.getPd() != null
-                        && StringUtil.isNotBlank(vital.getPd().getValue())) {
+                        && StringUtil2B.isNotBlank(vital.getPd().getValue())) {
                     if (CoreUtil.isNumbers(vital.getPd().getValue())) {
                         flag = compareNum(ruleBaseDTO, Double.parseDouble(vital.getPd().getValue()));
                         if (flag) {
@@ -565,7 +565,7 @@ public class CoreUtil {
             for (Vital vital : vitalList) {
                 List<Usual> usualList = vital.getUsualList();
                 if (ruleBaseDTO.getBaseLibName().equals(vital.getStandName()) && vital.getPd() != null
-                        && StringUtil.isNotBlank(vital.getPd().getValue())) {
+                        && StringUtil2B.isNotBlank(vital.getPd().getValue())) {
                     flag = compareNum(ruleBaseDTO, Double.parseDouble(vital.getPd().getValue()));
                     if (flag) {
                         msgList.add(vital.getName() + subZeroAndDot(String.valueOf(vital.getPd().getValue())));
@@ -602,7 +602,7 @@ public class CoreUtil {
         // 辅助检查描述
         for (PacsNum pacsNum : pacsNumList) {
             if (ruleBaseDTO.getBaseLibName().equals(pacsNum.getStandName()) && pacsNum.getPd() != null
-                    && StringUtil.isNotBlank(pacsNum.getPd().getValue())) {
+                    && StringUtil2B.isNotBlank(pacsNum.getPd().getValue())) {
                 boolean flag = compareNum(ruleBaseDTO, Double.parseDouble(pacsNum.getPd().getValue()));
                 if (flag) {
                     MatchDTO matchDTO = new MatchDTO();
@@ -628,10 +628,10 @@ public class CoreUtil {
         Double min = null;
         Double max = null;
         boolean minFlag = false, maxFlag = false;
-        if (StringUtil.isNotBlank(ruleBaseDTO.getBaseMinValue())) {
+        if (StringUtil2B.isNotBlank(ruleBaseDTO.getBaseMinValue())) {
             min = Double.parseDouble(ruleBaseDTO.getBaseMinValue());
         }
-        if (StringUtil.isNotBlank(ruleBaseDTO.getBaseMaxValue())) {
+        if (StringUtil2B.isNotBlank(ruleBaseDTO.getBaseMaxValue())) {
             max = Double.parseDouble(ruleBaseDTO.getBaseMaxValue());
         }
 
@@ -737,7 +737,7 @@ public class CoreUtil {
         if (lis == null) {
             return "";
         }
-        return StringUtil.isNotBlank(lis.getOtherValue()) ? lis.getOtherValue() : subZeroAndDot(lis.getValue().toString());
+        return StringUtil2B.isNotBlank(lis.getOtherValue()) ? lis.getOtherValue() : subZeroAndDot(lis.getValue().toString());
     }
 
     /**
@@ -794,7 +794,7 @@ public class CoreUtil {
      * @return
      */
     public static Boolean compareName(RuleBaseDTO ruleBaseDTO, String input) {
-        if (StringUtil.isBlank(input) || ruleBaseDTO == null || StringUtil.isBlank(ruleBaseDTO.getBaseLibName())) {
+        if (StringUtil2B.isBlank(input) || ruleBaseDTO == null || StringUtil2B.isBlank(ruleBaseDTO.getBaseLibName())) {
             return false;
         }
         if (input.equals(ruleBaseDTO.getBaseLibName())) {
@@ -811,7 +811,7 @@ public class CoreUtil {
      * @return
      */
     public static Boolean compareNameMulti(RuleBaseDTO ruleBaseDTO, String input) {
-        if (StringUtil.isBlank(input) || ruleBaseDTO == null || StringUtil.isBlank(ruleBaseDTO.getBaseLibName())) {
+        if (StringUtil2B.isBlank(input) || ruleBaseDTO == null || StringUtil2B.isBlank(ruleBaseDTO.getBaseLibName())) {
             return false;
         }
         // 多个名称用分隔符隔开，只需要满足一个即可
@@ -885,7 +885,7 @@ public class CoreUtil {
     public static String getMapMsg(Map map) {
         if (map != null && map.get("flag") != null && (Boolean) map.get("flag") == true) {
             String msg = (String) map.get("msg");
-            if (StringUtil.isNotBlank(msg)) {
+            if (StringUtil2B.isNotBlank(msg)) {
                 return msg;
             }
         }
@@ -954,7 +954,7 @@ public class CoreUtil {
             return new ArrayList<>();
         }
         return list.stream()
-                .filter(r -> StringUtil.isBlank((String) getFieldValue(r, "uniqueName")))
+                .filter(r -> StringUtil2B.isBlank((String) getFieldValue(r, "uniqueName")))
                 .map(r -> (String) getFieldValue(r, targetProperty))
                 .collect(Collectors.toList());
     }
@@ -971,7 +971,7 @@ public class CoreUtil {
             return new ArrayList<>();
         }
         return list.stream()
-                .filter(r -> StringUtil.isNotBlank((String) getFieldValue(r, "name")))
+                .filter(r -> StringUtil2B.isNotBlank((String) getFieldValue(r, "name")))
                 .map(r -> (String) getFieldValue(r, "name"))
                 .collect(Collectors.toList());
     }
@@ -991,11 +991,11 @@ public class CoreUtil {
         for (T t : list) {
             // 症状需要提取名称
             String name = (String) getFieldValue(t, "name");
-            if (StringUtil.isNotBlank(name)) {
+            if (StringUtil2B.isNotBlank(name)) {
                 res.add(name);
             }
             BodyPart bodyPart = (BodyPart) getFieldValue(t, "bodyPart");
-            if (bodyPart != null && StringUtil.isNotBlank(bodyPart.getName())) {
+            if (bodyPart != null && StringUtil2B.isNotBlank(bodyPart.getName())) {
                 res.add(bodyPart.getName() + name);
             }
         }
@@ -1017,17 +1017,17 @@ public class CoreUtil {
         for (T t : list) {
             // 刨去体温，脉搏，数值类型的体征数据
             PD pd = (PD) getFieldValue(t, "pd");
-            if (pd == null || (pd != null && StringUtil.isNotBlank(pd.getUnit()))) {
+            if (pd == null || (pd != null && StringUtil2B.isNotBlank(pd.getUnit()))) {
                 continue;
             }
             String name = (String) getFieldValue(t, "name");
             // 查体拼接结果
-            if (StringUtil.isNotBlank(pd.getName())) {
+            if (StringUtil2B.isNotBlank(pd.getName())) {
                 // 查体结果
                 res.add(name + pd.getName());
                 // 查体部位 + 查体结果
                 BodyPart bodyPart = (BodyPart) getFieldValue(t, "bodyPart");
-                if (bodyPart != null && StringUtil.isNotBlank(bodyPart.getName())) {
+                if (bodyPart != null && StringUtil2B.isNotBlank(bodyPart.getName())) {
                     res.add(bodyPart.getName() + name + pd.getName());
                 }
             }
@@ -1047,7 +1047,7 @@ public class CoreUtil {
             return new ArrayList<>();
         }
         return list.stream()
-                .filter(r -> StringUtil.isBlank((String) getFieldValue(r, "uniqueName")))
+                .filter(r -> StringUtil2B.isBlank((String) getFieldValue(r, "uniqueName")))
                 .map(r -> (String) getFieldValue(r, "name"))
                 .collect(Collectors.toList());
     }
@@ -1059,11 +1059,11 @@ public class CoreUtil {
                 String value1 = (String) CoreUtil.getFieldValue(v, field1);
                 String value2 = (String) CoreUtil.getFieldValue(v, field2);
                 String unionKey = "";
-                if (StringUtil.isNotBlank(value1)) {
+                if (StringUtil2B.isNotBlank(value1)) {
                     unionKey += value1;
                 }
                 unionKey += CommonEnum.splitSymbol.getName();
-                if (StringUtil.isNotBlank(value2)) {
+                if (StringUtil2B.isNotBlank(value2)) {
                     unionKey += value2;
                 }
                 List<V> groupList = (List<V>) map.get(unionKey);
@@ -1084,7 +1084,7 @@ public class CoreUtil {
      * @param s
      */
     public static void addSplitString(List<Long> list, String s) {
-        if (StringUtil.isBlank(s)) {
+        if (StringUtil2B.isBlank(s)) {
             return;
         }
         list.addAll(Arrays.stream(s.split(",")).map(r -> Long.parseLong(r)).collect(Collectors.toList()));
@@ -1125,7 +1125,7 @@ public class CoreUtil {
             for (String key : propertyName) {
                 String name = (String) getFieldValue(t, key);
                 // 去重
-                if (StringUtil.isNotBlank(name) && !list.contains(name)) {
+                if (StringUtil2B.isNotBlank(name) && !list.contains(name)) {
                     list.add(name);
                 }
             }
@@ -1189,7 +1189,7 @@ public class CoreUtil {
                 Negative val = (Negative) CoreUtil.getFieldValue(d, filterProperty);
                 if (val != null) {
                     String name = (String) CoreUtil.getFieldValue(d, propertyName);
-                    if (StringUtil.isNotBlank(name)) {
+                    if (StringUtil2B.isNotBlank(name)) {
                         res.add(name);
                     }
                 }
@@ -1217,7 +1217,7 @@ public class CoreUtil {
      * @return
      */
     public static List<String> getSplit(String name, String splitSymbol) {
-        if (StringUtil.isBlank(name)) {
+        if (StringUtil2B.isBlank(name)) {
             return Lists.newArrayList();
         }
         return Lists.newArrayList(name.split(splitSymbol));
@@ -1235,7 +1235,7 @@ public class CoreUtil {
      */
     public static int compareTime(String startDateStr, String endDateStr, Long minute, boolean hasEqual, boolean abs) {
         int flag = -1;
-        if (StringUtil.isBlank(startDateStr) || StringUtil.isBlank(endDateStr)) {
+        if (StringUtil2B.isBlank(startDateStr) || StringUtil2B.isBlank(endDateStr)) {
             return flag;
         }
         try {
@@ -1279,7 +1279,7 @@ public class CoreUtil {
      */
     public static int compareTime(String startDateStr, String endDateStr) {
         int flag = -1;
-        if (StringUtil.isBlank(startDateStr) || StringUtil.isBlank(endDateStr)) {
+        if (StringUtil2B.isBlank(startDateStr) || StringUtil2B.isBlank(endDateStr)) {
             return flag;
         }
         try {

src/main/java/com/diagbot/util/ExcelUtils.java

@@ -88,7 +88,7 @@ public class ExcelUtils {
     public static void exportExcel(List<?> list, String title, String sheetName, Class<?> pojoClass, String fileName,
                                    HttpServletResponse response, float height) {
         Boolean havTitle = false;
-        if (StringUtil.isNotBlank(title)) {
+        if (StringUtil2B.isNotBlank(title)) {
             havTitle = true;
         }
         userExport2(list, pojoClass, fileName, response, new ExportParams(title, sheetName), height, havTitle);

src/main/java/com/diagbot/util/ExtUtil.java

@@ -156,7 +156,7 @@ public class ExtUtil {
             return;
         }
         // value可以用来过滤字符串列表
-        if (StringUtil.isBlank(field)) {
+        if (StringUtil2B.isBlank(field)) {
             field = "value";
         }
         List<Object> filterObj = Lists.newArrayList();// 过滤集
@@ -189,7 +189,7 @@ public class ExtUtil {
         if (ListUtil.isEmpty(orginList) || ListUtil.isEmpty(filterList)) {
             return;
         }
-        if (StringUtil.isBlank(field)) {
+        if (StringUtil2B.isBlank(field)) {
             field = "value";
         }
         Object obj = null;
@@ -217,7 +217,7 @@ public class ExtUtil {
      * @return
      */
     public static List<Long> convLongList(String s, String split) {
-        if (StringUtil.isBlank(s)) {
+        if (StringUtil2B.isBlank(s)) {
             return Lists.newArrayList();
         }
         return Arrays.stream(s.split(split)).map(r -> Long.valueOf(r)).collect(Collectors.toList());
@@ -231,7 +231,7 @@ public class ExtUtil {
      * @return
      */
     public static List<Integer> convIntegerList(String s, String splitSymbol) {
-        if (StringUtil.isBlank(s)) {
+        if (StringUtil2B.isBlank(s)) {
             return Lists.newArrayList();
         }
         return Arrays.stream(s.split(splitSymbol)).map(r -> Integer.valueOf(r)).collect(Collectors.toList());

src/main/java/com/diagbot/util/MsgNewUtil.java

@@ -45,13 +45,13 @@ public class MsgNewUtil {
         String unionMsg = ruleSimpleDTO.getMsg(); // 原因及建议
         String structName = ruleSimpleDTO.getStructName(); // 项目名称
         String msg = redisUtil.getByKeyAndField(RedisEnum.msg.getName(), orderType + "_" + conType);
-        if (StringUtil.isBlank(msg)) {
+        if (StringUtil2B.isBlank(msg)) {
             // msg = redisUtil.getByKeyAndField(RedisEnum.msg.getName(), "通用" + "_" + "默认提示语");
             msg = "";
         }
         BillMsg billMsg = new BillMsg();
         // 出现2个“具有”，去除一个为空
-        if (ConEnum.medEqu.getName().equals(conType) && StringUtil.isNotBlank(content)
+        if (ConEnum.medEqu.getName().equals(conType) && StringUtil2B.isNotBlank(content)
                 && content.startsWith("具有") && msg.startsWith("该患者具有")) {
             msg = msg.replace("具有", "");
         }
@@ -61,7 +61,7 @@ public class MsgNewUtil {
         } else {
             msg = msg.replace("[给药途径]", "");
         }
-        if (StringUtil.isNotBlank(unionMsg)) {
+        if (StringUtil2B.isNotBlank(unionMsg)) {
             msg = msg.replace("[原因及建议]", "，" + unionMsg);
         } else {
             msg = msg.replace("[原因及建议]", "");
@@ -106,10 +106,10 @@ public class MsgNewUtil {
         switch (TypeEnum.getEnum(otherType)) {
             case lis: // 其他值提醒——化验
                 msg = redisUtil.getByKeyAndField(RedisEnum.otherMsg.getName(), otherType + "_" + type);
-                if (StringUtil.isBlank(msg)) { // 防止报空指针
+                if (StringUtil2B.isBlank(msg)) { // 防止报空指针
                     return null;
                 }
-                if (StringUtil.isNotBlank(suggestMsg)) {
+                if (StringUtil2B.isNotBlank(suggestMsg)) {
                     msg = msg.replace("[原因及建议]", "，" + suggestMsg);
                 } else {
                     msg = msg.replace("[原因及建议]", "");
@@ -142,11 +142,11 @@ public class MsgNewUtil {
      */
     public BillMsg getOtherPacsMsg(String mainMsg, String templateType, String suggestMsg) {
         String msg = redisUtil.getByKeyAndField(RedisEnum.otherMsg.getName(), TypeEnum.pacs.getName() + "_" + templateType);
-        if (StringUtil.isBlank(msg)) { // 防止报空指针
+        if (StringUtil2B.isBlank(msg)) { // 防止报空指针
             return null;
         }
         BillMsg billMsg = new BillMsg();
-        if (StringUtil.isNotBlank(suggestMsg)) {
+        if (StringUtil2B.isNotBlank(suggestMsg)) {
             msg = msg.replace("[原因及建议]", "，" + suggestMsg);
         } else {
             msg = msg.replace("[原因及建议]", "");
@@ -175,10 +175,10 @@ public class MsgNewUtil {
         switch (TypeEnum.getEnum(type)) {
             case lis: // 危急值提醒——化验
                 msg = redisUtil.getByKeyAndField(RedisEnum.criticalMsg.getName(), type + "_" + conditionType);
-                if (StringUtil.isBlank(msg)) { // 防止报空指针
+                if (StringUtil2B.isBlank(msg)) { // 防止报空指针
                     return null;
                 }
-                if (StringUtil.isNotBlank(suggestMsg)) {
+                if (StringUtil2B.isNotBlank(suggestMsg)) {
                     msg = msg.replace("[原因及建议]", "，" + suggestMsg);
                 } else {
                     msg = msg.replace("[原因及建议]", "");
@@ -205,17 +205,17 @@ public class MsgNewUtil {
      * @return
      */
     public String replacePlaceholder(String msg, String placeholder, String replaceStr) {
-        if (StringUtil.isBlank(msg)) {
+        if (StringUtil2B.isBlank(msg)) {
             return null;
         }
-        if (StringUtil.isBlank(placeholder)) {
+        if (StringUtil2B.isBlank(placeholder)) {
             return msg;
         }
         if (msg.contains(placeholder)) {
             String prefixAndSuffix = placeholderMap.get(placeholder); // 前后缀，中间用#分隔
             String prefix = ""; // 前缀
             String suffix = ""; // 后缀
-            if (StringUtil.isNotBlank(prefixAndSuffix)) {
+            if (StringUtil2B.isNotBlank(prefixAndSuffix)) {
                 String[] split = prefixAndSuffix.split(CommonEnum.splitSymbol.getName());
                 prefix = split[0];
                 if (split.length == 2) {
@@ -225,11 +225,11 @@ public class MsgNewUtil {
                 }
             }
             // 拼接前缀
-            if (StringUtil.isNotBlank(prefix)) {
+            if (StringUtil2B.isNotBlank(prefix)) {
                 replaceStr = prefix + replaceStr;
             }
             // 拼接后缀
-            if (StringUtil.isNotBlank(suffix)) {
+            if (StringUtil2B.isNotBlank(suffix)) {
                 replaceStr = replaceStr + suffix;
             }
             // 后缀后面默认添加标点符号

src/main/java/com/diagbot/util/MsgUtil.java

@@ -23,7 +23,7 @@ public class MsgUtil {
         BillMsg billMsg = new BillMsg();
         String msg = "";
         if (TypeEnum.operation.getName().equals(type)) {
-            if (StringUtil.isBlank(content)) {
+            if (StringUtil2B.isBlank(content)) {
                 // 本身高危手术
                 msg = String.format("%s为高风险手术，请留意", name);
             } else {

src/main/java/com/diagbot/util/NeoUtil.java

@@ -32,7 +32,7 @@ public class NeoUtil {
 
     public static BigDecimal StringtoBigDecimal(String val) {
         BigDecimal bd = null;
-        if (StringUtil.isNotBlank(val)) {
+        if (StringUtil2B.isNotBlank(val)) {
             bd = new BigDecimal(val);
         }
 

src/main/java/com/diagbot/util/ParamUtil.java

@@ -26,7 +26,7 @@ public class ParamUtil {
         for (Lis lis : list) {
             String otherValue = lis.getOtherValue();
             Double value = lis.getValue();
-            if (StringUtil.isNotBlank(otherValue)) {
+            if (StringUtil2B.isNotBlank(otherValue)) {
                 switch (otherValue) {
                     case "阳性":
                     case "阴性":
@@ -83,7 +83,7 @@ public class ParamUtil {
         }
         for (Lis lis : list) {
             String otherValue = lis.getOtherValue();
-            if (StringUtil.isNotBlank(otherValue)) {
+            if (StringUtil2B.isNotBlank(otherValue)) {
                 switch (otherValue) {
                     case "+":
                     case "++":

src/main/java/com/diagbot/util/ReflectUtil.java

@@ -31,7 +31,7 @@ public class ReflectUtil {
                 V val = getProperty(t, propertyName);
                 if (val != null) {
                     // 字符串类型不为空判断
-                    if (StringUtil.isNotBlank(String.valueOf(val))) {
+                    if (StringUtil2B.isNotBlank(String.valueOf(val))) {
                         res.add(val);
                     }
                 }
@@ -122,10 +122,10 @@ public class ReflectUtil {
             tList.sort((a, b) -> {
                 String v1 = getProperty(a, property);
                 String v2 = getProperty(b, property);
-                if (StringUtil.isBlank(v1)) {
+                if (StringUtil2B.isBlank(v1)) {
                     return -1;
                 }
-                if (StringUtil.isBlank(v2)) {
+                if (StringUtil2B.isBlank(v2)) {
                     return 1;
                 }
                 return v1.compareTo(v2);

src/main/java/com/diagbot/util/RegexUtil.java

@@ -56,7 +56,7 @@ public class RegexUtil {
     private static Boolean getRegexResCommon(String content, String regex, Boolean sensitive) {
         // 是否有符合的数据
         try {
-            if (StringUtil.isBlank(content) || StringUtil.isBlank(regex)) {
+            if (StringUtil2B.isBlank(content) || StringUtil2B.isBlank(regex)) {
                 return false;
             }
             Pattern pattern = getPattern(regex, sensitive);
@@ -122,7 +122,7 @@ public class RegexUtil {
     private static String getRegexDataCommon(String content, String regex, Integer groupNum, Boolean sensitive) {
         // 获取符合的数据
         try {
-            if (StringUtil.isBlank(content)) {
+            if (StringUtil2B.isBlank(content)) {
                 return "";
             }
             Pattern pattern = getPattern(regex, sensitive);
@@ -170,7 +170,7 @@ public class RegexUtil {
     private static List<String> getRegexDataListCommon(String content, String regex, Boolean sensitive) {
         List<String> list = Lists.newArrayList();
         try {
-            if (StringUtil.isBlank(content)) {
+            if (StringUtil2B.isBlank(content)) {
                 return list;
             }
             Pattern pattern = getPattern(regex, sensitive);
@@ -218,7 +218,7 @@ public class RegexUtil {
     private static List<String> getRegexDataAllCommon(String content, String regex, Boolean sensitive) {
         List<String> list = Lists.newArrayList();
         try {
-            if (StringUtil.isBlank(content)) {
+            if (StringUtil2B.isBlank(content)) {
                 return list;
             }
             Pattern pattern = getPattern(regex, sensitive);
@@ -265,7 +265,7 @@ public class RegexUtil {
     private static List<List<String>> getRegexGroupDataCommon(String content, String regex, Boolean sensitive) {
         List<List<String>> res = Lists.newArrayList();
         try {
-            if (StringUtil.isBlank(content)) {
+            if (StringUtil2B.isBlank(content)) {
                 return res;
             }
             Pattern pattern = getPattern(regex, sensitive);

src/main/java/com/diagbot/util/StringUtil.java

@@ -19,7 +19,7 @@ import java.util.stream.Stream;
  * @author: gaodm
  * @time: 2018/8/6 11:15
  */
-public class StringUtil {
+public class StringUtil2B {
     /**
      * 判断某字符串是否为空或长度为0或由空白符(whitespace) 构成
      *
@@ -112,7 +112,6 @@ public class StringUtil {
      */
     public static boolean containList(List<String> A, List<String> B) {
         boolean res = true;
-
         try {
             for (String item : B) {
                 if (!A.contains(item)) {
@@ -122,9 +121,8 @@ public class StringUtil {
             }
         } catch (Exception ex) {
             ex.printStackTrace();
-        } finally {
-            return res;
         }
+        return res;
     }
 
     /**
@@ -166,7 +164,7 @@ public class StringUtil {
      * @return
      */
     public static String specialCharComma(String content) {
-        if (StringUtil.isNotBlank(content)) {
+        if (StringUtil2B.isNotBlank(content)) {
             content = content.replaceAll("(\\d+)|[、，。.；;？?]", " ").replaceAll("(\\s+)", ",");
             if (content.indexOf(",") == 0) {
                 content = content.substring(1);
@@ -246,9 +244,9 @@ public class StringUtil {
             }
         } catch (ParseException ex) {
             ex.printStackTrace();
-        } finally {
-            return date;
         }
+        return date;
+        
     }
 
     /**
@@ -314,13 +312,13 @@ public class StringUtil {
 
     // 测试主函数
     public static void main(String args[]) {
-        System.out.println(StringUtil.isWord("  "));
-        System.out.println(StringUtil.isWord(""));
-        System.out.println(StringUtil.isWord("高e"));
-        System.out.println(StringUtil.isWord("e e"));
-        System.out.println(StringUtil.isWord("ee"));
-        System.out.println(StringUtil.isWord("   ee   "));
-        System.out.println(StringUtil.isWord("Gao"));
+        System.out.println(StringUtil2B.isWord("  "));
+        System.out.println(StringUtil2B.isWord(""));
+        System.out.println(StringUtil2B.isWord("高e"));
+        System.out.println(StringUtil2B.isWord("e e"));
+        System.out.println(StringUtil2B.isWord("ee"));
+        System.out.println(StringUtil2B.isWord("   ee   "));
+        System.out.println(StringUtil2B.isWord("Gao"));
     }
 
 }

src/main/java/com/diagbot/util/VerifyUtil.java

@@ -22,7 +22,7 @@ public class VerifyUtil {
      * @return 校验结果
      */
     public static boolean verifyCode(String type, String val) {
-        if (StringUtil.isEmpty(type)) {
+        if (StringUtil2B.isEmpty(type)) {
             return false;
         }
 //        String regex = type + "\\.[1-9]\\d?";
@@ -37,7 +37,7 @@ public class VerifyUtil {
 	 * @return
 	 */
 	public static boolean verifyText(String text) {
-    	if (StringUtil.isBlank(text)) {
+    	if (StringUtil2B.isBlank(text)) {
     		return false;
 		}
 		String regex = "任|一|二|三|四|五|六|七|八|九|十|\\[||\\]|\\+|、|\\d|\\.|A|B|C|D|E|F|G|H|I|J|K|L";
@@ -192,7 +192,7 @@ public class VerifyUtil {
 			int i = 0;
 			for (String str : splitCode) {
 				// 如果中间出现空字符串，表明出错了
-				if (StringUtil.isEmpty(str) && i != 0 && i != splitCode.size() - 1) {
+				if (StringUtil2B.isEmpty(str) && i != 0 && i != splitCode.size() - 1) {
 					return errMsg;
 				}
 				i++;
@@ -201,7 +201,7 @@ public class VerifyUtil {
 			// 5、校验公式中的编码值是否全部在编码中
 			List<String> codes = new ArrayList<>();
 			for (String str : splitCode) {
-				if (StringUtil.isNotEmpty(str)) {
+				if (StringUtil2B.isNotEmpty(str)) {
 					codes.add(str);
 				}
 			}
@@ -340,7 +340,7 @@ public class VerifyUtil {
 		String resg1 = "\\(|/|\\)|任一|任二|任三|任四|任五|任六|任七|任八|任九|任十|\\+";
 		String[] arr = s.split(resg1);
 		for(String str : arr) {
-			if (StringUtil.isNotEmpty(str)) {
+			if (StringUtil2B.isNotEmpty(str)) {
 				res.add(str);
 			}
 		}