diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/AssessFactorMapper.xml b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/AssessFactorMapper.xml
index bd40879..3c97f70 100644
--- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/AssessFactorMapper.xml
+++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/AssessFactorMapper.xml
@@ -202,7 +202,7 @@
             and DATE_FORMAT(CREATE_TIME,'%Y-%m-%d') <= #{countCondition.endDate}
         </if>
         <if test="countCondition.areaId!=null and countCondition.areaId!=''">
-            and AREA_CODE = #{countCondition.areaId}
+            and GRID_ID = #{countCondition.areaId}
         </if>
         <if test="countCondition.source!=null and countCondition.source!=''">
             and SOURCE = #{countCondition.source}

diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/AssessFactorMapper.xml b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/AssessFactorMapper.xml
index bd40879..3c97f70 100644
--- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/AssessFactorMapper.xml
+++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/AssessFactorMapper.xml
@@ -202,7 +202,7 @@
             and DATE_FORMAT(CREATE_TIME,'%Y-%m-%d') &lt;= #{countCondition.endDate}
         </if>
         <if test="countCondition.areaId!=null and countCondition.areaId!=''">
-            and AREA_CODE = #{countCondition.areaId}
+            and GRID_ID = #{countCondition.areaId}
         </if>
         <if test="countCondition.source!=null and countCondition.source!=''">
             and SOURCE = #{countCondition.source}
diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/DepartmentAssessMapper.xml b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/DepartmentAssessMapper.xml
index 6b54419..db6ebbd 100644
--- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/DepartmentAssessMapper.xml
+++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/DepartmentAssessMapper.xml
@@ -28,13 +28,14 @@
         SELECT COUNT(*) AS CurrentCheckNum,s.FULLNAME AS departName FROM dcm_cws_case c
         RIGHT JOIN sys_dept s ON s.ID=c.ONEDEPTID
         RIGHT JOIN dcm_cws_status d ON d.ID=c.ID
+        RIGHT JOIN dcm_cws_process_detail p ON c.ID= p.ID
         WHERE c.DEL_FlAG=0
         AND s.status=0
         <if test="beg!=null and beg!=''">
-            AND date_format(d.NODE_LIMITTIME,'%Y-%m-%d')>= #{beg}
+            AND date_format(p.DISTRIBUTE_TIME,'%Y-%m-%d')>= #{beg}
         </if>
         <if test="end!=null and end!=''">
-            AND date_format(d.NODE_LIMITTIME,'%Y-%m-%d') &lt;= #{end}
+            AND date_format(p.DISTRIBUTE_TIME,'%Y-%m-%d') &lt;= #{end}
         </if>
         <if test="status==null or status==''">
             AND d.PROCESS_STATE IN(1,2)
@@ -68,10 +69,11 @@
         SELECT COUNT(*) AS lastCheckNum,s.FULLNAME AS departName FROM dcm_cws_case c
         RIGHT JOIN sys_dept s ON s.ID=c.ONEDEPTID
         RIGHT JOIN dcm_cws_status d ON d.ID=c.ID
+        left JOIN dcm_cws_process_detail p ON c.ID= p.ID
         WHERE c.DEL_FlAG=0 AND d.PROCESS_STATE =1
         AND s.status=0
         <if test="beg!=null and beg!=''">
-            AND date_format(d.NODE_LIMITTIME,'%Y-%m-%d') &lt; #{beg}
+            AND date_format(p.DISTRIBUTE_TIME,'%Y-%m-%d') &lt; #{beg}
         </if>
         GROUP BY s.FULLNAME
     </select>
@@ -85,10 +87,10 @@
         AND P.CLOSE_CASE_PERSONID IS NULL
         AND d.PROCESS_STATE IN(1,2)
         <if test="beg!=null and beg!=''">
-            AND date_format(d.NODE_LIMITTIME,'%Y-%m-%d')>= #{beg}
+            AND date_format(p.DISTRIBUTE_TIME,'%Y-%m-%d')>= #{beg}
         </if>
         <if test="end!=null and end!=''">
-            AND date_format(d.NODE_LIMITTIME,'%Y-%m-%d') &lt;= #{end}
+            AND date_format(p.DISTRIBUTE_TIME,'%Y-%m-%d') &lt;= #{beg}
         </if>
         GROUP BY s.FULLNAME
     </select>
@@ -104,10 +106,11 @@
         RIGHT JOIN sys_dept s ON s.ID=c.ONEDEPTID
         RIGHT JOIN dcm_cws_status d ON d.ID=c.ID
         LEFT JOIN sys_dict sd ON sd.code=c.CASE_STATE
+        LEFT JOIN dcm_cws_process_detail p ON c.ID= p.ID
         WHERE c.DEL_FlAG=0 AND d.PROCESS_STATE =1
         AND sd.pid=91 AND s.status=0
         <if test="beg!=null and beg!=''">
-            AND date_format(d.NODE_LIMITTIME,'%Y-%m-%d') &lt; #{beg}
+            AND date_format(p.DISTRIBUTE_TIME,'%Y-%m-%d') &lt; #{beg}
         </if>
         <if test="depId!=null and depId!=''">
             AND c.ONEDEPTID=#{depId}
@@ -126,12 +129,13 @@
         RIGHT JOIN sys_dept s ON s.ID=c.ONEDEPTID
         RIGHT JOIN dcm_cws_status d ON d.ID=c.ID
         LEFT JOIN sys_dict sd ON sd.code=c.CASE_STATE
+        LEFT JOIN dcm_cws_process_detail p ON c.ID= p.ID
         WHERE c.DEL_FlAG=0 AND sd.pid=91 AND s.status=0
         <if test="beg!=null and beg!=''">
-            AND date_format(d.NODE_LIMITTIME,'%Y-%m-%d')>= #{beg}
+            AND date_format(p.DISTRIBUTE_TIME,'%Y-%m-%d')>= #{beg}
         </if>
         <if test="end!=null and end!=''">
-            AND date_format(d.NODE_LIMITTIME,'%Y-%m-%d') &lt;= #{end}
+            AND date_format(p.DISTRIBUTE_TIME,'%Y-%m-%d') &lt;= #{end}
         </if>
         <if test="status==null or status==''">
             AND d.PROCESS_STATE IN(1,2)
@@ -172,10 +176,10 @@
         AND P.CLOSE_CASE_PERSONID IS NULL
         AND d.PROCESS_STATE IN(1,2)
         <if test="beg!=null and beg!=''">
-            AND date_format(d.NODE_LIMITTIME,'%Y-%m-%d')>= #{beg}
+            AND date_format(p.DISTRIBUTE_TIME,'%Y-%m-%d')>= #{beg}
         </if>
         <if test="end!=null and end!=''">
-            AND date_format(d.NODE_LIMITTIME,'%Y-%m-%d') &lt;= #{end}
+            AND date_format(p.DISTRIBUTE_TIME,'%Y-%m-%d') &lt;= #{end}
         </if>
 
         <if test="depId!=null and depId!=''">

diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/AssessFactorMapper.xml b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/AssessFactorMapper.xml
index bd40879..3c97f70 100644
--- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/AssessFactorMapper.xml
+++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/AssessFactorMapper.xml
@@ -202,7 +202,7 @@
             and DATE_FORMAT(CREATE_TIME,'%Y-%m-%d') &lt;= #{countCondition.endDate}
         </if>
         <if test="countCondition.areaId!=null and countCondition.areaId!=''">
-            and AREA_CODE = #{countCondition.areaId}
+            and GRID_ID = #{countCondition.areaId}
         </if>
         <if test="countCondition.source!=null and countCondition.source!=''">
             and SOURCE = #{countCondition.source}
diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/DepartmentAssessMapper.xml b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/DepartmentAssessMapper.xml
index 6b54419..db6ebbd 100644
--- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/DepartmentAssessMapper.xml
+++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/DepartmentAssessMapper.xml
@@ -28,13 +28,14 @@
         SELECT COUNT(*) AS CurrentCheckNum,s.FULLNAME AS departName FROM dcm_cws_case c
         RIGHT JOIN sys_dept s ON s.ID=c.ONEDEPTID
         RIGHT JOIN dcm_cws_status d ON d.ID=c.ID
+        RIGHT JOIN dcm_cws_process_detail p ON c.ID= p.ID
         WHERE c.DEL_FlAG=0
         AND s.status=0
         <if test="beg!=null and beg!=''">
-            AND date_format(d.NODE_LIMITTIME,'%Y-%m-%d')>= #{beg}
+            AND date_format(p.DISTRIBUTE_TIME,'%Y-%m-%d')>= #{beg}
         </if>
         <if test="end!=null and end!=''">
-            AND date_format(d.NODE_LIMITTIME,'%Y-%m-%d') &lt;= #{end}
+            AND date_format(p.DISTRIBUTE_TIME,'%Y-%m-%d') &lt;= #{end}
         </if>
         <if test="status==null or status==''">
             AND d.PROCESS_STATE IN(1,2)
@@ -68,10 +69,11 @@
         SELECT COUNT(*) AS lastCheckNum,s.FULLNAME AS departName FROM dcm_cws_case c
         RIGHT JOIN sys_dept s ON s.ID=c.ONEDEPTID
         RIGHT JOIN dcm_cws_status d ON d.ID=c.ID
+        left JOIN dcm_cws_process_detail p ON c.ID= p.ID
         WHERE c.DEL_FlAG=0 AND d.PROCESS_STATE =1
         AND s.status=0
         <if test="beg!=null and beg!=''">
-            AND date_format(d.NODE_LIMITTIME,'%Y-%m-%d') &lt; #{beg}
+            AND date_format(p.DISTRIBUTE_TIME,'%Y-%m-%d') &lt; #{beg}
         </if>
         GROUP BY s.FULLNAME
     </select>
@@ -85,10 +87,10 @@
         AND P.CLOSE_CASE_PERSONID IS NULL
         AND d.PROCESS_STATE IN(1,2)
         <if test="beg!=null and beg!=''">
-            AND date_format(d.NODE_LIMITTIME,'%Y-%m-%d')>= #{beg}
+            AND date_format(p.DISTRIBUTE_TIME,'%Y-%m-%d')>= #{beg}
         </if>
         <if test="end!=null and end!=''">
-            AND date_format(d.NODE_LIMITTIME,'%Y-%m-%d') &lt;= #{end}
+            AND date_format(p.DISTRIBUTE_TIME,'%Y-%m-%d') &lt;= #{beg}
         </if>
         GROUP BY s.FULLNAME
     </select>
@@ -104,10 +106,11 @@
         RIGHT JOIN sys_dept s ON s.ID=c.ONEDEPTID
         RIGHT JOIN dcm_cws_status d ON d.ID=c.ID
         LEFT JOIN sys_dict sd ON sd.code=c.CASE_STATE
+        LEFT JOIN dcm_cws_process_detail p ON c.ID= p.ID
         WHERE c.DEL_FlAG=0 AND d.PROCESS_STATE =1
         AND sd.pid=91 AND s.status=0
         <if test="beg!=null and beg!=''">
-            AND date_format(d.NODE_LIMITTIME,'%Y-%m-%d') &lt; #{beg}
+            AND date_format(p.DISTRIBUTE_TIME,'%Y-%m-%d') &lt; #{beg}
         </if>
         <if test="depId!=null and depId!=''">
             AND c.ONEDEPTID=#{depId}
@@ -126,12 +129,13 @@
         RIGHT JOIN sys_dept s ON s.ID=c.ONEDEPTID
         RIGHT JOIN dcm_cws_status d ON d.ID=c.ID
         LEFT JOIN sys_dict sd ON sd.code=c.CASE_STATE
+        LEFT JOIN dcm_cws_process_detail p ON c.ID= p.ID
         WHERE c.DEL_FlAG=0 AND sd.pid=91 AND s.status=0
         <if test="beg!=null and beg!=''">
-            AND date_format(d.NODE_LIMITTIME,'%Y-%m-%d')>= #{beg}
+            AND date_format(p.DISTRIBUTE_TIME,'%Y-%m-%d')>= #{beg}
         </if>
         <if test="end!=null and end!=''">
-            AND date_format(d.NODE_LIMITTIME,'%Y-%m-%d') &lt;= #{end}
+            AND date_format(p.DISTRIBUTE_TIME,'%Y-%m-%d') &lt;= #{end}
         </if>
         <if test="status==null or status==''">
             AND d.PROCESS_STATE IN(1,2)
@@ -172,10 +176,10 @@
         AND P.CLOSE_CASE_PERSONID IS NULL
         AND d.PROCESS_STATE IN(1,2)
         <if test="beg!=null and beg!=''">
-            AND date_format(d.NODE_LIMITTIME,'%Y-%m-%d')>= #{beg}
+            AND date_format(p.DISTRIBUTE_TIME,'%Y-%m-%d')>= #{beg}
         </if>
         <if test="end!=null and end!=''">
-            AND date_format(d.NODE_LIMITTIME,'%Y-%m-%d') &lt;= #{end}
+            AND date_format(p.DISTRIBUTE_TIME,'%Y-%m-%d') &lt;= #{end}
         </if>
 
         <if test="depId!=null and depId!=''">
diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/impl/CaseFlowServiceImpl.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/impl/CaseFlowServiceImpl.java
index 1e83cde..dc3387c 100644
--- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/impl/CaseFlowServiceImpl.java
+++ b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/impl/CaseFlowServiceImpl.java
@@ -147,17 +147,17 @@
             int count = 0;
             FlowNextnode autoNode = null;
             for (FlowNextnode nextnode : flowNextnodes) {
-                if (Const.ONE.equals(nextnode.getIsAuto())) {
-                    count++;
-                    autoNode = nextnode;
-                }
+//                if (Const.ONE.equals(nextnode.getIsAuto())) {
+//                    count++;
+//                    autoNode = nextnode;
+//                }
             }
             if (count == 1) {
                 //执行自动流转 流程处理handler中会进行推送处理
                 dto.setCurrState(autoNode.getState());
                 dto.setChangeState(autoNode.getNextState());
                 if (ToolUtil.isEmpty(dto.getIsPush())) {
-                    dto.setIsPush(autoNode.getIsPush());
+//                    dto.setIsPush(autoNode.getIsPush());
                 }
                 this.completeCaseTask(dto);
             }