Merge remote-tracking branch 'origin/master' into master

@@ -6,9 +6,9 @@
     <select id="topCensus" resultType="java.util.Map">
         select
             '年度安全隐患统计(起)' as 'name','yh' as 'code',
-           ifnull( SUM( CASE WHEN LEFT ( sr.rec_ord_whenlong, 7 ) = #{nowMonth} THEN 1 ELSE 0 END ),0) as now,
-           ifnull(  SUM( CASE WHEN LEFT ( sr.rec_ord_whenlong, 4 ) = #{nowYear} THEN 1 ELSE 0 END),0) as nowYear,
-          ifnull(   SUM( CASE WHEN LEFT ( sr.rec_ord_whenlong, 4 ) = #{lastYear} THEN 1 ELSE 0 END ),0) as last_year
+           ifnull( SUM( CASE WHEN LEFT ( sr.rec_ord_report_date, 7 ) = #{nowMonth} THEN 1 ELSE 0 END ),0) as now,
+           ifnull(  SUM( CASE WHEN LEFT ( sr.rec_ord_report_date, 4 ) = #{nowYear} THEN 1 ELSE 0 END),0) as nowYear,
+          ifnull(   SUM( CASE WHEN LEFT ( sr.rec_ord_report_date, 4 ) = #{lastYear} THEN 1 ELSE 0 END ),0) as last_year
         from ajh_rectification_info sr
         UNION
         select