Merge remote-tracking branch 'origin/master'

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

@@ -38,6 +38,6 @@ public interface RbMapper extends BaseMapper<sysUptownUnit> {
             "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 " +
             "left join ms_suspected c on c.report_id = a.report_id " +
-            "where b.house_id = #{houseId}")
+            "where b.house_id = #{houseId} and DATE_FORMAT(a.time_update,'%Y-%m-%d') = #{dateStr}")
     List<MsSuspected> selectYcXq(@Param("houseId") Long houseId, @Param("dateStr") String dateStr);
 }

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

@@ -42,8 +42,6 @@ public class RbService {
             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){