java/zhihuishenqu.git

			@@ -846,6 +846,7 @@
			com_act AS ca
			LEFT JOIN com_street AS cs ON cs.street_id = ca.street_id
			<where>
			and ca.area_code = '510423'
			<if test="streetId != null and streetId != 0">
			and cs.street_id = #{streetId}
			</if>
			@@ -864,7 +865,7 @@
			LEFT JOIN com_act AS ca1 ON ca1.community_id = cmpct1.community_id
			LEFT JOIN com_street AS cs1 ON cs1.street_id = ca1.street_id
			WHERE
			cmpct1.label LIKE '%低保户%'
			cmpct1.label LIKE '%低保户%' and ca.area_code = '510423'
			<if test="streetId != null and streetId != 0">
			and cs1.street_id = #{streetId}
			</if>
			@@ -877,7 +878,7 @@
			LEFT JOIN com_act AS ca2 ON ca2.community_id = cmpct2.community_id
			LEFT JOIN com_street AS cs2 ON cs2.street_id = ca2.street_id
			WHERE
			cmpct2.label LIKE '%高龄老人%'
			cmpct2.label LIKE '%高龄老人%' and ca.area_code = '510423'
			<if test="streetId != null and streetId != 0">
			and cs2.street_id = #{streetId}
			</if>
			@@ -890,7 +891,7 @@
			LEFT JOIN com_act AS ca3 ON ca3.community_id = cmpct3.community_id
			LEFT JOIN com_street AS cs3 ON cs3.street_id = ca3.street_id
			WHERE
			cmpct3.label LIKE '%特殊情况（重大病史/孕）%'
			cmpct3.label LIKE '%特殊情况（重大病史/孕）%' and ca.area_code = '510423'
			<if test="streetId != null and streetId != 0">
			and cs3.street_id = #{streetId}
			</if>
			@@ -903,7 +904,7 @@
			LEFT JOIN com_act AS ca4 ON ca4.community_id = cmpct4.community_id
			LEFT JOIN com_street AS cs4 ON cs4.street_id = ca4.street_id
			WHERE
			cmpct4.label LIKE '%特扶家庭%'
			cmpct4.label LIKE '%特扶家庭%' and ca.area_code = '510423'
			<if test="streetId != null and streetId != 0">
			and cs4.street_id = #{streetId}
			</if>
			@@ -916,7 +917,7 @@
			LEFT JOIN com_act AS ca5 ON ca5.community_id = cmpct5.community_id
			LEFT JOIN com_street AS cs5 ON cs5.street_id = ca5.street_id
			WHERE
			cmpct5.label LIKE '%退役军人%'
			cmpct5.label LIKE '%退役军人%' and ca.area_code = '510423'
			<if test="streetId != null and streetId != 0">
			and cs5.street_id = #{streetId}
			</if>
			@@ -930,7 +931,7 @@
			LEFT JOIN com_street AS cs6 ON cs6.street_id = ca6.street_id
			left join com_mng_population as cmp6 on cmp6.id = cmpct6.population_id
			WHERE
			cmpct6.label LIKE '%养老金人员%'
			cmpct6.label LIKE '%养老金人员%' and ca.area_code = '510423'
			<if test="streetId != null and streetId != 0">
			and cs6.street_id = #{streetId}
			</if>
			@@ -944,7 +945,7 @@
			LEFT JOIN com_act AS ca7 ON ca7.community_id = cmpct7.community_id
			LEFT JOIN com_street AS cs7 ON cs7.street_id = ca7.street_id
			WHERE
			cmpct7.label LIKE '%吸毒人员%'
			cmpct7.label LIKE '%吸毒人员%' and ca.area_code = '510423'
			<if test="streetId != null and streetId != 0">
			and cs7.street_id = #{streetId}
			</if>
			@@ -957,7 +958,7 @@
			LEFT JOIN com_act AS ca8 ON ca8.community_id = cmpct8.community_id
			LEFT JOIN com_street AS cs8 ON cs8.street_id = ca8.street_id
			WHERE
			cmpct8.label LIKE '%社区矫正%'
			cmpct8.label LIKE '%社区矫正%' and ca.area_code = '510423'
			<if test="streetId != null and streetId != 0">
			and cs8.street_id = #{streetId}
			</if>
			@@ -970,7 +971,7 @@
			LEFT JOIN com_act AS ca9 ON ca9.community_id = cmpct9.community_id
			LEFT JOIN com_street AS cs9 ON cs9.street_id = ca9.street_id
			WHERE
			cmpct9.label LIKE '%邪教人员%'
			cmpct9.label LIKE '%邪教人员%' and ca.area_code = '510423'
			<if test="streetId != null and streetId != 0">
			and cs9.street_id = #{streetId}
			</if>
			@@ -983,7 +984,7 @@
			LEFT JOIN com_act AS ca10 ON ca10.community_id = cmpct10.community_id
			LEFT JOIN com_street AS cs10 ON cs10.street_id = ca10.street_id
			WHERE
			cmpct10.label LIKE '%刑释人员%'
			cmpct10.label LIKE '%刑释人员%' and ca.area_code = '510423'
			<if test="streetId != null and streetId != 0">
			and cs10.street_id = #{streetId}
			</if>
			@@ -996,7 +997,7 @@
			LEFT JOIN com_act AS ca11 ON ca11.community_id = cmpct11.community_id
			LEFT JOIN com_street AS cs11 ON cs11.street_id = ca11.street_id
			WHERE
			cmpct11.label LIKE '%上访人员%'
			cmpct11.label LIKE '%上访人员%' and ca.area_code = '510423'
			<if test="streetId != null and streetId != 0">
			and cs11.street_id = #{streetId}
			</if>
			@@ -1009,7 +1010,7 @@
			LEFT JOIN com_act AS ca12 ON ca12.community_id = cmpct12.community_id
			LEFT JOIN com_street AS cs12 ON cs12.street_id = ca12.street_id
			WHERE
			cmpct12.label LIKE '%精神障碍患者%'
			cmpct12.label LIKE '%精神障碍患者%' and ca.area_code = '510423'
			<if test="streetId != null and streetId != 0">
			and cs12.street_id = #{streetId}
			</if>
			@@ -1019,7 +1020,7 @@
			LEFT JOIN com_act AS ca ON ca.community_id = cmpct.community_id
			LEFT JOIN com_street AS cs ON cs.street_id = ca.street_id
			WHERE
			cmpct.label LIKE '%残疾人%'
			cmpct.label LIKE '%残疾人%' and ca.area_code = '510423'
			<if test="streetId != null and streetId != 0">
			and cs.street_id = #{streetId}
			</if>
			@@ -1034,6 +1035,7 @@
			LEFT JOIN com_act AS ca ON ca.community_id = cmpct.community_id
			LEFT JOIN com_street AS cs ON cs.street_id = ca.street_id
			<where>
			and ca.area_code = '510423'
			<if test="streetId != null and streetId != 0">
			and cs.street_id = #{streetId}
			</if>
			@@ -1051,6 +1053,7 @@
			LEFT JOIN com_street AS cs ON cs.street_id = ca.street_id

			<where>
			and ca.area_code = '510423'
			<if test="streetId != null and streetId != 0">
			and cs.street_id = #{streetId}
			</if>