diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_query_month.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_query_month.ktr
index 15dacb1..c598708 100644
--- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_query_month.ktr
+++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_query_month.ktr
@@ -646,6 +646,11 @@ FROM
 	epdc_issue i
 WHERE
 	i.DEL_FLAG = '0'
+AND i.grid_id NOT IN (
+  1258690654403125249,
+  1258690914995232770,
+  1258691044142047233
+ )
 	AND find_in_set('${streetId}', i.ALL_DEPT_IDS);</sql>
     <limit>0</limit>
     <lookup/>
@@ -655,62 +660,16 @@ WHERE
     <cached_row_meta_active>N</cached_row_meta_active>
     <row-meta>
       <value-meta>
-        <type>BigNumber</type>
-        <storagetype>normal</storagetype>
-        <name>participate_of_news</name>
-        <length>34</length>
-        <precision>0</precision>
-        <origin>新闻参与量阅读量点赞量</origin>
-        <comments>participate_of_news</comments>
-        <conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask>
-        <decimal_symbol>.</decimal_symbol>
-        <grouping_symbol/>
-        <currency_symbol/>
-        <trim_type>none</trim_type>
-        <case_insensitive>N</case_insensitive>
-        <collator_disabled>Y</collator_disabled>
-        <collator_strength>0</collator_strength>
-        <sort_descending>N</sort_descending>
-        <output_padding>N</output_padding>
-        <date_format_lenient>N</date_format_lenient>
-        <date_format_locale>zh_CN</date_format_locale>
-        <date_format_timezone>Asia/Shanghai</date_format_timezone>
-        <lenient_string_to_number>N</lenient_string_to_number>
-      </value-meta>
-      <value-meta>
-        <type>BigNumber</type>
-        <storagetype>normal</storagetype>
-        <name>read_of_news</name>
-        <length>32</length>
-        <precision>0</precision>
-        <origin>新闻参与量阅读量点赞量</origin>
-        <comments>read_of_news</comments>
-        <conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask>
-        <decimal_symbol>.</decimal_symbol>
-        <grouping_symbol/>
-        <currency_symbol/>
-        <trim_type>none</trim_type>
-        <case_insensitive>N</case_insensitive>
-        <collator_disabled>Y</collator_disabled>
-        <collator_strength>0</collator_strength>
-        <sort_descending>N</sort_descending>
-        <output_padding>N</output_padding>
-        <date_format_lenient>N</date_format_lenient>
-        <date_format_locale>zh_CN</date_format_locale>
-        <date_format_timezone>Asia/Shanghai</date_format_timezone>
-        <lenient_string_to_number>N</lenient_string_to_number>
-      </value-meta>
-      <value-meta>
-        <type>BigNumber</type>
+        <type>Integer</type>
         <storagetype>normal</storagetype>
-        <name>like_of_news</name>
-        <length>32</length>
+        <name>case_num</name>
+        <length>15</length>
         <precision>0</precision>
-        <origin>新闻参与量阅读量点赞量</origin>
-        <comments>like_of_news</comments>
-        <conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask>
+        <origin>总议题数</origin>
+        <comments>case_num</comments>
+        <conversion_Mask>####0;-####0</conversion_Mask>
         <decimal_symbol>.</decimal_symbol>
-        <grouping_symbol/>
+        <grouping_symbol>,</grouping_symbol>
         <currency_symbol/>
         <trim_type>none</trim_type>
         <case_insensitive>N</case_insensitive>
@@ -756,6 +715,11 @@ FROM
 	epdc_item i
 WHERE
 	i.DEL_FLAG = '0'
+AND i.grid_id NOT IN (
+  1258690654403125249,
+  1258690914995232770,
+  1258691044142047233
+ )
 	AND find_in_set('${streetId}', i.ALL_DEPT_IDS);</sql>
     <limit>0</limit>
     <lookup/>
@@ -765,62 +729,16 @@ WHERE
     <cached_row_meta_active>N</cached_row_meta_active>
     <row-meta>
       <value-meta>
-        <type>BigNumber</type>
+        <type>Integer</type>
         <storagetype>normal</storagetype>
-        <name>participate_of_news</name>
-        <length>34</length>
+        <name>project_num</name>
+        <length>15</length>
         <precision>0</precision>
-        <origin>新闻参与量阅读量点赞量</origin>
-        <comments>participate_of_news</comments>
-        <conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask>
+        <origin>总项目数</origin>
+        <comments>project_num</comments>
+        <conversion_Mask>####0;-####0</conversion_Mask>
         <decimal_symbol>.</decimal_symbol>
-        <grouping_symbol/>
-        <currency_symbol/>
-        <trim_type>none</trim_type>
-        <case_insensitive>N</case_insensitive>
-        <collator_disabled>Y</collator_disabled>
-        <collator_strength>0</collator_strength>
-        <sort_descending>N</sort_descending>
-        <output_padding>N</output_padding>
-        <date_format_lenient>N</date_format_lenient>
-        <date_format_locale>zh_CN</date_format_locale>
-        <date_format_timezone>Asia/Shanghai</date_format_timezone>
-        <lenient_string_to_number>N</lenient_string_to_number>
-      </value-meta>
-      <value-meta>
-        <type>BigNumber</type>
-        <storagetype>normal</storagetype>
-        <name>read_of_news</name>
-        <length>32</length>
-        <precision>0</precision>
-        <origin>新闻参与量阅读量点赞量</origin>
-        <comments>read_of_news</comments>
-        <conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask>
-        <decimal_symbol>.</decimal_symbol>
-        <grouping_symbol/>
-        <currency_symbol/>
-        <trim_type>none</trim_type>
-        <case_insensitive>N</case_insensitive>
-        <collator_disabled>Y</collator_disabled>
-        <collator_strength>0</collator_strength>
-        <sort_descending>N</sort_descending>
-        <output_padding>N</output_padding>
-        <date_format_lenient>N</date_format_lenient>
-        <date_format_locale>zh_CN</date_format_locale>
-        <date_format_timezone>Asia/Shanghai</date_format_timezone>
-        <lenient_string_to_number>N</lenient_string_to_number>
-      </value-meta>
-      <value-meta>
-        <type>BigNumber</type>
-        <storagetype>normal</storagetype>
-        <name>like_of_news</name>
-        <length>32</length>
-        <precision>0</precision>
-        <origin>新闻参与量阅读量点赞量</origin>
-        <comments>like_of_news</comments>
-        <conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask>
-        <decimal_symbol>.</decimal_symbol>
-        <grouping_symbol/>
+        <grouping_symbol>,</grouping_symbol>
         <currency_symbol/>
         <trim_type>none</trim_type>
         <case_insensitive>N</case_insensitive>
@@ -1087,6 +1005,11 @@ FROM
 	epdc_issue i
 WHERE
 	i.DEL_FLAG = '0'
+AND i.grid_id NOT IN (
+  1258690654403125249,
+  1258690914995232770,
+  1258691044142047233
+ )
 	AND ISSUE_STATE ='2'
 	AND find_in_set('${streetId}', i.ALL_DEPT_IDS)
 	AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y%m')</sql>
@@ -1098,62 +1021,16 @@ WHERE
     <cached_row_meta_active>N</cached_row_meta_active>
     <row-meta>
       <value-meta>
-        <type>BigNumber</type>
+        <type>Integer</type>
         <storagetype>normal</storagetype>
-        <name>participate_of_news</name>
-        <length>34</length>
+        <name>topic_finish_num</name>
+        <length>15</length>
         <precision>0</precision>
-        <origin>新闻参与量阅读量点赞量</origin>
-        <comments>participate_of_news</comments>
-        <conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask>
+        <origin>月新增结案议题数</origin>
+        <comments>topic_finish_num</comments>
+        <conversion_Mask>####0;-####0</conversion_Mask>
         <decimal_symbol>.</decimal_symbol>
-        <grouping_symbol/>
-        <currency_symbol/>
-        <trim_type>none</trim_type>
-        <case_insensitive>N</case_insensitive>
-        <collator_disabled>Y</collator_disabled>
-        <collator_strength>0</collator_strength>
-        <sort_descending>N</sort_descending>
-        <output_padding>N</output_padding>
-        <date_format_lenient>N</date_format_lenient>
-        <date_format_locale>zh_CN</date_format_locale>
-        <date_format_timezone>Asia/Shanghai</date_format_timezone>
-        <lenient_string_to_number>N</lenient_string_to_number>
-      </value-meta>
-      <value-meta>
-        <type>BigNumber</type>
-        <storagetype>normal</storagetype>
-        <name>read_of_news</name>
-        <length>32</length>
-        <precision>0</precision>
-        <origin>新闻参与量阅读量点赞量</origin>
-        <comments>read_of_news</comments>
-        <conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask>
-        <decimal_symbol>.</decimal_symbol>
-        <grouping_symbol/>
-        <currency_symbol/>
-        <trim_type>none</trim_type>
-        <case_insensitive>N</case_insensitive>
-        <collator_disabled>Y</collator_disabled>
-        <collator_strength>0</collator_strength>
-        <sort_descending>N</sort_descending>
-        <output_padding>N</output_padding>
-        <date_format_lenient>N</date_format_lenient>
-        <date_format_locale>zh_CN</date_format_locale>
-        <date_format_timezone>Asia/Shanghai</date_format_timezone>
-        <lenient_string_to_number>N</lenient_string_to_number>
-      </value-meta>
-      <value-meta>
-        <type>BigNumber</type>
-        <storagetype>normal</storagetype>
-        <name>like_of_news</name>
-        <length>32</length>
-        <precision>0</precision>
-        <origin>新闻参与量阅读量点赞量</origin>
-        <comments>like_of_news</comments>
-        <conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask>
-        <decimal_symbol>.</decimal_symbol>
-        <grouping_symbol/>
+        <grouping_symbol>,</grouping_symbol>
         <currency_symbol/>
         <trim_type>none</trim_type>
         <case_insensitive>N</case_insensitive>
@@ -1199,6 +1076,11 @@ FROM
 	epdc_item i
 WHERE
 	i.DEL_FLAG = '0'
+AND i.grid_id NOT IN (
+  1258690654403125249,
+  1258690914995232770,
+  1258691044142047233
+ )
 	AND i.ITEM_STATE = '10'
 	AND find_in_set('${streetId}', i.ALL_DEPT_IDS)
 	AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y%m')</sql>
@@ -1210,62 +1092,16 @@ WHERE
     <cached_row_meta_active>N</cached_row_meta_active>
     <row-meta>
       <value-meta>
-        <type>BigNumber</type>
-        <storagetype>normal</storagetype>
-        <name>participate_of_news</name>
-        <length>34</length>
-        <precision>0</precision>
-        <origin>新闻参与量阅读量点赞量</origin>
-        <comments>participate_of_news</comments>
-        <conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask>
-        <decimal_symbol>.</decimal_symbol>
-        <grouping_symbol/>
-        <currency_symbol/>
-        <trim_type>none</trim_type>
-        <case_insensitive>N</case_insensitive>
-        <collator_disabled>Y</collator_disabled>
-        <collator_strength>0</collator_strength>
-        <sort_descending>N</sort_descending>
-        <output_padding>N</output_padding>
-        <date_format_lenient>N</date_format_lenient>
-        <date_format_locale>zh_CN</date_format_locale>
-        <date_format_timezone>Asia/Shanghai</date_format_timezone>
-        <lenient_string_to_number>N</lenient_string_to_number>
-      </value-meta>
-      <value-meta>
-        <type>BigNumber</type>
-        <storagetype>normal</storagetype>
-        <name>read_of_news</name>
-        <length>32</length>
-        <precision>0</precision>
-        <origin>新闻参与量阅读量点赞量</origin>
-        <comments>read_of_news</comments>
-        <conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask>
-        <decimal_symbol>.</decimal_symbol>
-        <grouping_symbol/>
-        <currency_symbol/>
-        <trim_type>none</trim_type>
-        <case_insensitive>N</case_insensitive>
-        <collator_disabled>Y</collator_disabled>
-        <collator_strength>0</collator_strength>
-        <sort_descending>N</sort_descending>
-        <output_padding>N</output_padding>
-        <date_format_lenient>N</date_format_lenient>
-        <date_format_locale>zh_CN</date_format_locale>
-        <date_format_timezone>Asia/Shanghai</date_format_timezone>
-        <lenient_string_to_number>N</lenient_string_to_number>
-      </value-meta>
-      <value-meta>
-        <type>BigNumber</type>
+        <type>Integer</type>
         <storagetype>normal</storagetype>
-        <name>like_of_news</name>
-        <length>32</length>
+        <name>project_finish_num</name>
+        <length>15</length>
         <precision>0</precision>
-        <origin>新闻参与量阅读量点赞量</origin>
-        <comments>like_of_news</comments>
-        <conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask>
+        <origin>月新增结案项目数</origin>
+        <comments>project_finish_num</comments>
+        <conversion_Mask>####0;-####0</conversion_Mask>
         <decimal_symbol>.</decimal_symbol>
-        <grouping_symbol/>
+        <grouping_symbol>,</grouping_symbol>
         <currency_symbol/>
         <trim_type>none</trim_type>
         <case_insensitive>N</case_insensitive>
@@ -1311,6 +1147,11 @@ FROM
 	epdc_issue i
 WHERE
 	i.DEL_FLAG = '0'
+AND i.grid_id NOT IN (
+  1258690654403125249,
+  1258690914995232770,
+  1258691044142047233
+ )
 	AND find_in_set('${streetId}', i.ALL_DEPT_IDS)
 	AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y%m')</sql>
     <limit>0</limit>
@@ -1321,62 +1162,16 @@ WHERE
     <cached_row_meta_active>N</cached_row_meta_active>
     <row-meta>
       <value-meta>
-        <type>BigNumber</type>
+        <type>Integer</type>
         <storagetype>normal</storagetype>
-        <name>participate_of_news</name>
-        <length>34</length>
+        <name>new_case_num</name>
+        <length>15</length>
         <precision>0</precision>
-        <origin>新闻参与量阅读量点赞量</origin>
-        <comments>participate_of_news</comments>
-        <conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask>
+        <origin>月新增议题数</origin>
+        <comments>new_case_num</comments>
+        <conversion_Mask>####0;-####0</conversion_Mask>
         <decimal_symbol>.</decimal_symbol>
-        <grouping_symbol/>
-        <currency_symbol/>
-        <trim_type>none</trim_type>
-        <case_insensitive>N</case_insensitive>
-        <collator_disabled>Y</collator_disabled>
-        <collator_strength>0</collator_strength>
-        <sort_descending>N</sort_descending>
-        <output_padding>N</output_padding>
-        <date_format_lenient>N</date_format_lenient>
-        <date_format_locale>zh_CN</date_format_locale>
-        <date_format_timezone>Asia/Shanghai</date_format_timezone>
-        <lenient_string_to_number>N</lenient_string_to_number>
-      </value-meta>
-      <value-meta>
-        <type>BigNumber</type>
-        <storagetype>normal</storagetype>
-        <name>read_of_news</name>
-        <length>32</length>
-        <precision>0</precision>
-        <origin>新闻参与量阅读量点赞量</origin>
-        <comments>read_of_news</comments>
-        <conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask>
-        <decimal_symbol>.</decimal_symbol>
-        <grouping_symbol/>
-        <currency_symbol/>
-        <trim_type>none</trim_type>
-        <case_insensitive>N</case_insensitive>
-        <collator_disabled>Y</collator_disabled>
-        <collator_strength>0</collator_strength>
-        <sort_descending>N</sort_descending>
-        <output_padding>N</output_padding>
-        <date_format_lenient>N</date_format_lenient>
-        <date_format_locale>zh_CN</date_format_locale>
-        <date_format_timezone>Asia/Shanghai</date_format_timezone>
-        <lenient_string_to_number>N</lenient_string_to_number>
-      </value-meta>
-      <value-meta>
-        <type>BigNumber</type>
-        <storagetype>normal</storagetype>
-        <name>like_of_news</name>
-        <length>32</length>
-        <precision>0</precision>
-        <origin>新闻参与量阅读量点赞量</origin>
-        <comments>like_of_news</comments>
-        <conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask>
-        <decimal_symbol>.</decimal_symbol>
-        <grouping_symbol/>
+        <grouping_symbol>,</grouping_symbol>
         <currency_symbol/>
         <trim_type>none</trim_type>
         <case_insensitive>N</case_insensitive>
@@ -1422,6 +1217,11 @@ FROM
 	epdc_item i
 WHERE
 	i.DEL_FLAG = '0'
+AND i.grid_id NOT IN (
+  1258690654403125249,
+  1258690914995232770,
+  1258691044142047233
+ )
 	AND find_in_set('${streetId}', i.ALL_DEPT_IDS)
 	AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y%m')</sql>
     <limit>0</limit>
@@ -1432,62 +1232,16 @@ WHERE
     <cached_row_meta_active>N</cached_row_meta_active>
     <row-meta>
       <value-meta>
-        <type>BigNumber</type>
+        <type>Integer</type>
         <storagetype>normal</storagetype>
-        <name>participate_of_news</name>
-        <length>34</length>
+        <name>new_project_num</name>
+        <length>15</length>
         <precision>0</precision>
-        <origin>新闻参与量阅读量点赞量</origin>
-        <comments>participate_of_news</comments>
-        <conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask>
+        <origin>月新增项目数</origin>
+        <comments>new_project_num</comments>
+        <conversion_Mask>####0;-####0</conversion_Mask>
         <decimal_symbol>.</decimal_symbol>
-        <grouping_symbol/>
-        <currency_symbol/>
-        <trim_type>none</trim_type>
-        <case_insensitive>N</case_insensitive>
-        <collator_disabled>Y</collator_disabled>
-        <collator_strength>0</collator_strength>
-        <sort_descending>N</sort_descending>
-        <output_padding>N</output_padding>
-        <date_format_lenient>N</date_format_lenient>
-        <date_format_locale>zh_CN</date_format_locale>
-        <date_format_timezone>Asia/Shanghai</date_format_timezone>
-        <lenient_string_to_number>N</lenient_string_to_number>
-      </value-meta>
-      <value-meta>
-        <type>BigNumber</type>
-        <storagetype>normal</storagetype>
-        <name>read_of_news</name>
-        <length>32</length>
-        <precision>0</precision>
-        <origin>新闻参与量阅读量点赞量</origin>
-        <comments>read_of_news</comments>
-        <conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask>
-        <decimal_symbol>.</decimal_symbol>
-        <grouping_symbol/>
-        <currency_symbol/>
-        <trim_type>none</trim_type>
-        <case_insensitive>N</case_insensitive>
-        <collator_disabled>Y</collator_disabled>
-        <collator_strength>0</collator_strength>
-        <sort_descending>N</sort_descending>
-        <output_padding>N</output_padding>
-        <date_format_lenient>N</date_format_lenient>
-        <date_format_locale>zh_CN</date_format_locale>
-        <date_format_timezone>Asia/Shanghai</date_format_timezone>
-        <lenient_string_to_number>N</lenient_string_to_number>
-      </value-meta>
-      <value-meta>
-        <type>BigNumber</type>
-        <storagetype>normal</storagetype>
-        <name>like_of_news</name>
-        <length>32</length>
-        <precision>0</precision>
-        <origin>新闻参与量阅读量点赞量</origin>
-        <comments>like_of_news</comments>
-        <conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask>
-        <decimal_symbol>.</decimal_symbol>
-        <grouping_symbol/>
+        <grouping_symbol>,</grouping_symbol>
         <currency_symbol/>
         <trim_type>none</trim_type>
         <case_insensitive>N</case_insensitive>