diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query.ktr
index a61269d..789cd3e 100644
--- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query.ktr
+++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query.ktr
@@ -1483,6 +1483,118 @@ WHERE
       <draw>Y</draw>
     </GUI>
   </step>
+  <step>
+    <name>当月已办结项目数</name>
+    <type>TableInput</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <connection>source_ys_events</connection>
+    <sql>SELECT
+	count(id) AS finish_project_num
+FROM
+	epdc_item
+WHERE
+	DEL_FLAG = '0'
+AND ITEM_STATE = '10'
+AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(NOW(), '%Y%m')
+	AND find_in_set(${gridId}, ALL_DEPT_IDS);</sql>
+    <limit>0</limit>
+    <lookup/>
+    <execute_each_row>N</execute_each_row>
+    <variables_active>Y</variables_active>
+    <lazy_conversion_active>N</lazy_conversion_active>
+    <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>
+        <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/>
+        <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>
+    </row-meta>
+    <attributes/>
+    <cluster_schema/>
+    <remotesteps>
+      <input>
+      </input>
+      <output>
+      </output>
+    </remotesteps>
+    <GUI>
+      <xloc>784</xloc>
+      <yloc>656</yloc>
+      <draw>Y</draw>
+    </GUI>
+  </step>
   <step>
     <name>当月总议题数项目数</name>
     <type>TableInput</type>
@@ -3001,7 +3113,7 @@ AND u.dept_id = ${gridId};</sql>
     </GUI>
   </step>
   <step>
-    <name>设置本月用户注册党员数</name>
+    <name>设置当月已办结项目数</name>
     <type>SetVariable</type>
     <description/>
     <distribute>Y</distribute>
@@ -3013,8 +3125,8 @@ AND u.dept_id = ${gridId};</sql>
     </partitioning>
     <fields>
       <field>
-        <field_name>reg_party_num</field_name>
-        <variable_name>reg_party_num</variable_name>
+        <field_name>finish_project_num</field_name>
+        <variable_name>finish_project_num_month</variable_name>
         <variable_type>PARENT_JOB</variable_type>
         <default_value/>
       </field>
@@ -3029,13 +3141,13 @@ AND u.dept_id = ${gridId};</sql>
       </output>
     </remotesteps>
     <GUI>
-      <xloc>1168</xloc>
-      <yloc>176</yloc>
+      <xloc>1024</xloc>
+      <yloc>656</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
   <step>
-    <name>设置本月用户注册数</name>
+    <name>设置当月项目数变量</name>
     <type>SetVariable</type>
     <description/>
     <distribute>Y</distribute>
@@ -3047,8 +3159,8 @@ AND u.dept_id = ${gridId};</sql>
     </partitioning>
     <fields>
       <field>
-        <field_name>reg_user_num</field_name>
-        <variable_name>reg_user_num</variable_name>
+        <field_name>project_num</field_name>
+        <variable_name>project_num_month</variable_name>
         <variable_type>PARENT_JOB</variable_type>
         <default_value/>
       </field>
@@ -3063,13 +3175,13 @@ AND u.dept_id = ${gridId};</sql>
       </output>
     </remotesteps>
     <GUI>
-      <xloc>1168</xloc>
-      <yloc>96</yloc>
+      <xloc>1024</xloc>
+      <yloc>576</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
   <step>
-    <name>设置本月用户注册社群数</name>
+    <name>设置本月用户注册党员数</name>
     <type>SetVariable</type>
     <description/>
     <distribute>Y</distribute>
@@ -3081,8 +3193,8 @@ AND u.dept_id = ${gridId};</sql>
     </partitioning>
     <fields>
       <field>
-        <field_name>reg_group_num</field_name>
-        <variable_name>reg_group_num</variable_name>
+        <field_name>reg_party_num</field_name>
+        <variable_name>reg_party_num</variable_name>
         <variable_type>PARENT_JOB</variable_type>
         <default_value/>
       </field>
@@ -3098,12 +3210,12 @@ AND u.dept_id = ${gridId};</sql>
     </remotesteps>
     <GUI>
       <xloc>1168</xloc>
-      <yloc>256</yloc>
+      <yloc>176</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
   <step>
-    <name>设置注册党员数变量</name>
+    <name>设置本月用户注册数</name>
     <type>SetVariable</type>
     <description/>
     <distribute>Y</distribute>
@@ -3115,8 +3227,8 @@ AND u.dept_id = ${gridId};</sql>
     </partitioning>
     <fields>
       <field>
-        <field_name>reg_party_num</field_name>
-        <variable_name>reg_party_num</variable_name>
+        <field_name>reg_user_num</field_name>
+        <variable_name>reg_user_num</variable_name>
         <variable_type>PARENT_JOB</variable_type>
         <default_value/>
       </field>
@@ -3131,13 +3243,13 @@ AND u.dept_id = ${gridId};</sql>
       </output>
     </remotesteps>
     <GUI>
-      <xloc>592</xloc>
-      <yloc>736</yloc>
+      <xloc>1168</xloc>
+      <yloc>96</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
   <step>
-    <name>设置注册用户数变量</name>
+    <name>设置本月用户注册社群数</name>
     <type>SetVariable</type>
     <description/>
     <distribute>Y</distribute>
@@ -3149,8 +3261,8 @@ AND u.dept_id = ${gridId};</sql>
     </partitioning>
     <fields>
       <field>
-        <field_name>register_num</field_name>
-        <variable_name>register_num</variable_name>
+        <field_name>reg_group_num</field_name>
+        <variable_name>reg_group_num</variable_name>
         <variable_type>PARENT_JOB</variable_type>
         <default_value/>
       </field>
@@ -3165,13 +3277,13 @@ AND u.dept_id = ${gridId};</sql>
       </output>
     </remotesteps>
     <GUI>
-      <xloc>592</xloc>
+      <xloc>1168</xloc>
       <yloc>256</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
   <step>
-    <name>设置社区ID，社区name</name>
+    <name>设置注册党员数变量</name>
     <type>SetVariable</type>
     <description/>
     <distribute>Y</distribute>
@@ -3183,14 +3295,8 @@ AND u.dept_id = ${gridId};</sql>
     </partitioning>
     <fields>
       <field>
-        <field_name>commId</field_name>
-        <variable_name>commId</variable_name>
-        <variable_type>PARENT_JOB</variable_type>
-        <default_value/>
-      </field>
-      <field>
-        <field_name>commName</field_name>
-        <variable_name>commName</variable_name>
+        <field_name>reg_party_num</field_name>
+        <variable_name>reg_party_num</variable_name>
         <variable_type>PARENT_JOB</variable_type>
         <default_value/>
       </field>
@@ -3206,12 +3312,12 @@ AND u.dept_id = ${gridId};</sql>
     </remotesteps>
     <GUI>
       <xloc>592</xloc>
-      <yloc>96</yloc>
+      <yloc>736</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
   <step>
-    <name>设置网格长数变量</name>
+    <name>设置注册用户数变量</name>
     <type>SetVariable</type>
     <description/>
     <distribute>Y</distribute>
@@ -3223,8 +3329,8 @@ AND u.dept_id = ${gridId};</sql>
     </partitioning>
     <fields>
       <field>
-        <field_name>gridmaster</field_name>
-        <variable_name>gridmaster</variable_name>
+        <field_name>register_num</field_name>
+        <variable_name>register_num</variable_name>
         <variable_type>PARENT_JOB</variable_type>
         <default_value/>
       </field>
@@ -3240,12 +3346,12 @@ AND u.dept_id = ${gridId};</sql>
     </remotesteps>
     <GUI>
       <xloc>592</xloc>
-      <yloc>656</yloc>
+      <yloc>256</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
   <step>
-    <name>设置议题数变量</name>
+    <name>设置社区ID，社区name</name>
     <type>SetVariable</type>
     <description/>
     <distribute>Y</distribute>
@@ -3257,8 +3363,14 @@ AND u.dept_id = ${gridId};</sql>
     </partitioning>
     <fields>
       <field>
-        <field_name>case_num</field_name>
-        <variable_name>case_num</variable_name>
+        <field_name>commId</field_name>
+        <variable_name>commId</variable_name>
+        <variable_type>PARENT_JOB</variable_type>
+        <default_value/>
+      </field>
+      <field>
+        <field_name>commName</field_name>
+        <variable_name>commName</variable_name>
         <variable_type>PARENT_JOB</variable_type>
         <default_value/>
       </field>
@@ -3274,12 +3386,12 @@ AND u.dept_id = ${gridId};</sql>
     </remotesteps>
     <GUI>
       <xloc>592</xloc>
-      <yloc>176</yloc>
+      <yloc>96</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
   <step>
-    <name>设置项目数变量</name>
+    <name>设置网格长数变量</name>
     <type>SetVariable</type>
     <description/>
     <distribute>Y</distribute>
@@ -3291,8 +3403,8 @@ AND u.dept_id = ${gridId};</sql>
     </partitioning>
     <fields>
       <field>
-        <field_name>project_num</field_name>
-        <variable_name>project_num</variable_name>
+        <field_name>gridmaster</field_name>
+        <variable_name>gridmaster0</variable_name>
         <variable_type>PARENT_JOB</variable_type>
         <default_value/>
       </field>
@@ -3308,12 +3420,12 @@ AND u.dept_id = ${gridId};</sql>
     </remotesteps>
     <GUI>
       <xloc>592</xloc>
-      <yloc>336</yloc>
+      <yloc>656</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
   <step>
-    <name>设置当月项目数变量</name>
+    <name>设置议题数变量</name>
     <type>SetVariable</type>
     <description/>
     <distribute>Y</distribute>
@@ -3325,8 +3437,8 @@ AND u.dept_id = ${gridId};</sql>
     </partitioning>
     <fields>
       <field>
-        <field_name>project_num</field_name>
-        <variable_name>project_num_month</variable_name>
+        <field_name>case_num</field_name>
+        <variable_name>case_num</variable_name>
         <variable_type>PARENT_JOB</variable_type>
         <default_value/>
       </field>
@@ -3341,14 +3453,14 @@ AND u.dept_id = ${gridId};</sql>
       </output>
     </remotesteps>
     <GUI>
-      <xloc>1024</xloc>
-      <yloc>576</yloc>
+      <xloc>592</xloc>
+      <yloc>176</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
   <step>
-    <name>项目数</name>
-    <type>TableInput</type>
+    <name>设置项目数变量</name>
+    <type>SetVariable</type>
     <description/>
     <distribute>Y</distribute>
     <custom_distribution/>
@@ -3357,91 +3469,15 @@ AND u.dept_id = ${gridId};</sql>
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <connection>source_ys_events</connection>
-    <sql>SELECT
-	COUNT(i.ID) AS project_num
-FROM
-	epdc_item i
-WHERE
-	i.DEL_FLAG = '0'
-	AND find_in_set(${gridId}, i.ALL_DEPT_IDS);</sql>
-    <limit>0</limit>
-    <lookup/>
-    <execute_each_row>N</execute_each_row>
-    <variables_active>Y</variables_active>
-    <lazy_conversion_active>N</lazy_conversion_active>
-    <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>
-        <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/>
-        <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>
-    </row-meta>
+    <fields>
+      <field>
+        <field_name>project_num</field_name>
+        <variable_name>project_num</variable_name>
+        <variable_type>PARENT_JOB</variable_type>
+        <default_value/>
+      </field>
+    </fields>
+    <use_formatting>Y</use_formatting>
     <attributes/>
     <cluster_schema/>
     <remotesteps>
@@ -3451,13 +3487,13 @@ WHERE
       </output>
     </remotesteps>
     <GUI>
-      <xloc>352</xloc>
+      <xloc>592</xloc>
       <yloc>336</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
   <step>
-    <name>当月已办结项目数</name>
+    <name>项目数</name>
     <type>TableInput</type>
     <description/>
     <distribute>Y</distribute>
@@ -3469,14 +3505,12 @@ WHERE
     </partitioning>
     <connection>source_ys_events</connection>
     <sql>SELECT
-	count(id) AS finish_project_num
+	COUNT(i.ID) AS project_num
 FROM
-	epdc_item
+	epdc_item i
 WHERE
-	DEL_FLAG = '0'
-AND ITEM_STATE = '10'
-AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(NOW(), '%Y%m')
-	AND find_in_set(${gridId}, ALL_DEPT_IDS);</sql>
+	i.DEL_FLAG = '0'
+	AND find_in_set(${gridId}, i.ALL_DEPT_IDS);</sql>
     <limit>0</limit>
     <lookup/>
     <execute_each_row>N</execute_each_row>
@@ -3563,42 +3597,8 @@ AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(NOW(), '%Y%m')
       </output>
     </remotesteps>
     <GUI>
-      <xloc>784</xloc>
-      <yloc>656</yloc>
-      <draw>Y</draw>
-    </GUI>
-  </step>
-  <step>
-    <name>设置当月已办结项目数</name>
-    <type>SetVariable</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <fields>
-      <field>
-        <field_name>finish_project_num</field_name>
-        <variable_name>finish_project_num_month</variable_name>
-        <variable_type>PARENT_JOB</variable_type>
-        <default_value/>
-      </field>
-    </fields>
-    <use_formatting>Y</use_formatting>
-    <attributes/>
-    <cluster_schema/>
-    <remotesteps>
-      <input>
-      </input>
-      <output>
-      </output>
-    </remotesteps>
-    <GUI>
-      <xloc>1024</xloc>
-      <yloc>656</yloc>
+      <xloc>352</xloc>
+      <yloc>336</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_grid_day.kjb b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_grid_day.kjb
index 5bc99a2..dd789cd 100644
--- a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_grid_day.kjb
+++ b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_grid_day.kjb
@@ -639,6 +639,11 @@
           <variable_value>100</variable_value>
           <variable_type>CURRENT_JOB</variable_type>
         </field>
+        <field>
+          <variable_name>gridmaster</variable_name>
+          <variable_value>赵泽诗</variable_value>
+          <variable_type>CURRENT_JOB</variable_type>
+        </field>
       </fields>
       <parallel>N</parallel>
       <draw>Y</draw>
@@ -681,6 +686,11 @@
           <variable_value>113</variable_value>
           <variable_type>CURRENT_JOB</variable_type>
         </field>
+        <field>
+          <variable_name>gridmaster</variable_name>
+          <variable_value>刘东军</variable_value>
+          <variable_type>CURRENT_JOB</variable_type>
+        </field>
       </fields>
       <parallel>N</parallel>
       <draw>Y</draw>
@@ -723,6 +733,11 @@
           <variable_value>41</variable_value>
           <variable_type>CURRENT_JOB</variable_type>
         </field>
+        <field>
+          <variable_name>gridmaster</variable_name>
+          <variable_value>孔凡代</variable_value>
+          <variable_type>CURRENT_JOB</variable_type>
+        </field>
       </fields>
       <parallel>N</parallel>
       <draw>Y</draw>
@@ -765,6 +780,11 @@
           <variable_value>174</variable_value>
           <variable_type>CURRENT_JOB</variable_type>
         </field>
+        <field>
+          <variable_name>gridmaster</variable_name>
+          <variable_value>朱向阳</variable_value>
+          <variable_type>CURRENT_JOB</variable_type>
+        </field>
       </fields>
       <parallel>N</parallel>
       <draw>Y</draw>
@@ -807,6 +827,11 @@
           <variable_value>0</variable_value>
           <variable_type>CURRENT_JOB</variable_type>
         </field>
+        <field>
+          <variable_name>gridmaster</variable_name>
+          <variable_value>李玉锋</variable_value>
+          <variable_type>CURRENT_JOB</variable_type>
+        </field>
       </fields>
       <parallel>N</parallel>
       <draw>Y</draw>
@@ -849,6 +874,11 @@
           <variable_value>18</variable_value>
           <variable_type>CURRENT_JOB</variable_type>
         </field>
+        <field>
+          <variable_name>gridmaster</variable_name>
+          <variable_value>王坤</variable_value>
+          <variable_type>CURRENT_JOB</variable_type>
+        </field>
       </fields>
       <parallel>N</parallel>
       <draw>Y</draw>