业委会每日异常详情完成2

whepi-web/src/main/java/com/bofeng/service/RbService.java

@@ -41,57 +41,62 @@ public class RbService {
         if(sysUptownHouses.size() !=0){
             for (int i = 0; i < sysUptownHouses.size(); i++) {
 
-
-                if(sysUptownHouses.get(i).getCough()==0){
+                Integer cough = sysUptownHouses.get(i).getCough();
+                if(cough != null && cough == 0){
                     sysUptownHouses.get(i).setChestStr("无咳嗽");
-                }else if(sysUptownHouses.get(i).getCough()==1){
+                }else if(cough != null && cough ==1){
                     sysUptownHouses.get(i).setChestStr("偶尔短暂咳嗽");
-                }else if(sysUptownHouses.get(i).getCough()==2){
+                }else if(cough != null && cough ==2){
                     sysUptownHouses.get(i).setChestStr("频繁咳嗽轻重");
-                }else if(sysUptownHouses.get(i).getCough()==3){
+                }else if(cough != null && cough ==3){
                     sysUptownHouses.get(i).setChestStr("频繁咳嗽重度");
                 }
-                if(sysUptownHouses.get(i).getMuscle()==0){
+                Integer muscle = sysUptownHouses.get(i).getMuscle();
+                if(muscle != null && muscle==0){
                     sysUptownHouses.get(i).setMuscleStr("无肌肉酸痛");
-                }else if(sysUptownHouses.get(i).getMuscle()==1){
+                }else if(muscle != null && muscle ==1){
                     sysUptownHouses.get(i).setMuscleStr("肌肉酸痛加重");
-                }else if(sysUptownHouses.get(i).getMuscle()==2){
+                }else if(muscle != null && muscle ==2){
                     sysUptownHouses.get(i).setMuscleStr("肌肉酸痛好转");
-                }else if(sysUptownHouses.get(i).getMuscle()==3){
+                }else if(muscle != null && muscle ==3){
                     sysUptownHouses.get(i).setMuscleStr("肌肉酸痛无变化");
                 }
-                if(sysUptownHouses.get(i).getDyspnea()==0){
+                Integer dyspnea = sysUptownHouses.get(i).getDyspnea();
+                if(dyspnea != null && dyspnea ==0){
                     sysUptownHouses.get(i).setDyspneaStr("无呼吸困难");
-                }else if(sysUptownHouses.get(i).getDyspnea()==1){
+                }else if(dyspnea != null && dyspnea ==1){
                     sysUptownHouses.get(i).setDyspneaStr("呼吸困难加重");
-                }else if(sysUptownHouses.get(i).getDyspnea()==2){
+                }else if(dyspnea != null && dyspnea ==2){
                     sysUptownHouses.get(i).setDyspneaStr("呼吸困难好转");
-                }else if(sysUptownHouses.get(i).getDyspnea()==3){
+                }else if(dyspnea != null && dyspnea ==3){
                     sysUptownHouses.get(i).setDyspneaStr("呼吸困难无变化");
-                }else if(sysUptownHouses.get(i).getDyspnea()==4){
+                }else if(dyspnea != null && dyspnea ==4){
                     sysUptownHouses.get(i).setDyspneaStr("呼吸困难严重");
                 }
-                if(sysUptownHouses.get(i).getChest()==0){
+                Integer chest = sysUptownHouses.get(i).getChest();
+                if(chest !=null && chest ==0){
                     sysUptownHouses.get(i).setChestStr("无胸闷");
-                }else if(sysUptownHouses.get(i).getChest()==1){
+                }else if(chest !=null && chest ==1){
                     sysUptownHouses.get(i).setChestStr("端坐呼吸");
-                }else if(sysUptownHouses.get(i).getChest()==2){
+                }else if(chest !=null && chest ==2){
                     sysUptownHouses.get(i).setChestStr("活动无");
-                }else if(sysUptownHouses.get(i).getChest()==3){
+                }else if(chest !=null && chest ==3){
                     sysUptownHouses.get(i).setChestStr("无变化");
                 }
-                if(sysUptownHouses.get(i).getFatigue() == 0){
+                Integer fatigue = sysUptownHouses.get(i).getFatigue();
+                if(fatigue !=null && fatigue == 0){
                     sysUptownHouses.get(i).setFatigueStr("无乏力");
-                }else if(sysUptownHouses.get(i).getFatigue() == 1){
+                }else if(fatigue !=null && fatigue == 1){
                     sysUptownHouses.get(i).setFatigueStr("乏力加重");
-                }else if(sysUptownHouses.get(i).getFatigue() == 2){
+                }else if(fatigue !=null && fatigue == 2){
                     sysUptownHouses.get(i).setFatigueStr("乏力好转");
-                }else if(sysUptownHouses.get(i).getFatigue() == 3){
+                }else if(fatigue !=null && fatigue == 3){
                     sysUptownHouses.get(i).setFatigueStr("乏力无变化");
                 }
-                if(sysUptownHouses.get(i).getDiarrhea() == 0){
+                Integer diarrhea = sysUptownHouses.get(i).getDiarrhea();
+                if(diarrhea !=null && diarrhea == 0){
                     sysUptownHouses.get(i).setDiarrheaStr("无腹泻");
-                }else if(sysUptownHouses.get(i).getDiarrhea() == 1){
+                }else if(diarrhea !=null && diarrhea == 1){
                     sysUptownHouses.get(i).setDiarrheaStr("有腹泻");
                 }
                 sysUptownHouses.get(i).setZhengzhuang(sysUptownHouses.get(i).getChestStr()+","+sysUptownHouses.get(i).getMuscleStr()+","+sysUptownHouses.get(i).getDyspneaStr()