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

whepi-ui/templates/yeweihui/ribaoXq.ftl

@@ -87,7 +87,7 @@
                         $("#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.sureNum+'</td>');//隔离
+                        var t3 = $('<td align="center">'+v.singleNum+'</td>');//隔离
                         var t4 = $('<td align="center">'+v.suspectedNum+'</td>');
                         var t5 = $('<td align="center">'+v.normalNum+'</td>');
                         $("#zc").append(t1);

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.single_room as singleRoom " +
+            "c.fatigue as fatigue,c.diarrhea as diarrhea,c.others as others,c.single_room as singleRoom,a.single_num as singleNum " +
             "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

@@ -122,8 +122,8 @@ public class MsSuspected {
     @TableField(exist = false)
     private String doorplate;
 
-    @TableField("single_room")
-    private Integer singleRoom;
+    @TableField(exist = false)
+    private Integer singleNum;
 
     @TableField("single_room")
     private String singleRoomStr;

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

@@ -75,10 +75,10 @@ public class MsSuspectedService {
         msSuspected.setCough(cough);
         msSuspected.setMuscle(muscle);
         msSuspected.setDiarrhea(dyspnea);
-        msSuspected.setChest(chest);
+//        msSuspected.setChest(chest);
         msSuspected.setFatigue(fatigue);
         msSuspected.setDiarrhea(diarrhea);
-        msSuspected.setDiarrheaNum(diarrheaNum);
+//        msSuspected.setDiarrheaNum(diarrheaNum);
         msSuspected.setOthers(others);
         msSuspected.setUserCreate(userCreate);
         msSuspected.setTimeCreate(DateTime.now());

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

@@ -43,13 +43,13 @@ public class RbService {
 
                 Integer cough = sysUptownHouses.get(i).getCough();
                 if(cough != null && cough == 0){
-                    sysUptownHouses.get(i).setChestStr("无咳嗽");
+                    sysUptownHouses.get(i).setCoughStr("无咳嗽");
                 }else if(cough != null && cough ==1){
-                    sysUptownHouses.get(i).setChestStr("偶尔短暂咳嗽");
+                    sysUptownHouses.get(i).setCoughStr("偶尔短暂咳嗽");
                 }else if(cough != null && cough ==2){
-                    sysUptownHouses.get(i).setChestStr("咳嗽轻度影响生活");
+                    sysUptownHouses.get(i).setCoughStr("咳嗽轻度影响生活");
                 }else if(cough != null && cough ==3){
-                    sysUptownHouses.get(i).setChestStr("咳嗽严重影响生活");
+                    sysUptownHouses.get(i).setCoughStr("咳嗽严重影响生活");
                 }
                 Integer muscle = sysUptownHouses.get(i).getMuscle();
                 if(muscle != null && muscle==0){
@@ -100,7 +100,7 @@ public class RbService {
                     sysUptownHouses.get(i).setSingleRoomStr("单间隔离");
                 }
 
-                sysUptownHouses.get(i).setZhengzhuang(sysUptownHouses.get(i).getChestStr()+","+sysUptownHouses.get(i).getMuscleStr()+","+sysUptownHouses.get(i).getDyspneaStr()
+                sysUptownHouses.get(i).setZhengzhuang(sysUptownHouses.get(i).getCoughStr()+","+sysUptownHouses.get(i).getMuscleStr()+","+sysUptownHouses.get(i).getDyspneaStr()
                         +","+sysUptownHouses.get(i).getFatigueStr()+","+sysUptownHouses.get(i).getDiarrheaStr()+","+sysUptownHouses.get(i).getSingleRoomStr());
             }
         }