diff --git a/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitDocumentAnalysisCmd.java b/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitDocumentAnalysisCmd.java
index 9ca5e37..c4e8bb0 100644
--- a/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitDocumentAnalysisCmd.java
+++ b/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitDocumentAnalysisCmd.java
@@ -95,15 +95,15 @@ public class CockpitDocumentAnalysisCmd {
             doclist.add(docMap);
 
 
-            docMap = new HashMap<String,String>();
-            String doc_count7 = getDocumentDateAmount7(employeeId,tenantKey);
-            String doc_name7 = "下属知识";
-            String doc_pkey7 = "document.subordinate.create";
-            String doc_url7 =  jucailinCockpitUtils.getUfPropData(doc_pkey7,tenantKey);
-            docMap.put("count",doc_count7);
-            docMap.put("name",doc_name7);
-            docMap.put("url",doc_url7);
-            doclist.add(docMap);
+//            docMap = new HashMap<String,String>();
+//            String doc_count7 = getDocumentDateAmount7(employeeId,tenantKey);
+//            String doc_name7 = "下属知识";
+//            String doc_pkey7 = "document.subordinate.create";
+//            String doc_url7 =  jucailinCockpitUtils.getUfPropData(doc_pkey7,tenantKey);
+//            docMap.put("count",doc_count7);
+//            docMap.put("name",doc_name7);
+//            docMap.put("url",doc_url7);
+//            doclist.add(docMap);
 
 
             docMap = new HashMap<String,String>();
@@ -308,7 +308,7 @@ public class CockpitDocumentAnalysisCmd {
                 Map<String, Object> result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam);
                 List<Map<String,Object>> recordList = databaseUtils.getDataSourceList(result);
                 if(recordList.size()>0){
-                    count = String.valueOf(recordList.get(0).get("cou"));
+                    count = String.valueOf(recordList.get(0).get("zjf"));
                 }
             }
         } catch (Exception e) {
diff --git a/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitUserDataCmd.java b/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitUserDataCmd.java
index 62dace9..f6b17da 100644
--- a/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitUserDataCmd.java
+++ b/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitUserDataCmd.java
@@ -148,9 +148,8 @@ public class CockpitUserDataCmd {
                 log.error("jobcallid:" + jobcallid);
                 if (StringUtils.isNotBlank(jobcallid + "")) {
                     String sql =" select data_name from eteams.hrm_jobcall " +
-                            " where id = ? " +
-                            " and delete_type = 0\n" +
-                            " and tenant_key = ? \n";
+                                " where id = ? " +
+                                " and tenant_key = ? \n";
                     log.error("sql:" + sql);
                     List<SqlParamEntity> sqlparam = new ArrayList<SqlParamEntity>();
                     SqlParamEntity sqlParamEntity = new SqlParamEntity();
@@ -179,15 +178,27 @@ public class CockpitUserDataCmd {
                 long formdata = employee.getFormdata();
                 log.error("formdata:" + formdata);
                 if (StringUtils.isNotBlank(formdata + "")) {
-                    String sql = " select field69 from eteams.Hrmemployeedefined where form_data_id = ?";
+
+                    String pkey = "field69.groupId";
+                    //weaver-ebuilder-form-service
+                    String groupId2 = jucailinCockpitUtils.getUfPropData(pkey, tenantKey);
+                    log.error("groupId2:" + groupId2);
+
+                    String sql = " select field69 from eteams.Hrmemployeedefined where form_data_id = ? and tenant_key = ? ";
                     log.error("getSelfServiceData--sql:" + sql);
 
                     List<SqlParamEntity> sqlparam = new ArrayList<SqlParamEntity>();
                     SqlParamEntity sqlParamEntity = new SqlParamEntity();
-                    sqlParamEntity.setParamType(SqlParamType.LONG);
+                    sqlParamEntity.setParamType(SqlParamType.VARCHAR);
                     sqlParamEntity.setValue(formdata + "");
                     sqlparam.add(sqlParamEntity);
-                    Map<String, Object> result = databaseUtils.executeForQuery(sourceType, groupId, sql, sqlparam);
+
+                    sqlParamEntity = new SqlParamEntity();
+                    sqlParamEntity.setParamType(SqlParamType.VARCHAR);
+                    sqlParamEntity.setValue(tenantKey);
+                    sqlparam.add(sqlParamEntity);
+
+                    Map<String, Object> result = databaseUtils.executeForQuery(sourceType, groupId2, sql, sqlparam);
                     List<Map<String, Object>> recordList = databaseUtils.getDataSourceList(result);
                     if (recordList.size() > 0) {
                         field69 = String.valueOf(recordList.get(0).get("field69"));
@@ -328,8 +339,16 @@ public class CockpitUserDataCmd {
                 log.error("getDataInfo9:"+e);
             }
 
-            String userimageurl = "/profile/" + employeeId + "/personal";
+            String addTagUrl = "" ;
+            try{
+                String pkey = "cockpit.userdate.addtag";
+                addTagUrl = jucailinCockpitUtils.getUfPropData(pkey, tenantKey);
+                log.error("addTagUrl:" + addTagUrl);
+            }catch (Exception e){
+
+            }
 
+            String userimageurl = "/profile/" + employeeId + "/personal";
             userMap.put("employeeId", employeeId);
             userMap.put("username", username);
             userMap.put("deptmentnnme", subcompanynme + "-" + deptname);
@@ -341,6 +360,7 @@ public class CockpitUserDataCmd {
             userMap.put("field69", field69);
             userMap.put("avatarUrl", avatarUrl);
             userMap.put("changeList", changeList);
+            userMap.put("addTagUrl", addTagUrl);
 
         }catch (Exception e){
             e.printStackTrace();
diff --git a/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitWorkflowAnalysisCmd.java b/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitWorkflowAnalysisCmd.java
index c0b65f4..1b3d36f 100644
--- a/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitWorkflowAnalysisCmd.java
+++ b/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitWorkflowAnalysisCmd.java
@@ -117,7 +117,8 @@ public class CockpitWorkflowAnalysisCmd {
 
 
             wfMap = new HashMap<String,String>();
-            String wf_count5 = getWorkflowDataAmount(employee,RequestListInitDimensionTabEnum.ATTENTION_ALL.getTabid());
+            Long employeeid = employee.getEmployeeId();
+            String wf_count5 = getWatchWorkflowDataAmount(employeeid,tenantKey);
             String wf_name5 = "我关注的流程";
             String wf_pkey5 = "workflow.attention.amount";
             String wf_url5 =  jucailinCockpitUtils.getUfPropData(wf_pkey5,tenantKey);
@@ -165,6 +166,43 @@ public class CockpitWorkflowAnalysisCmd {
     }
 
 
+    public String getWatchWorkflowDataAmount(Long employeeId,String tenantKey) {
+        String count = "0";
+        String groupId = "weaver-doc-service";
+        String sourceType = "LOGIC";
+
+        try {
+            String sql =" select count(1) as cou \n" +
+                        " from my_watch  \n" +
+                        " where watcher = ? \n" +
+                        " and module='workflow' \n" +
+                        " and delete_type = 0 \n" +
+                        " and tenant_key=? " ;
+
+            List<SqlParamEntity> sqlparam = new ArrayList<SqlParamEntity>();
+            SqlParamEntity sqlParamEntity = new SqlParamEntity();
+            sqlParamEntity.setParamType(SqlParamType.LONG);
+            sqlParamEntity.setValue(employeeId+"");
+            sqlparam.add(sqlParamEntity);
+
+            sqlParamEntity = new SqlParamEntity();
+            sqlParamEntity.setParamType(SqlParamType.VARCHAR);
+            sqlParamEntity.setValue(tenantKey);
+            sqlparam.add(sqlParamEntity);
+
+            Map<String, Object> result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam);
+            List<Map<String,Object>> recordList = databaseUtils.getDataSourceList(result);
+            if(recordList.size()>0){
+                count = String.valueOf(recordList.get(0).get("cou"));
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("getDocCreateNum:" + e);
+        }
+        return count;
+    }
+
+
     /***
      *
      * @param employee
@@ -209,7 +247,7 @@ public class CockpitWorkflowAnalysisCmd {
                     }
                     log.error("minutescount:"+minutescount);
                     if(requestLength > 0 && minutescount > 0){
-                        double average = minutescount/requestLength ;
+                        double average = minutescount/(wfcount*1.0) ;
                         count = String.valueOf(average);
                     }
                 }
@@ -244,6 +282,8 @@ public class CockpitWorkflowAnalysisCmd {
         log.error("wf_count3:"+wf_count3);
         try{
             long employeeId = employee.getEmployeeId();
+
+
             String dataSql =" select a.hiredate,datediff(curdate(),a.hiredate) as diffdays " +
                             " from eteams.employee a   " +
                             " where a.id = ?   " +