Merge branch 'CDSS6.0.0' of http://192.168.2.236:10080/zhouna/icssDService into CDSS6.0.0

src/html/cdssHorizontal.html

@@ -44,6 +44,10 @@
         </div>
         <div class="qcWrap moduleWrapper">
         
+        </div>
+        
+        <div class="followUpWrap moduleWrapper">
+            
         </div>
         <div class="medicalKonwledgeWrap moduleWrapper">
          <div class="searchBox">

src/js/cdss.js

@@ -445,6 +445,7 @@ function renderDiagItem(list,name,number){
   if(list.length === 0){
     return
   }
+  moduleNum++
   let titleStr = titleStr2(name)
   let {shortStr, longStr} = renderItemWrapper(list,number,1,true)
   let boxStr = `<div class="moduleBox">

src/js/cdssHorizontal.js

@@ -91,6 +91,7 @@ function renderPage(pageSet){
   $(".contentWrapper").css("height",iframeHei-tabHei-10-20-30+'px')
   const hasAuxiliary = hasTab("辅助信息",pageSet.sysSetInfo)
   const hasMedical = hasTab("医学知识",pageSet.sysSetInfo)
+  const hasFollowUp = hasTab("随访计划",pageSet.sysSetInfo)
  
   if(hasAuxiliary){
     renderModuleWrapper(hasAuxiliary.planDetails)
@@ -109,6 +110,9 @@ function renderPage(pageSet){
       renderCaseWrite()
       allInterface++
     }
+  if(hasFollowUp){
+    // renderFollowUp(msg)
+  }
   }
  }
  function renderTab(tabList){

src/js/staticSearch.js

@@ -124,7 +124,7 @@ function getKnowledgeData(value) {
                 for(var i = 0;i<knowledgeLis.length;i++){
                     var tmpPart = knowledgeLis[i]
                     var tmpLi = `<li data-name='${tmpPart.name}' data-uname='${tmpPart.uniqueName}' data-type='${tmpPart.libTypeId}' data-sign='${tmpPart.type}'>
-                        <p>${tmpPart.name}<i>${tmpPart.libTypeName?('( '+tmpPart.libTypeName+' )'):''}</i></p>
+                        <p>${tmpPart.name}<i>${tmpPart.typeName?('( '+tmpPart.typeName+' )'):''}</i></p>
                         ${tmpPart.retrievalName?('<span>• '+tmpPart.retrievalName+'</span>'):''}
                     </li>`
                     lisStr += tmpLi