Merge remote-tracking branch 'origin/TCM0513' into testNew

src/js/cdss.js

@@ -55,6 +55,7 @@ let allInterface = 0
 let hasCompleteTnterface = 0
 let moduleNum = 0
 let mrId = getUrlArgObject('mrId')
+let isTcm = getUrlArgObject('isTcm')
 let pushMrId = getUrlArgObject('pushMrId')
 const tipsMode = getUrlArgObject('tipsMode') || 1
 let planCode = getUrlArgObject('planCode') || 'all'
@@ -213,11 +214,11 @@ function renderPage(pageSet){
   const hasAuxiliary = hasTab("辅助信息",pageSet.sysSetInfo)
   const hasMedical = hasTab("医学知识",pageSet.sysSetInfo)
   const hasFollowUp = hasTab("随访计划",pageSet.sysSetInfo)
-    const hasTcm = hasTab("中医辅助", pageSet.sysSetInfo);
+  const hasTcm = hasTab("中医辅助", pageSet.sysSetInfo);
 
-    if (hasTcm) {
-        getTcmMr(mrId, hasTcm);
-    }
+  if (hasTcm) {
+      getTcmMr(mrId, hasTcm);
+  }
   if(!mrId){
     empty()
     return
@@ -672,8 +673,12 @@ function renderTab(tabList){
       
     }
     $(".tabList").append(tabStr)
-    $(".tabList .tab").eq(0).addClass("activeTab")
-    let showModuleName =  $(".tabList .tab").eq(0).attr("data-name")
+    let tabNum = 0;
+    if(isTcm=='true'){
+        tabNum = $(".tabList .tab").length-1;
+    }
+    $(".tabList .tab").eq(tabNum).addClass("activeTab")
+    let showModuleName =  $(".tabList .tab").eq(tabNum).attr("data-name")
     getModuleShow(moduleConfig[showModuleName])
     bindTabClick()
 }