Merge remote-tracking branch 'origin/master'

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

@@ -790,7 +790,7 @@ public class TestFacade {
             //年龄
             IndicationPushVO indicationPushVOAge = new IndicationPushVO();
             String ageAll = bean.getAgeAll();
-            if (ageAll != null) {
+            if (StringUtil.isNotBlank(ageAll)) {
                 String[] split = ageAll.split(",");
                 setname(indicationPushVOAge, bean);
                 indicationPushVOAge.setAgeNum(getValueNum(split));
@@ -801,7 +801,7 @@ public class TestFacade {
             }
             //体格
             String physique = bean.getPhysique();
-            if (physique != null) {
+            if (StringUtil.isNotBlank(physique)) {
                 String[] physiqueStrArray = physique.split("，");
                 for (int i = 0; i < physiqueStrArray.length; i++) {
                     String str = physiqueStrArray[i];
@@ -859,54 +859,55 @@ public class TestFacade {
             }
             //化验
             String lisAll = bean.getLisAll();
-            String[] physiquelisAll = lisAll.split("，");
-            for (int i = 0; i < physiquelisAll.length; i++) {
+            if(StringUtil.isNotBlank(lisAll)) {
+                String[] physiquelisAll = lisAll.split("，");
+                for (int i = 0; i < physiquelisAll.length; i++) {
 
-                String str = physiquelisAll[i];
-                if (testLineVO.isGetOne()) {
-                    int sum = getRandomNum(physiquelisAll.length);
-                    str = physiquelisAll[sum];
-                }
-                IndicationPushVO indicationPushVOlisList = new IndicationPushVO();
-                setname(indicationPushVOlisList, bean);
-                List<Lis> lisList = new ArrayList<>();
-                if (str.contains(",")) {
-                    //包含英文逗号
-                    String[] strArray = str.split(",");
-                    if (strArray.length > 2) {
-                        Lis lisBean = new Lis();
-                        lisBean.setUniqueName(strArray[0].trim());
-                        lisBean.setName(strArray[0].trim());
-                        lisBean.setDetailName(strArray[0].trim());
-                        lisBean.setValue(getValue(strArray));
-                        lisList.add(lisBean);
-                        indicationPushVOlisList.setIdNum(bean.getIdNum());
-                        indicationPushVOlisList.setRuleType("3");
-                        indicationPushVOlisList.setMsg("化验" + strArray[0].trim() + "==" + operationNameMsg);
-                        indicationPushVOlisList.setLis(lisList);
-                        indicationPushVOList.add(indicationPushVOlisList);
-                    } else {
-                        Lis lisBean = new Lis();
-                        lisBean.setUniqueName(strArray[0].trim());
-                        lisBean.setName(strArray[0]);
-                        lisBean.setDetailName(strArray[0].trim());
-                        lisBean.setOtherValue(strArray[1].trim());
-                        lisList.add(lisBean);
-                        indicationPushVOlisList.setIdNum(bean.getIdNum());
-                        indicationPushVOlisList.setRuleType("3");
-                        indicationPushVOlisList.setMsg("化验：" + strArray[0].trim() + "==" + operationNameMsg);
-                        indicationPushVOlisList.setLis(lisList);
-                        indicationPushVOList.add(indicationPushVOlisList);
+                    String str = physiquelisAll[i];
+                    if (testLineVO.isGetOne()) {
+                        int sum = getRandomNum(physiquelisAll.length);
+                        str = physiquelisAll[sum];
+                    }
+                    IndicationPushVO indicationPushVOlisList = new IndicationPushVO();
+                    setname(indicationPushVOlisList, bean);
+                    List<Lis> lisList = new ArrayList<>();
+                    if (str.contains(",")) {
+                        //包含英文逗号
+                        String[] strArray = str.split(",");
+                        if (strArray.length > 2) {
+                            Lis lisBean = new Lis();
+                            lisBean.setUniqueName(strArray[0].trim());
+                            lisBean.setName(strArray[0].trim());
+                            lisBean.setDetailName(strArray[0].trim());
+                            lisBean.setValue(getValue(strArray));
+                            lisList.add(lisBean);
+                            indicationPushVOlisList.setIdNum(bean.getIdNum());
+                            indicationPushVOlisList.setRuleType("3");
+                            indicationPushVOlisList.setMsg("化验" + strArray[0].trim() + "==" + operationNameMsg);
+                            indicationPushVOlisList.setLis(lisList);
+                            indicationPushVOList.add(indicationPushVOlisList);
+                        } else {
+                            Lis lisBean = new Lis();
+                            lisBean.setUniqueName(strArray[0].trim());
+                            lisBean.setName(strArray[0]);
+                            lisBean.setDetailName(strArray[0].trim());
+                            lisBean.setOtherValue(strArray[1].trim());
+                            lisList.add(lisBean);
+                            indicationPushVOlisList.setIdNum(bean.getIdNum());
+                            indicationPushVOlisList.setRuleType("3");
+                            indicationPushVOlisList.setMsg("化验：" + strArray[0].trim() + "==" + operationNameMsg);
+                            indicationPushVOlisList.setLis(lisList);
+                            indicationPushVOList.add(indicationPushVOlisList);
+                        }
+                    }
+                    if (testLineVO.isGetOne()) {
+                        break;
                     }
-                }
-                if (testLineVO.isGetOne()) {
-                    break;
                 }
             }
-
             //辅检
             String pacsAll = bean.getPacsAll();
-            if (pacsAll != null) {
+            if (StringUtil.isNotBlank(pacsAll)) {
                 String[] physiquepacsAll = pacsAll.split("，");
                 //indicationPushVO.setSymptom(pacsAll);
 
@@ -938,7 +939,7 @@ public class TestFacade {
             }
             //诊断"腹部CT"
             String disease = bean.getDisease();
-            if (disease != null) {
+            if (StringUtil.isNotBlank(disease)) {
                 String[] physiquedisease = disease.split("，");
 
                 for (int i = 0; i < physiquedisease.length; i++) {