diff --git a/app/src/main/java/com/zj365/dc/fragment/DynamicManagementFrag.kt b/app/src/main/java/com/zj365/dc/fragment/DynamicManagementFrag.kt
index 99721a8..deedbe0 100644
--- a/app/src/main/java/com/zj365/dc/fragment/DynamicManagementFrag.kt
+++ b/app/src/main/java/com/zj365/dc/fragment/DynamicManagementFrag.kt
@@ -181,7 +181,7 @@ class DynamicManagementFrag : BaseVmFrag<DynamicManagementVm>() , EasyPermission
         binding.mGriddingList.mGridView.setOnItemClickListener { _, _, position, _ ->
             val index = mHealthAdapter.getItem(position).type
             val functionType = mHealthAdapter.getItem(position).functionType
-            onEventObject(requireContext(), UmengEventId.HealthMonitor, pageNames[index])
+            onEventObject(requireContext(), UmengEventId.HealthMonitor, mHealthAdapter.getItem(position).buttonName)
             when (functionType) {
                 //（   ）0.心率、1.血氧、2.呼吸率、3.体温、4.步数、5.睡眠、6.血压、7.血糖、8.心电、9.尿酸、10.血脂。
                 //（U32）0.心率、1.血氧、2.呼吸率、3.体温、     、4.睡眠、5.血压、6.血糖、7.尿酸、8.心电,9血脂
diff --git a/app/src/main/java/com/zj365/dc/fragment/HealthHomeFrag.kt b/app/src/main/java/com/zj365/dc/fragment/HealthHomeFrag.kt
index 0d6dd3f..1e20caf 100644
--- a/app/src/main/java/com/zj365/dc/fragment/HealthHomeFrag.kt
+++ b/app/src/main/java/com/zj365/dc/fragment/HealthHomeFrag.kt
@@ -608,26 +608,25 @@ HealthHomeFrag : BaseVmFrag<HomeVm>() {
 
         mViewModel.videoDoctorLive.observe(this){
             if (it.data.type == 2){
-                CallKit.startCallKitLogic(requireActivity(),it.data.data)
+                CallKit.startCallKitLogic(requireActivity(),it.data.url)
             }else{
-               /* val appId = "wx032bacb749c0dcb0" // 填移动应用(App)的 AppId，非小程序的 AppID
+                val appId = "wx032bacb749c0dcb0" // 填移动应用(App)的 AppId，非小程序的 AppID
 
                 val api = WXAPIFactory.createWXAPI(requireContext(), appId)
 
                 val req = WXLaunchMiniProgram.Req()
-                req.userName = contentData.wxId // 填小程序原始id
+                req.userName = it.data.wxid // 填小程序原始id
 
-//                req.path = contentData.jumpUrl ////拉起小程序页面的可带参路径，不填默认拉起小程序首页，对于小游戏，可以只传入 query 部分，来实现传参效果，如：传入 "?foo=bar"。
-//                if(contentData.wxType == 3){
+                req.path = it.data.url ////拉起小程序页面的可带参路径，不填默认拉起小程序首页，对于小游戏，可以只传入 query 部分，来实现传参效果，如：传入 "?foo=bar"。
+                if(it.data.wxtype== 1){
                     req.miniprogramType =
                         WXLaunchMiniProgram.Req.MINIPTOGRAM_TYPE_RELEASE // 可选打开 开发版，体验版和正式版
-                *//*}else{
-                    req.miniprogramType =
-                        WXLaunchMiniProgram.Req.MINIPROGRAM_TYPE_PREVIEW // 可选打开 开发版，体验版和正式版
-                }*//*
-
+                  }else{
+                      req.miniprogramType =
+                          WXLaunchMiniProgram.Req.MINIPROGRAM_TYPE_PREVIEW // 可选打开 开发版，体验版和正式版
+                  }
 
-                api.sendReq(req)*/
+                api.sendReq(req)
             }
         }
     }
diff --git a/base/src/main/java/com/xty/base/fragment/BaseVmFrag.kt b/base/src/main/java/com/xty/base/fragment/BaseVmFrag.kt
index 1fe02ec..4ec772d 100644
--- a/base/src/main/java/com/xty/base/fragment/BaseVmFrag.kt
+++ b/base/src/main/java/com/xty/base/fragment/BaseVmFrag.kt
@@ -29,7 +29,7 @@ abstract class BaseVmFrag<T : BaseVm> : IBaseFrag() {
 
         mViewModel.nowData.observe(this) {
             loadingView.dismiss()
-            ToastUtils.show(R.string.again_login)
+//            ToastUtils.show(R.string.again_login)
 
             //RxActivityTool.finishAllActivity()
             MMkvHelper.clearUserInfo()
diff --git a/health/src/main/java/com/zj365/health/act/HealthMainAct.kt b/health/src/main/java/com/zj365/health/act/HealthMainAct.kt
index 4518fe1..cb32b36 100644
--- a/health/src/main/java/com/zj365/health/act/HealthMainAct.kt
+++ b/health/src/main/java/com/zj365/health/act/HealthMainAct.kt
@@ -53,7 +53,7 @@ class HealthMainAct : BaseVmAct<HealthMainVm>() {
     var page = 0
     val binding by lazy { ActHealthMainBinding.inflate(layoutInflater) }
     var listFragment = mutableListOf<Fragment>()
-    var tabName = arrayOf<Int>()
+   // var tabName = arrayOf<Int>()
     var id = ""
     var sex = "1"
     var functionType:String = ""
@@ -91,12 +91,12 @@ class HealthMainAct : BaseVmAct<HealthMainVm>() {
             initTab(functionList)
             initVp2(functionList)
         }
-        tabName =  arrayOf(
+        /*tabName =  arrayOf(
             R.string.info_1, R.string.info_3, R.string.info_7,
             R.string.info_4, R.string.info_6, R.string.info_2,
-            R.string.info_8, R.string.info_11/*, R.string.info_5,
-                    R.string.info_10*/
-        )
+            R.string.info_8, R.string.info_11*//*, R.string.info_5,
+                    R.string.info_10*//*
+        )*/
 
         statusBar(binding.title.mView)
         initTitle()
@@ -224,7 +224,7 @@ class HealthMainAct : BaseVmAct<HealthMainVm>() {
                 onEventObject(
                     baseContext,
                     UmengEventId.HealthMonitor,
-                    "${getString(tabName[position])}监测详情页"
+                    "${functionList[position].name}监测详情页"
                 )
                 changeTitle(position)
             }
diff --git a/network/src/main/java/com/xty/network/model/VideoDoctorBean.kt b/network/src/main/java/com/xty/network/model/VideoDoctorBean.kt
index 4c184af..d96e45b 100644
--- a/network/src/main/java/com/xty/network/model/VideoDoctorBean.kt
+++ b/network/src/main/java/com/xty/network/model/VideoDoctorBean.kt
@@ -1,7 +1,10 @@
 package com.xty.network.model
 
 data class VideoDoctorBean (
-    val data:String,
+    val url:String,
+    val wxtype:Int,// 1=正式  2=测试
+
+    val wxid:String,
     val type:Int //	类型：1-和缓（跳转小程序） 2-春雨（H5打开） 3-平安（跳转小程序）
 ) {
 }
\ No newline at end of file