业委会每日异常详情隔离人数2/7

whepi-ui/templates/yeweihui/ribaoXq.ftl

@@ -24,6 +24,7 @@
                             <tr>
                                 <td style="background-color: lightgrey" align="center">今日居家</td>
                                 <td style="background-color: lightgrey" align="center">确诊入院</td>
+                                <td style="background-color: lightgrey" align="center">隔离人数</td>
                                 <td style="background-color: lightgrey" align="center">异常观察</td>
                                 <td style="background-color: lightgrey" align="center">身体正常</td>
                             </tr>
@@ -86,12 +87,14 @@
                         $("#msh3").text(v.ridgepole+"栋"+v.unit+"单元"+v.doorplate+"室");
                         var t1 = $('<td align="center">'+v.safetyNum+'</td>');
                         var t2 = $('<td align="center">'+v.sureNum+'</td>');
-                        var t3 = $('<td align="center">'+v.suspectedNum+'</td>');
-                        var t4 = $('<td align="center">'+v.normalNum+'</td>');
+                        var t3 = $('<td align="center">'+v.sureNum+'</td>');//隔离
+                        var t4 = $('<td align="center">'+v.suspectedNum+'</td>');
+                        var t5 = $('<td align="center">'+v.normalNum+'</td>');
                         $("#zc").append(t1);
                         $("#zc").append(t2);
                         $("#zc").append(t3);
                         $("#zc").append(t4);
+                        $("#zc").append(t5);
                     }
 
                     var tr = $("<tr></tr>");

whepi-web/src/main/java/com/bofeng/dao/RbMapper.java

@@ -33,7 +33,7 @@ public interface RbMapper extends BaseMapper<sysUptownUnit> {
 
     @Select("select a.normal_num as normalNum,e.ridgepole as ridgepole,e.unit as unit,b.doorplate as doorplate,a.safety_num as safetyNum,a.sure_num as sureNum,a.suspected_num as suspectedNum," +
             "c.user_name as userName,c.cough as cough,c.muscle as muscle,c.dyspnea as dyspnea," +
-            "c.chest as chest,c.fatigue as fatigue,c.diarrhea as diarrhea,c.others as others " +
+            "c.chest as chest,c.fatigue as fatigue,c.diarrhea as diarrhea,c.others as others,c.single_room as singleRoom " +
             "from ms_report a " +
             "inner join sys_uptown_house b on b.house_id = a.house_id " +
             "inner join sys_uptown_unit e on e.unit_id = b.unit_id " +

whepi-web/src/main/java/com/bofeng/entity/MsSuspected.java

@@ -127,4 +127,10 @@ public class MsSuspected {
 
     @TableField(exist = false)
     private String doorplate;
+
+    @TableField("single_room")
+    private Integer singleRoom;
+
+    @TableField("single_room")
+    private String singleRoomStr;
 }

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

@@ -47,60 +47,61 @@ public class RbService {
                 }else if(cough != null && cough ==1){
                     sysUptownHouses.get(i).setChestStr("偶尔短暂咳嗽");
                 }else if(cough != null && cough ==2){
-                    sysUptownHouses.get(i).setChestStr("频繁咳嗽轻重");
+                    sysUptownHouses.get(i).setChestStr("咳嗽轻度影响生活");
                 }else if(cough != null && cough ==3){
-                    sysUptownHouses.get(i).setChestStr("频繁咳嗽重度");
+                    sysUptownHouses.get(i).setChestStr("咳嗽严重影响生活");
                 }
                 Integer muscle = sysUptownHouses.get(i).getMuscle();
                 if(muscle != null && muscle==0){
                     sysUptownHouses.get(i).setMuscleStr("无肌肉酸痛");
                 }else if(muscle != null && muscle ==1){
-                    sysUptownHouses.get(i).setMuscleStr("肌肉酸痛加重");
+                    sysUptownHouses.get(i).setMuscleStr("肌肉按压有酸痛");
                 }else if(muscle != null && muscle ==2){
-                    sysUptownHouses.get(i).setMuscleStr("肌肉酸痛好转");
+                    sysUptownHouses.get(i).setMuscleStr("偶尔肌肉按压酸痛");
                 }else if(muscle != null && muscle ==3){
-                    sysUptownHouses.get(i).setMuscleStr("肌肉酸痛无变化");
+                    sysUptownHouses.get(i).setMuscleStr("肌肉按压持续酸痛");
                 }
                 Integer dyspnea = sysUptownHouses.get(i).getDyspnea();
                 if(dyspnea != null && dyspnea ==0){
                     sysUptownHouses.get(i).setDyspneaStr("无呼吸困难");
                 }else if(dyspnea != null && dyspnea ==1){
-                    sysUptownHouses.get(i).setDyspneaStr("呼吸困难加重");
+                    sysUptownHouses.get(i).setDyspneaStr("呼吸急走或上坡气短");
                 }else if(dyspnea != null && dyspnea ==2){
-                    sysUptownHouses.get(i).setDyspneaStr("呼吸困难好转");
+                    sysUptownHouses.get(i).setDyspneaStr("呼吸气短而走路变慢");
                 }else if(dyspnea != null && dyspnea ==3){
-                    sysUptownHouses.get(i).setDyspneaStr("呼吸困难无变化");
+                    sysUptownHouses.get(i).setDyspneaStr("呼吸走路数分钟后气短");
                 }else if(dyspnea != null && dyspnea ==4){
-                    sysUptownHouses.get(i).setDyspneaStr("呼吸困难严重");
-                }
-                Integer chest = sysUptownHouses.get(i).getChest();
-                if(chest !=null && chest ==0){
-                    sysUptownHouses.get(i).setChestStr("无胸闷");
-                }else if(chest !=null && chest ==1){
-                    sysUptownHouses.get(i).setChestStr("端坐呼吸");
-                }else if(chest !=null && chest ==2){
-                    sysUptownHouses.get(i).setChestStr("活动无");
-                }else if(chest !=null && chest ==3){
-                    sysUptownHouses.get(i).setChestStr("无变化");
+                    sysUptownHouses.get(i).setDyspneaStr("呼吸气短无法离开房间");
                 }
                 Integer fatigue = sysUptownHouses.get(i).getFatigue();
                 if(fatigue !=null && fatigue == 0){
                     sysUptownHouses.get(i).setFatigueStr("无乏力");
                 }else if(fatigue !=null && fatigue == 1){
-                    sysUptownHouses.get(i).setFatigueStr("乏力加重");
+                    sysUptownHouses.get(i).setFatigueStr("可体力劳动但觉得累");
                 }else if(fatigue !=null && fatigue == 2){
-                    sysUptownHouses.get(i).setFatigueStr("乏力好转");
+                    sysUptownHouses.get(i).setFatigueStr("轻体力劳动后长时间不能恢复");
                 }else if(fatigue !=null && fatigue == 3){
-                    sysUptownHouses.get(i).setFatigueStr("乏力无变化");
+                    sysUptownHouses.get(i).setFatigueStr("不能正常生活");
                 }
                 Integer diarrhea = sysUptownHouses.get(i).getDiarrhea();
                 if(diarrhea !=null && diarrhea == 0){
                     sysUptownHouses.get(i).setDiarrheaStr("无腹泻");
                 }else if(diarrhea !=null && diarrhea == 1){
-                    sysUptownHouses.get(i).setDiarrheaStr("有腹泻");
+                    sysUptownHouses.get(i).setDiarrheaStr("轻度腹泻少于于3次");
+                }else if(diarrhea !=null && diarrhea == 2){
+                    sysUptownHouses.get(i).setDiarrheaStr("中度腹泻4-6次");
+                }else if(diarrhea !=null && diarrhea == 3){
+                    sysUptownHouses.get(i).setDiarrheaStr("重度腹泻超过6次");
+                }
+                Integer singleRoom = sysUptownHouses.get(i).getSingleRoom();
+                if(singleRoom != null && singleRoom ==0 ){
+                    sysUptownHouses.get(i).setSingleRoomStr("没有单间隔离");
+                }else if(singleRoom != null && singleRoom == 1){
+                    sysUptownHouses.get(i).setSingleRoomStr("单间隔离");
                 }
+
                 sysUptownHouses.get(i).setZhengzhuang(sysUptownHouses.get(i).getChestStr()+","+sysUptownHouses.get(i).getMuscleStr()+","+sysUptownHouses.get(i).getDyspneaStr()
-                        +","+sysUptownHouses.get(i).getChestStr()+","+sysUptownHouses.get(i).getFatigueStr()+","+sysUptownHouses.get(i).getDiarrheaStr());
+                        +","+sysUptownHouses.get(i).getFatigueStr()+","+sysUptownHouses.get(i).getDiarrheaStr()+","+sysUptownHouses.get(i).getSingleRoomStr());
             }
         }