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

whepi-ui/templates/yeweihui/ribaoXq.ftl

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

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

@@ -31,7 +31,7 @@ public interface RbMapper extends BaseMapper<sysUptownUnit> {
     List<sysUptownUnit> selectDY(@Param("userId") Long userId);
 
 
-    @Select("select 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," +
+    @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 " +
             "from ms_report a " +

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

@@ -117,6 +117,9 @@ public class MsSuspected {
     private Integer qz;
 
     @TableField(exist = false)
+    private Integer normalNum;
+
+    @TableField(exist = false)
     private String ridgepole;
 
     @TableField(exist = false)