Merge branch 'master' of http://git.yvanui.com/hust/wuhan_epi

whepi-web/src/main/resources/mapper/RbMapper.xml

@@ -9,14 +9,14 @@
         mss.medical,mss.temperature,mss.cough,mss.muscle ,mss.dyspnea,mss.fatigue,mss.diarrhea,mss.single_room as singleRoom,mss.score_rezult,tr.trip_id,tr.is_trip,tr.today_local,tr.today_local_other,tr.work_local,tr.work_local_other
         from sys_uptown_house suh
         inner join sys_uptown_home suho on suho.house_id=suh.house_id
-        INNER JOIN sys_uptown_unit suu ON suu.unit_id = suh.unit_id and
+        INNER JOIN sys_uptown_unit suu ON suu.unit_id = suh.unit_id
+        left join ms_report msr on msr.house_id = suh.house_id and
         <if test="date!=null and date!=''">
             msr.report_date = #{date}
         </if>
         <if test="date==null or date==''">
             msr.report_date = curdate()
         </if>
-        left join ms_report msr on msr.house_id = suh.house_id and msr.report_date = #{date}
         left join ms_suspected mss on mss.report_id=msr.report_id
         left join ms_trip tr on mss.suspected_id=trip_id
         <where>