瀏覽代碼

空指针判断

kongwz 4 年之前
父節點
當前提交
6a346d9c6e
共有 1 個文件被更改,包括 39 次插入34 次删除
  1. 39 34
      src/main/java/com/diagbot/facade/CommonFacade.java

+ 39 - 34
src/main/java/com/diagbot/facade/CommonFacade.java

@@ -238,44 +238,49 @@ public class CommonFacade {
         pushVO.setSex(wordCrfDTO.getSex());
         pushVO.setDiaeaseName(diseaseName);
         if (chiefLabel != null) {
-            List<Symptom> cjiefClinicals = chiefLabel.getClinicals().stream().filter(x -> x.getNegative() == null).map(z ->
-            {
-                Symptom symptom = new Symptom();
-                symptom.setName(z.getStandName());
-                return symptom;
-            }).collect(Collectors.toList());
-            if (ListUtil.isNotEmpty(cjiefClinicals)) {
-                ChiefPushVo chiefPushVo = new ChiefPushVo();
-                chiefPushVo.setSymptoms(cjiefClinicals);
-                pushVO.setChiefPushVo(chiefPushVo);
+            if(ListUtil.isNotEmpty(chiefLabel.getClinicals())){
+                List<Symptom> cjiefClinicals = chiefLabel.getClinicals().stream().filter(x -> x.getNegative() == null).map(z ->
+                {
+                    Symptom symptom = new Symptom();
+                    symptom.setName(z.getStandName());
+                    return symptom;
+                }).collect(Collectors.toList());
+                if (ListUtil.isNotEmpty(cjiefClinicals)) {
+                    ChiefPushVo chiefPushVo = new ChiefPushVo();
+                    chiefPushVo.setSymptoms(cjiefClinicals);
+                    pushVO.setChiefPushVo(chiefPushVo);
+                }
             }
         }
         if(presentLabel != null){
             PresentPushVo presentPushVo = new PresentPushVo();
-            List<Symptom> presentClinicals = presentLabel.getClinicals().stream().filter(x -> x.getNegative() == null).map(z ->
-            {
-                Symptom symptom = new Symptom();
-                symptom.setName(z.getStandName());
-                return symptom;
-            }).collect(Collectors.toList());
-            presentPushVo.setSymptoms(presentClinicals);
-
-            List<Diag> presentdiags = presentLabel.getDiags().stream().filter(x -> x.getNegative() == null).map(z ->
-            {
-                Diag diag = new Diag();
-                diag.setName(z.getStandName());
-                return diag;
-            }).collect(Collectors.toList());
-            presentPushVo.setDiags(presentdiags);
-
-            List<Drug> presentdrugs = presentLabel.getMedicines().stream().filter(x -> x.getNegative() == null).map(z ->
-            {
-                Drug drug = new Drug();
-                drug.setName(z.getStandName());
-                return drug;
-            }).collect(Collectors.toList());
-            presentPushVo.setDrugs(presentdrugs);
-
+            if(ListUtil.isNotEmpty(presentLabel.getClinicals())){
+                List<Symptom> presentClinicals = presentLabel.getClinicals().stream().filter(x -> x.getNegative() == null).map(z ->
+                {
+                    Symptom symptom = new Symptom();
+                    symptom.setName(z.getStandName());
+                    return symptom;
+                }).collect(Collectors.toList());
+                presentPushVo.setSymptoms(presentClinicals);
+            }
+            if(ListUtil.isNotEmpty(presentLabel.getDiags())){
+                List<Diag> presentdiags = presentLabel.getDiags().stream().filter(x -> x.getNegative() == null).map(z ->
+                {
+                    Diag diag = new Diag();
+                    diag.setName(z.getStandName());
+                    return diag;
+                }).collect(Collectors.toList());
+                presentPushVo.setDiags(presentdiags);
+            }
+            if(ListUtil.isNotEmpty(presentLabel.getMedicines())){
+                List<Drug> presentdrugs = presentLabel.getMedicines().stream().filter(x -> x.getNegative() == null).map(z ->
+                {
+                    Drug drug = new Drug();
+                    drug.setName(z.getStandName());
+                    return drug;
+                }).collect(Collectors.toList());
+                presentPushVo.setDrugs(presentdrugs);
+            }
             pushVO.setPresentPushVo(presentPushVo);
         }
         if(ListUtil.isNotEmpty(lis)){