Merge remote-tracking branch 'origin/master'

@@ -100,7 +100,7 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
 				" v6.dhgyqntqyy,  " +
 				" v6.dhgyqntqyy,  " +
 				" round(v4.yjhl/sum(v1.CSL),2) as yyh,  " +
 				" round(v4.yjhl/sum(v1.CSL),2) as yyh,  " +
 				" v6.yyf," +
 				" v6.yyf," +
-				" round(ifnull(v5.yjhl/tb.clsl_tb,0),2) qntqyh,  " +
+				" round(ifnull(v5.yjhl/tb.clsl_tb/10000,0),2) qntqyh,  " +
 				" round(100*(v4.yjhl-ifnull(v5.yjhl,0))/ifnull(v5.yjhl,v4.yjhl),2) as yhdbbhl,  " +
 				" round(100*(v4.yjhl-ifnull(v5.yjhl,0))/ifnull(v5.yjhl,v4.yjhl),2) as yhdbbhl,  " +
 				" v6.yhgyqntqyy,  " +
 				" v6.yhgyqntqyy,  " +
 				" rtc.target_power as bndhmb,  " +
 				" rtc.target_power as bndhmb,  " +
@@ -128,9 +128,9 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
 				" ) v4 on v4.month_tb = right(left(v1.time,7),2)  " +
 				" ) v4 on v4.month_tb = right(left(v1.time,7),2)  " +
 				" left join (  " +
 				" left join (  " +
 				" select right(left(time,7),2) month_tb,  " +
 				" select right(left(time,7),2) month_tb,  " +
-				" SUM(DLHJ) dlhj,(SUM( PAMRJ ) + SUM( SCLPAMZ ) + SUM( SCLPAMF ) + SUM( NACLO ) + SUM( PACGT ) + SUM( PACYT ) + SUM( PFS ) + SUM( FHTY ) +  " +
-				" SUM( RYXNJ ) + SUM( YWL ) + SUM( GXCLJ ) + SUM( CH3COONA ) + SUM( HXT ) + SUM( FECL3 ) + SUM( SH ) + SUM( CH3COOH ) + SUM( FESO4G ) +  " +
-				" SUM( FESO4Y ) + SUM( H2O2 )) yjhl  " +
+				" SUM(DLHJ) dlhj,(SUM( IFNULL(PAMRJ,0) ) + SUM( IFNULL(SCLPAMZ,0) ) + SUM( IFNULL(SCLPAMF,0) ) + SUM( IFNULL(NACLO,0) ) + SUM( IFNULL(PACGT,0) ) + SUM( IFNULL(PACYT,0) ) + SUM( IFNULL(PFS,0) ) + SUM( IFNULL(FHTY,0) ) +  " +
+				" SUM( IFNULL(RYXNJ,0) ) + SUM( IFNULL(YWL,0) ) + SUM( IFNULL(GXCLJ,0) ) + SUM( IFNULL(CH3COONA,0) ) + SUM( IFNULL(HXT,0) ) + SUM( IFNULL(FECL3,0) ) + SUM( IFNULL(SH,0) ) + SUM( IFNULL(CH3COOH,0) ) + SUM( IFNULL(FESO4G,0) ) +  " +
+				" SUM( IFNULL(FESO4Y,0) ) + SUM( IFNULL(H2O2,0) )) yjhl  " +
 				" from "+dataViewName3a24tb+" v3  " +
 				" from "+dataViewName3a24tb+" v3  " +
 				" where v3.depart_id =   '"+departId+"' and v3.time like CONCAT('"+tbYear+"','%') GROUP BY left(time,7)  " +
 				" where v3.depart_id =   '"+departId+"' and v3.time like CONCAT('"+tbYear+"','%') GROUP BY left(time,7)  " +
 				" ) v5 on v5.month_tb = right(left(v1.time,7),2)  " +
 				" ) v5 on v5.month_tb = right(left(v1.time,7),2)  " +