hbwri/skjcmanager.git

			@@ -25,6 +25,10 @@
			tmp.totalDangerNum,
			tmp.termiteNum,
			tmp.otherNum,
			ifnull(tmp.totalDanger,0) totalDanger,
			ifnull(tmp.totalDangerSr,0) totalDangerSr,
			ifnull(tmp.totalDangerCb,0) totalDangerCb,
			ifnull(tmp.totalDangerDw,0) totalDangerDw,

			case when town."ad_grad" = 4 THEN town."ad_code" ELSE NULL END AS townCode,
			case when town."ad_grad" = 4 THEN town."ad_name" ELSE NULL END AS townName,
			@@ -61,7 +65,11 @@

			SUM(CASE WHEN (trgi."hazard_rating" != '无危害') THEN 1 ELSE 0 END) AS totalDangerNum,
			SUM(CASE WHEN (trgi."investigation_variety" = '白蚁' and trgi."hazard_rating" != '无危害') THEN 1 ELSE 0 END) AS termiteNum,
			SUM(CASE WHEN (trgi."investigation_variety" != '白蚁' and trgi."hazard_rating" != '无危害') THEN 1 ELSE 0 END) AS otherNum
			SUM(CASE WHEN (trgi."investigation_variety" != '白蚁' and trgi."hazard_rating" != '无危害') THEN 1 ELSE 0 END) AS otherNum,
			SUM(CASE WHEN (trgi."is_danger" != '否') THEN 1 ELSE 0 END) AS totalDanger,
			SUM(CASE WHEN (json_value(trgi."danger_info", '$.sr') != '') THEN json_value(trgi."danger_info", '$.sr') ELSE 0 END) AS totalDangerSr,
			SUM(CASE WHEN (json_value(trgi."danger_info", '$.cb') != '') THEN json_value(trgi."danger_info", '$.cb') ELSE 0 END) AS totalDangerCb,
			SUM(CASE WHEN (json_value(trgi."danger_info", '$.dw') != '') THEN json_value(trgi."danger_info", '$.dw') ELSE 0 END) AS totalDangerDw
			from sjzt_md."tb_res_general_investigation" trgi
			where 1=1
			<if test="attResBase.tbYear !=null and attResBase.tbYear !=''">