业委会每日异常详情完成

whepi-ui/templates/yeweihui/ribao.ftl

@@ -77,11 +77,11 @@
                         tr = $("<tr></tr>");
                     }
                     var td;
-                    if(v.msStatus == 2){//异常
-                        td = '<td style="background-color: yellow" align="center" value="'+v.houseId+'" onclick="ribao_ycxq(this.value)">'+v.doorplate+'</td>';
-                    }else if(v.msStatus != 2 && v.reportId != 0 && v.msStatus != null && v.reportId !=null){//已报
+                    if(v.msStatus == 2 && v.reportStatus == 2){//异常
+                        td = '<button value="'+v.houseId+'" onclick="ribao_ycxq(this.value)"><td style="background-color: yellow" align="center" value="'+v.houseId+'">'+v.doorplate+'</td></button>';
+                    }else if(v.msStatus != 2 && v.reportStatus == 2 && v.msStatus != null && v.reportStatus !=null){//已报
                         td = '<td style="background-color: #0bb20c" align="center">'+v.doorplate+'</td>';
-                    }else if(v.reportId == null){//待报
+                    }else if(v.reportStatus == 1 || v.reportStatus == 0){//待报
                         td = '<td style="background-color: #75859f" align="center">'+v.doorplate+'</td>';
                     }
                     tr.append(td);
@@ -95,7 +95,10 @@
     })(jQuery);
 
     function ribao_ycxq(houseId) {
-        window.location.href = "/yeweihui/ribaoXq.html?"+houseId
+        $('#tableId').on('click', function () {
+            window.location.href = "/yeweihui/ribaoXq.html?"+houseId
+        });
+
     }
 
     $('#return').on('click', function () {

whepi-ui/templates/yeweihui/ribaoXq.ftl

@@ -24,20 +24,19 @@
                             <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>
-                            <tr>
-                                <td align="center">8</td>
-                                <td align="center">0</td>
-                                <td align="center">0</td>
-                                <td align="center">0</td>
-                                <td align="center">8</td>
+                            <tr id="zc">
+                                <#--<td align="center">8</td>-->
+                                <#--<td align="center">0</td>-->
+                                <#--<td align="center">0</td>-->
+                                <#--<td align="center">0</td>-->
+                                <#--<td align="center">8</td>-->
                             </tr>
                             </tbody>
                         </table>
-                    </div><br/>
+                    </div>
                     <div>
                         <table border="1" cellspacing="0" cellpadding="0" style="width: 100%">
                             <tbody id="tableIdycxq">
@@ -59,6 +58,7 @@
 <#include "/home/frag.foot.ftl" />
 <script>
     (function ($) {
+        $(function(){
         var search = location.search;
         var houseId;
         if(search.indexOf("?")!=-1){
@@ -73,17 +73,30 @@
                 console.log(data.data);
                 for (var i = 0; i < data.data.length; i++) {
                     var v = data.data[i];
+                    if(i==0){
+                        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.safetyNum-v.sureNum-v.suspectedNum)+'</td>');
+                        $("#zc").append(t1);
+                        $("#zc").append(t2);
+                        $("#zc").append(t3);
+                        $("#zc").append(t4);
+                    }
+
                     var tr = $("<tr></tr>");
-                    var td;
-                    td = '<td style="background-color: yellow" align="center"">'+v.userName+'</td>';
-                    td = '<td style="background-color: yellow" align="center"">'+v.conditionStatus+'</td>';
-                    td = '<td style="background-color: yellow" align="center"">'+v.remarks+'</td>';
-                    tr.append(td);
+                    var td1 = $('<td align="center">'+v.userName+'</td>');
+                    var td2 = $('<td align="center">'+v.zhengzhuang+'</td>');
+                    var td3 = $('<td align="center">'+v.others+'</td>');
+                    tr.append(td1);
+                    tr.append(td2);
+                    tr.append(td3);
                     $("#tableIdycxq").append(tr);
 
                 }
 
             }
         });
+        });
     })(jQuery);
 </script>

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

@@ -15,7 +15,7 @@ import java.util.List;
 @Repository
 public interface RbMapper extends BaseMapper<sysUptownUnit> {
 
-    @Select("select DISTINCT a.house_id as houseId,a.doorplate as doorplate,c.report_id as reportId,c.ms_status as msStatus,b.unit_id as unitId from sys_uptown_house a " +
+    @Select("select DISTINCT c.report_status as reportStatus,a.house_id as houseId,a.doorplate as doorplate,c.report_id as reportId,c.ms_status as msStatus,b.unit_id as unitId from sys_uptown_house a " +
             "inner join sys_uptown_unit b on a.unit_id = b.unit_id " +
             "inner join sys_owner d on d.uptown_id = b.uptown_id " +
             "inner join sys_user_role e on e.property_id = d.owner_id and e.role_id = 2 " +
@@ -31,7 +31,10 @@ public interface RbMapper extends BaseMapper<sysUptownUnit> {
     List<sysUptownUnit> selectDY(@Param("userId") Long userId);
 
 
-    @Select("select 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 from ms_report a " +
+    @Select("select 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 " +
+            "from ms_report a " +
             "inner join sys_uptown_house b on b.house_id = a.house_id " +
             "left join ms_suspected c on c.report_id = a.report_id " +
             "where b.house_id = #{houseId}")

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

@@ -50,21 +50,42 @@ public class MsSuspected {
     @TableField("cough")
     private Integer cough;
 
+    @TableField(exist = false)
+    private String coughStr;
+
     @TableField("muscle")
     private Integer muscle;
 
+    @TableField(exist = false)
+    private String muscleStr;
+
     @TableField("dyspnea")
     private Integer dyspnea;
 
+    @TableField(exist = false)
+    private String dyspneaStr;
+
     @TableField("chest")
     private Integer chest;
 
+    @TableField(exist = false)
+    private String chestStr;
+
     @TableField("fatigue")
     private Integer fatigue;
 
+    @TableField(exist = false)
+    private String fatigueStr;
+
     @TableField("diarrhea")
     private Integer diarrhea;
 
+    @TableField(exist = false)
+    private String diarrheaStr;
+
+    @TableField(exist = false)
+    private String zhengzhuang;
+
     @TableField("diarrhea_num")
     private Integer diarrheaNum;
 
@@ -82,4 +103,16 @@ public class MsSuspected {
 
     @TableField("time_update")
     private DateTime timeUpdate;
+
+    @TableField(exist = false)
+    private Integer safetyNum;
+
+    @TableField(exist = false)
+    private Integer sureNum;
+
+    @TableField(exist = false)
+    private Integer suspectedNum;
+
+    @TableField(exist = false)
+    private Integer qz;
 }

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

@@ -40,6 +40,9 @@ public class SysUptownHouse implements Serializable {
     @TableField("status")
     private int status;
 
+    @TableField("report_status")
+    private int reportStatus;
+
     @TableField("time_create")
     private DateTime timeCreate;
 

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

@@ -19,8 +19,8 @@ public class RbService {
     private RbMapper rbMapper;
 
     public List<sysUptownUnit> selectAll (Long userId) {
-        List<sysUptownUnit> sysUptownHouses = rbMapper.selectDY(userId);
-        return sysUptownHouses;
+        List<sysUptownUnit> sysUptownUnits = rbMapper.selectDY(userId);
+        return sysUptownUnits;
     }
 
     public List<SysUptownHouse> selectXq (Long str) {
@@ -29,8 +29,8 @@ public class RbService {
         Date date = new Date();
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
         String dateStr = simpleDateFormat.format(date);
-        List<SysUptownHouse> sysUptownHouses = rbMapper.selectMp(str,dateStr);
-        return sysUptownHouses;
+        List<SysUptownHouse> sysUptownHousesss = rbMapper.selectMp(str,dateStr);
+        return sysUptownHousesss;
     }
 
     public List<MsSuspected> selectYcXq (Long houseId) {
@@ -38,6 +38,69 @@ public class RbService {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
         String dateStr = simpleDateFormat.format(date);
         List<MsSuspected> sysUptownHouses = rbMapper.selectYcXq(houseId,dateStr);
+        if(sysUptownHouses.size() !=0){
+            for (int i = 0; i < sysUptownHouses.size(); i++) {
+
+
+
+
+                if(sysUptownHouses.get(i).getCough()==0){
+                    sysUptownHouses.get(i).setChestStr("无咳嗽");
+                }else if(sysUptownHouses.get(i).getCough()==1){
+                    sysUptownHouses.get(i).setChestStr("偶尔短暂咳嗽");
+                }else if(sysUptownHouses.get(i).getCough()==2){
+                    sysUptownHouses.get(i).setChestStr("频繁咳嗽轻重");
+                }else if(sysUptownHouses.get(i).getCough()==3){
+                    sysUptownHouses.get(i).setChestStr("频繁咳嗽重度");
+                }
+                if(sysUptownHouses.get(i).getMuscle()==0){
+                    sysUptownHouses.get(i).setMuscleStr("无肌肉酸痛");
+                }else if(sysUptownHouses.get(i).getMuscle()==1){
+                    sysUptownHouses.get(i).setMuscleStr("肌肉酸痛加重");
+                }else if(sysUptownHouses.get(i).getMuscle()==2){
+                    sysUptownHouses.get(i).setMuscleStr("肌肉酸痛好转");
+                }else if(sysUptownHouses.get(i).getMuscle()==3){
+                    sysUptownHouses.get(i).setMuscleStr("肌肉酸痛无变化");
+                }
+                if(sysUptownHouses.get(i).getDyspnea()==0){
+                    sysUptownHouses.get(i).setDyspneaStr("无呼吸困难");
+                }else if(sysUptownHouses.get(i).getDyspnea()==1){
+                    sysUptownHouses.get(i).setDyspneaStr("呼吸困难加重");
+                }else if(sysUptownHouses.get(i).getDyspnea()==2){
+                    sysUptownHouses.get(i).setDyspneaStr("呼吸困难好转");
+                }else if(sysUptownHouses.get(i).getDyspnea()==3){
+                    sysUptownHouses.get(i).setDyspneaStr("呼吸困难无变化");
+                }else if(sysUptownHouses.get(i).getDyspnea()==4){
+                    sysUptownHouses.get(i).setDyspneaStr("呼吸困难严重");
+                }
+                if(sysUptownHouses.get(i).getChest()==0){
+                    sysUptownHouses.get(i).setChestStr("无胸闷");
+                }else if(sysUptownHouses.get(i).getChest()==1){
+                    sysUptownHouses.get(i).setChestStr("端坐呼吸");
+                }else if(sysUptownHouses.get(i).getChest()==2){
+                    sysUptownHouses.get(i).setChestStr("活动无");
+                }else if(sysUptownHouses.get(i).getChest()==3){
+                    sysUptownHouses.get(i).setChestStr("无变化");
+                }
+                if(sysUptownHouses.get(i).getFatigue() == 0){
+                    sysUptownHouses.get(i).setFatigueStr("无乏力");
+                }else if(sysUptownHouses.get(i).getFatigue() == 1){
+                    sysUptownHouses.get(i).setFatigueStr("乏力加重");
+                }else if(sysUptownHouses.get(i).getFatigue() == 2){
+                    sysUptownHouses.get(i).setFatigueStr("乏力好转");
+                }else if(sysUptownHouses.get(i).getFatigue() == 3){
+                    sysUptownHouses.get(i).setFatigueStr("乏力无变化");
+                }
+                if(sysUptownHouses.get(i).getDiarrhea() == 0){
+                    sysUptownHouses.get(i).setDiarrheaStr("无腹泻");
+                }else if(sysUptownHouses.get(i).getDiarrhea() == 1){
+                    sysUptownHouses.get(i).setDiarrheaStr("有腹泻");
+                }
+                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());
+            }
+        }
+
         return sysUptownHouses;
     }
 }

whepi-web/src/main/java/com/bofeng/wx/controller/YeWeiHuiController.java

@@ -50,7 +50,7 @@ public class YeWeiHuiController {
         queryParam.put("statistics", "M");
 
         List<QzTask> taskList = qzTaskService.selectAll(2L);
-        List<sysUptownUnit> rbList = rbService.selectAll(1224706869998772226L);
+        List<sysUptownUnit> rbList = rbService.selectAll(1225331049509187586L);
         model.put("taskList", YvanUtil.toJsonPretty(taskList));
         model.put("rbList", YvanUtil.toJsonPretty(rbList));
 
@@ -170,7 +170,6 @@ public class YeWeiHuiController {
     @GetMapping("/yeweihui/ribaoDyYcXq")
     public Model<List<MsSuspected>> yeweihuiRibaoYcXq(Long houseId) {
         List<MsSuspected> rbList = rbService.selectYcXq(houseId);
-
         return Model.newSuccess(rbList);
     }
 }