zhangxc 4 years ago
parent
commit
3d8ddceba4

+ 9 - 4
src/css/cdss.less

@@ -2,6 +2,7 @@
 body{
     overflow: hidden;
     position: relative;
+    background: #fff;
 }
 .bodyWrap{
     position: fixed;
@@ -10,7 +11,7 @@ body{
 }
 .iframeWrap {
     margin: 10px auto 50px;
-    padding: 0 20px 20px 20px;
+    // padding: 0 20px 20px 20px;
     min-width: 340px;
     overflow-y: hidden;
 }
@@ -23,9 +24,10 @@ body{
     font-size: 12px;
     color: #979797;
     padding-top: 15px;
-    position: fixed;
+    position: absolute;
+    left: 0;
     width: 100%;
-    bottom: 30px;
+    bottom: 10px;
     background-color: #fff;
 }
 .disclaimer {
@@ -286,6 +288,8 @@ body{
 .tabList{
     line-height: 39px;
     margin-bottom: 10px;
+    padding: 0 20px 0 20px;
+    box-sizing: border-box;
 }
 .tab{
     font-size:18px;
@@ -311,8 +315,9 @@ body{
 }
 .recommendWrap{
     position: absolute;
+    box-sizing: border-box;
     width: 100%;
-    padding: 0 0 50px 0;
+    padding: 0 20px 50px 20px;
 }
 .staticSearchB ul{
     position: absolute;

+ 42 - 11
src/css/information.less

@@ -15,7 +15,7 @@
 
   body {
     font-size: 14px;
-    overflow-y: scroll;
+    overflow-y: hidden;
     font-family: '微软雅黑', '宋体';
     background: #dde2ea;
     height: 100%;
@@ -24,14 +24,14 @@
   }
 
   h1 {
-    margin: 0 0px 30px 0px !important;
-    font-size: 28px !important;
+    margin: 0 0px 25px 0px !important;
+    font-size: 22px !important;
     line-height: 37px;
-    padding: 0 0 0 20px;
+    padding: 0 0 0 40px;
   }
 
   .titleH2 {
-    font-size: 22px;
+    font-size: 16px;
     position: relative;
     background: #fff;
     padding-right: 6px;
@@ -49,7 +49,7 @@
     margin: 0 0 20px 0;
   }
   .infoWrapper {
-    padding: 0 0 0 20px;
+    padding: 0 0 0 40px;
   }
   .circleBox {
     position: absolute;
@@ -61,8 +61,8 @@
   }
   .circle {
     display: inline-block;
-    width: 12px;
-    height: 12px;
+    width: 10px;
+    height: 10px;
     border-radius: 50%;
     background: #3B9ED0;
     position: relative;
@@ -90,12 +90,18 @@
   }
 
   .container {
-    width: 80%;
+    width:100%;
     overflow: hidden;
     background: #fff;
     margin: 0 auto;
-    padding: 43px 0 30px 20px;
- 
+    padding: 40px 0 30px 0px;
+    display: none;
+    position: relative;
+    left: 0;
+    right: 0;
+  }
+  .staticKnowledge{
+    display: block;
   }
   pre {
     white-space: pre-wrap;
@@ -187,4 +193,29 @@
     -moz-user-select: none;
     -ms-user-select: none;
     user-select: none;
+  }
+  .tabBox{
+    position: relative;
+    background: #fff;
+    height: 60px;
+    border-bottom: 1px solid #E6E6E6;
+    padding: 0 40px;
+  }
+  .tabList{
+    position: absolute;
+    bottom: 0;
+  }
+  .tab{
+    display: inline-block;
+    padding: 7px 18px;
+    margin-right: 5px;
+    background: #EEEEEE;
+    border-radius:6px 6px 0px 0px;
+    cursor: pointer;
+    font-size: 14px;
+    color: #333;
+  }
+  .activeTab{
+    background: #3B9ED0;
+    color: #fff;
   }

+ 1 - 0
src/css/staticSearch.css

@@ -64,6 +64,7 @@
     text-align: center;
     line-height: 40px;
     margin-top: 10px;
+    top: 150px;
 }
 .staticSearchB ul {
     position: absolute;

+ 29 - 1
src/html/information.html

@@ -15,7 +15,35 @@
 </head>
 
 <body>
-  <div class="container disCopy">
+  <div class="tabBox">
+    <div class="tabList">
+     
+    </div>
+  </div>
+  
+  <div class=" container disCopy staticKnowledge">
+    <h1></h1>
+    <div class="content">
+        <div class="infos"></div>
+        <div class="anchors">
+          <ul></ul>
+        </div>
+
+      
+    </div>
+  </div>
+  <div class=" container disCopy clinicalPathway">
+    <h1></h1>
+    <div class="content">
+        <div class="infos"></div>
+        <div class="anchors">
+          <ul></ul>
+        </div>
+
+      
+    </div>
+  </div>
+  <div class=" container disCopy notice">
     <h1></h1>
     <div class="content">
         <div class="infos"></div>

+ 100 - 42
src/js/cdss.js

@@ -18,11 +18,11 @@ let iconMark = require('./../images/icon_mark.png')
 const $ = require("jquery");
 const { post,config,getUrlArgObject,openNewWin,titleConfig } = require('./promise.js');
 const { transConf } = require('./util.js');
-const {renderWrapper, renderCaseStandard,renderWarning,renderRecommendInfo,renderMultRecommendInfo,renderRecommendConditTips} = require('./cdssDom.js');
+// const {renderWrapper, renderCaseStandard,renderWarning,renderRecommendInfo,renderMultRecommendInfo,renderRecommendConditTips} = require('./cdssDom.js');
 const { data } = require('jquery');
 const { render } = require('less');
 
-
+//静态知识类型: 1:诊断 2.药品 3.化验套餐 4.化验明细 5.辅检 6.手术和操作
 
 
 let moduleConfig={
@@ -41,7 +41,7 @@ let msg;
 function getMRInfo() {
    return post(config.getMr2,{mrId:mrId})
 }
-$('.loading').css("display","block")
+// $('.loading').css("display","block")
 $('.empty').css("display","none")
 getMRInfo().then(res =>{
     if(res.data.code == '0'){
@@ -90,11 +90,11 @@ function getConf() {
 }
 
 function getPushInfo() {
-  return  post(config.pushInner,Object.assign(msg,{featureType: '1,4,5,6,7,22',hospitalId:2,ruleType:config.ruleTypeMap['22']}))
+  return  post(config.pushInner,Object.assign(msg,{featureType: '1,4,5,6,7,8,9',hospitalId:msg.hospitalId||2,ruleType:config.ruleTypeMap['22']}))
   
 }
 function getPusgWarning(){
-  return  post(config.indicationPush,Object.assign(msg,{ruleType: '1,2,3,4',hospitalId:2,ruleType:config.ruleTypeMap['22']}))
+  return  post(config.indicationPush,Object.assign(msg,{ruleType: '1,2,3',hospitalId:msg.hospitalId||2}))
 }
 
 
@@ -187,10 +187,10 @@ function getVersion() {
   })
 }
 function getDisclaimer() {
-    post(config.disclaimer, "").then((res) => {
+    post(config.disclaimer, {}).then((res) => {
         const data = res.data.data.find(item => item.disclaimerCode == "2");
         $(".responsibility").html(data.description);
-        $(".iframeWrap").css({height: $(window).height()-115-$(".responsibility").height()+"px"})
+        // $(".iframeWrap").css({height: $(window).height()-115-$(".responsibility").height()+"px"})
 
     })
 }
@@ -199,7 +199,7 @@ function renderPage(pageSet){
     renderTab(pageSet.sysSetInfo)
     const iframeHei = $(".bodyWrap").height()
     const tabHei = $(".tabList").height()
-    $(".contentWrapper").css("height",iframeHei-tabHei-10+'px')
+    $(".contentWrapper").css("height",iframeHei-tabHei-10-20-30+'px')
     const hasAuxiliary = hasTab("辅助信息",pageSet.sysSetInfo)
     const hasMedical = hasTab("医学知识",pageSet.sysSetInfo)
  
@@ -224,26 +224,35 @@ function renderPushData(){
     if(res.data.code == "0"){
       const result = res.data.data
       let diagPush = result.dis 
-    
       let lisPush = result.lis || []
       let pacsPush = result.pacs || []
       let symptomPush = result.symptom ||[]
       let checkupPush = result.vital ||[]
-
+      let medicinesPush = result.medicines || []
+      let operationsPush = result.operations ||[]
       // let lisPush =[{name:"血常规",hisNameList:null},{name:"尿常规",hisNameList:null},{name:"尿常规",hisNameList:null},{name:"尿常规",hisNameList:null},{name:"尿常规",hisNameList:null},{name:"尿常规",hisNameList:null}]
       // let pacsPush = [{name:"胸部x射线",hisNameList:null},{name:"心电图",hisNameList:null}]
       // let checkupPush = [{name:"神志表情",hisNameList:null},{name:"面部表情",hisNameList:null}]
-      renderLis(lisPush,5,null,true)
-      renderPacs(pacsPush,5,null,true)
-      renderCheckup(checkupPush,5,null,false)
-      renderSymptomPush(symptomPush,5,null,true)
+      let lisNum = $(".moduleItem.lis").attr("data-num") || 5
+      let pacsNum = $(".moduleItem.pacs").attr("data-num") || 5
+      let checkupNum = $(".moduleItem.vital").attr("data-num") || 5
+      let symptomNum = $(".moduleItem.symptom").attr("data-num") || 5
+      let medicinesNum = $(".moduleItem.medicine").attr("data-num") || 5
+      let operationsNum = $(".moduleItem.operation").attr("data-num") || 5
+
+      renderLis(lisPush,lisNum,3,true)
+      renderPacs(pacsPush,pacsNum,5,true)
+      renderCheckup(checkupPush,checkupNum,null,false)
+      renderSymptomPush(symptomPush,symptomNum,null,false)
       renderDiag(diagPush)
-      if(hasCompleteTnterface === allInterface){
-        $('.loading').css("display","none")
-        if(moduleNum === 0){
-          empty()
-        }
-      }
+      renderMedicinesPush(medicinesPush,medicinesNum,2,true)
+      renderOperationPush(operationsPush,operationsNum,6,false)
+      // if(hasCompleteTnterface === allInterface){
+      //   $('.loading').css("display","none")
+      //   if(moduleNum === 0){ 
+      //     empty()
+      //   }
+      // }
       bindOpenInfo()
       bindSlide()
     }
@@ -285,13 +294,14 @@ function renderPushWarning(){
       renderBillingPush(criticalValList,'危急值提醒')
       renderBillingPush(noteList,'检查内容注意事项')
       // renderBillingPush(dubugStr,'注意调试信息')
-      if(hasCompleteTnterface === allInterface){
-        $('.loading').css("display","none")
-        if(moduleNum === 0){
-          empty()
-        }
-      }
+     
     }
+    // if(hasCompleteTnterface === allInterface){
+    //   $('.loading').css("display","none")
+    //   if(moduleNum === 0){
+    //     empty()
+    //   }
+    // }
     
   })
 }
@@ -310,6 +320,7 @@ function renderBillingPush(list,name){
         ${str}
       </div>`
   $(".tips").append(boxStr)
+  $('.moduleItem.tips').css("display","block")
 }
 
 
@@ -317,33 +328,49 @@ function renderDiag(diagPush){
   let possibleDiagPush = diagPush["可能诊断"] || []
   let firstDiagPush = diagPush["初步诊断"] || []
   let identifyDiagPush = diagPush["鉴别诊断"] || []
-
+  let warningDiagPush = diagPush["警惕"] || []
+  let number =  $('.moduleItem.diag').attr("data-num") || 5
+  let warnNumber =  $('.moduleItem.warning').attr("data-num") || 5
+  
+  $('.moduleItem.diag').append(titleStr("diagPush"))
   // let firstDiagPush =  [{name:"血常规",hisNameList:null},{name:"尿常规",hisNameList:null},{name:"尿常规",hisNameList:null},{name:"尿常规",hisNameList:null},{name:"尿常规",hisNameList:null},{name:"尿常规",hisNameList:null}]
   // let identifyDiagPush = diagPush["鉴别诊断"] ||  [{name:"血常规",hisNameList:null},{name:"尿常规",hisNameList:null},{name:"尿常规",hisNameList:null},{name:"尿常规",hisNameList:null},{name:"尿常规",hisNameList:null},{name:"尿常规",hisNameList:null}]
-  $('.moduleItem.diag').append(titleStr("diagPush"))
-  renderDiagItem(possibleDiagPush,"可能诊断")
-  renderDiagItem(firstDiagPush,"初步诊断")
-  renderDiagItem(identifyDiagPush,"鉴别诊断")
+  renderDiagItem(possibleDiagPush,"可能诊断",number)
+  renderDiagItem(firstDiagPush,"初步诊断",number)
+  renderDiagItem(identifyDiagPush,"鉴别诊断",number)
+  // renderWarningDiag(warningDiagPush,"警惕",warnNumber)
 
 }
 
-function renderDiagItem(list,name){
+function renderDiagItem(list,name,number){
   if(list.length === 0){
     return
   }
   let titleStr = titleStr2(name)
-  let {shortStr, longStr} = renderItemWrapper(list,5,null,true)
+  let {shortStr, longStr} = renderItemWrapper(list,number,1,true)
   let boxStr = `<div class="moduleBox">
         ${titleStr}
         ${shortStr}
         ${longStr}
       </div>`
   $(".diag").append(boxStr)
+  $('.moduleItem.diag').css("display","block")
+}
+function renderWarningDiag(list,name,number){
+  if(list.length > 0 &&  $(".moduleItem.warning").length > 0){
+    moduleNum++
+    $('.moduleItem.warning').append()
+    let str = ``
+    for(let i = 0; i < list.length; i++){
+      str+= renderPushItem(list[i].name,1,true)
+    }
+    $('.moduleItem.warning').append(str)
+    $('.moduleItem.lis').css("display","block")
+  }
 }
-
 
 function renderLis(list,showNum,type,hasInfo){
-  if(list.length > 0 &&  $(".moduleItem.pacs").length > 0){
+  if(list.length > 0 &&  $(".moduleItem.lis").length > 0){
     moduleNum++
     $('.moduleItem.lis').append(titleStr("lisPush"))
     let {shortStr, longStr} = renderItemWrapper(list,showNum,type,hasInfo)
@@ -373,15 +400,38 @@ function renderCheckup(list,showNum,type,hasInfo){
   }
 }
 function renderSymptomPush(list,showNum,type,hasInfo){
-  if(list.length > 0 &&  $(".moduleItem.vital").length > 0){
+  $(".moduleItem.symptom").append(titleStr('symptomPush'))
+
+  if(list.length > 0 &&  $(".moduleItem.symptom").length > 0){
     moduleNum++
-    $(".moduleItem.symptom").append(titleStr('symptomPush'))
     let {shortStr, longStr} = renderItemWrapper(list,showNum,type,hasInfo)
     $(".moduleItem.symptom").append(shortStr).append(longStr)
     $(".moduleItem.symptom").css("display","block")
   }
  
 }
+function renderMedicinesPush(list,showNum,type,hasInfo){
+  $(".moduleItem.medicine").append(titleStr('drugPush'))
+
+  if(list.length > 0 &&  $(".moduleItem.medicine").length > 0){
+    moduleNum++
+    let {shortStr, longStr} = renderItemWrapper(list,showNum,type,hasInfo)
+    $(".moduleItem.medicine").append(shortStr).append(longStr)
+    $(".moduleItem.medicine").css("display","block")
+  }
+ 
+}
+function renderOperationPush(list,showNum,type,hasInfo){
+  $(".moduleItem.operation").append(titleStr('operationPush'))
+
+  if(list.length > 0 &&  $(".moduleItem.operation").length > 0){
+    moduleNum++
+    let {shortStr, longStr} = renderItemWrapper(list,showNum,type,hasInfo)
+    $(".moduleItem.operation").append(shortStr).append(longStr)
+    $(".moduleItem.operation").css("display","block")
+  }
+ 
+}
 
 
 
@@ -443,9 +493,17 @@ function bindSlide(){
 function renderModuleWrapper(moduleList){
   let moduleStr = ''
   for(let i = 0; i < moduleList.length; i++){
-    if(moduleList[i].status !='0'){
-      moduleStr += `<div class="moduleItem ${moduleList[i].code}" style="display:none"></div>`
-    }
+    // if(moduleList[i].status !='0'){
+      if(moduleList[i].code == 'treat'){
+        moduleStr += `<div class="moduleItem medicine"  data-num="${moduleList[i].number}" style="display:none"></div>`
+        moduleStr += `<div class="moduleItem operation"  data-num="${moduleList[i].number}" style="display:none"></div>`
+      }else if(moduleList[i].code == 'tips'){
+        moduleStr += `<div class="moduleItem warning"  data-num="${moduleList[i].number}" style="display:none"></div>`
+        moduleStr += `<div class="moduleItem tips"  data-num="${moduleList[i].number}" style="display:none"></div>`
+      }else{
+        moduleStr += `<div class="moduleItem ${moduleList[i].code }"  data-num="${moduleList[i].number}" style="display:none"></div>`
+      }
+    // }
    
   }
   $(".recommendWrap").append(moduleStr)
@@ -508,8 +566,8 @@ function empty(){
 
 
 $(function(){
-  // getDisclaimer(); //获取免责声明
-  // getVersion();   //获取版本信息
+  getDisclaimer(); //获取免责声明
+  getVersion();   //获取版本信息
   $(".disclaimerInfo").on("click", function(){
     openNewWin("disclaimer.html")
   });

+ 1 - 1
src/js/disclaimer.js

@@ -3,7 +3,7 @@ const $ = require("jquery");
 
 $(function(){
   function getDisclaimer() {
-    post(config.disclaimer, '').then((res) => {
+    post(config.disclaimer, {}).then((res) => {
       const data = res.data.data.find(item => item.disclaimerCode == '3');
       $("h1").html('免责声明');
       $(".content").html(data.description);

+ 85 - 32
src/js/information.js

@@ -7,15 +7,18 @@ const {
   getUrlArgObject
 } = require('./promise.js');
 const $ = require("jquery");
+const { render } = require('less');
+let showName,noticeName,clinicalPathwayName
 
 function getInfomation() {
   var param = {
     "type": getUrlArgObject('type'),
     "name": getUrlArgObject('name'),
-    "position": getUrlArgObject('position')
+    "position": getUrlArgObject('position'),
+    "contentTypes":[1,2,3]
   };
   const uname = getUrlArgObject('uname')
-  const showName = param.name
+  showName = param.name
   if (param.type == 5 || param.type == 51) {
     param.type = 12;
     param.name = uname;
@@ -27,46 +30,63 @@ function getInfomation() {
     var str = '';
     var anchors = '';
     var item = '';
+    console.log('data',data)
     if (!data) {
       $("h1").html("暂时没有数据");
       $(".anchors").css("display", "none");
       return;
     }
-    var list = data.details;
-    $("h1").html(showName);
+    var detailList = data.details
+    var staticKnowList = detailList['静态知识']
+    var noticeInfo = detailList['注意事项']
+    var clinicalPathwayInfo = detailList['临床路径']
+    noticeName = data.noticeName || "注意事项"
+    clinicalPathwayName = data.clinicalPathwayName || "临床路径"
     // $("h1").css({
     //   "color": "#267FD7",
     //   "borderBottom": "4px solid  #E9E9E9",
     //   "padding": "0px 60px 50px 0px"
     // });
-    for (var i = 0; i < list.length; i++) {
-      item = list[i];
-      item.content = item.content.replace(/{imageUrlPrefix}/g, imageUrlPrefix);
-      anchors = '<li><i></i><a href="#' + item.title +
-        '">' + item.title + '</a></li><li class="anchor-line"></li>';
-      str = '<div class="infoBox"><div class="title"> <div class= "circleBox"><span class="circle"> <span></div> <h2 class="titleH2" id="' + item.title +
-        '">'
-      if (getUrlArgObject('type') == 8) {
-        str += '【' + item.title + '】'
-      } else {
-        str += item.title
-      }
-      str += '</h2></div>' +
-        '<div><pre>' + item.content + '</pre><div></div>';
-        str = `<div class="infoWrapper">${str}</div>`
-      $(".infos").append(str);
-      $(".anchors ul").append(anchors);
-    }
-    addLinkClickEvent();
-    adjustHeight();
+    renderTab(detailList)
+    staticKnowList&&renderContent(staticKnowList,'staticKnowledge')
+    noticeInfo&&renderContent(noticeInfo,'notice')
+    clinicalPathwayInfo&&renderContent(clinicalPathwayInfo,'clinicalPathway')
+
+  
     $('.content img').bind('contextmenu', function(){
       return false
     })
+   
+  })
+}
+getInfomation();
+
+
+function renderContent(list, contentWrapClassName){
+    for (var i = 0; i < list.length; i++) {
+        item = list[i];
+        item.content = item.content.replace(/{imageUrlPrefix}/g, imageUrlPrefix);
+        anchors = '<li><i></i><a href="#' + item.title +
+          '">' + item.title + '</a></li><li class="anchor-line"></li>';
+        str = '<div class="infoBox"><div class="title"> <div class= "circleBox"><span class="circle"> <span></div> <h2 class="titleH2" id="' + item.title +
+          '">'
+        if (getUrlArgObject('type') == 8) {
+          str += '【' + item.title + '】'
+        } else {
+          str += item.title
+        }
+        str += '</h2></div>' +
+          '<div><pre>' + item.content + '</pre><div></div>';
+          str = `<div class="infoWrapper">${str}</div>`
+        $(`.${contentWrapClassName} .infos`).append(str);
+        $(`.${contentWrapClassName} .anchors ul`).append(anchors);
+    }
+
     function addScrollEvent() {
       var scrollTop = $('.infos').scrollTop()
       var divHeight = 0;
       for (var i = 0; i < list.length; i++) {
-        divHeight = divHeight + parseInt($('#' + list[i].title).css('height')) + parseInt($('#' + list[i].title).parent().next().css('height')) + 40
+        divHeight = divHeight + parseInt($('#' + list[i].title).css('height')) + parseInt($('#' + list[i].title).parent().next().css('height')) + 20
         if (divHeight > scrollTop) {
           var anchor = 2 * i;
           $('.anchors ul').children().eq(anchor).addClass('active').siblings().removeClass('active');
@@ -75,20 +95,53 @@ function getInfomation() {
       }
     }
     $(".infos").scroll(throttle(addScrollEvent, 200));
-  })
+    addLinkClickEvent(contentWrapClassName);
+    adjustHeight();
 }
-getInfomation();
 
-function addLinkClickEvent() {
-  $("li:first").addClass("active");
-  $("li>a").on("click", function () {
-    $(".active").removeClass('active');
+
+
+function addLinkClickEvent(contentWrapClassName) {
+  $(`.${contentWrapClassName} .anchors li:first`).addClass("active");
+  $(`.${contentWrapClassName}  .anchors li>a`).on("click", function () {
+    $(`.${contentWrapClassName} .anchors .active`).removeClass('active');
     $(this).parent().addClass("active");
   });
 }
+
+function renderTab(detailList){
+  if(detailList['静态知识']){
+    $(".tabList").append(`<span class="tab" data-module="staticKnowledge">静态知识</span>`)
+    $(".staticKnowledge h1").html(showName);
+  }
+  if(detailList['临床路径']){
+    $(".tabList").append(`<span class="tab" data-module="clinicalPathway">临床路径</span>`)
+    $(".clinicalPathway h1").html(clinicalPathwayName);
+  }
+  if(detailList['注意事项']){
+    $(".tabList").append(`<span class="tab" data-module="notice">注意事项</span>`)
+    $(".notice h1").html(noticeName);
+  }
+  $(".tabList .tab").eq(0).addClass("activeTab")
+  bindTabClick()
+}
+function bindTabClick(){
+  $(".tabList .tab").on("click", function(){
+    const moduleName = $(this).attr("data-module")
+    const display = $(`.${moduleName}`).css("display")
+    if(display == "none"){
+      $(".activeTab").removeClass("activeTab")
+      $(this).addClass("activeTab")
+      $(".container").css("display","none")
+  
+      $(`.${moduleName}`).css("display","block")
+      $(`.${moduleName} .infos`).scrollTop(0)
+    }
+  })
+}
 function adjustHeight() {
   var ht = window.innerHeight;
-  $(".content").height(ht - 145 + "px");
+  $(".content").height(ht - 145 - 30 + "px");
 }
 $(window).on('resize', function(){
   adjustHeight()

+ 1 - 1
src/js/promise.js

@@ -48,7 +48,7 @@ const config = {
   indicationPush:'/sys/push/indicationPush',
   calculate: '/api/data/calc/calculate',
   disclaimer: '/sys/disclaimerInfo/getDisclaimerInfo',
-  information: '/api/data/conceptDetail/getConceptDetail',
+  information: '/graph/conceptInfo/getStaticKnowledge',
   informationMore: '/api/data/conceptDetail/getConceptDetails',
   pushScale: '/api/data/push/pushScale',
   getSysSetInfoDatas: '/sys/plan/getSysPlanInfoDatas',

+ 2 - 1
src/js/staticSearch.js

@@ -124,8 +124,9 @@ function getKnowledgeData(value) {
 
 function adjustHeight() {
     var ht = window.innerHeight;
+    var containerHt = $(".medicalKonwledgeWrap .container").height()
     var ht2 = $(".searchTypeBox").outerHeight(true)
-    $(".staticSearchB ul").height(ht - 120 - ht2 + "px");
+    $(".staticSearchB ul").height(containerHt - 120-10 - ht2 + "px");
 }
 $(window).on('resize', function(){
     adjustHeight()

+ 1 - 1
webpack.config.js

@@ -323,7 +323,7 @@ module.exports = {
     },
     hot: true,
     // openPage:'index.html?age=28&tipsName=血常规&tipsType=12&diseaseId=280&lisJson=&diagJson=急性胰腺炎&diseaseName=糖尿病&pastJson=无心脏病&otherJson=无高血压&pacsJson=腹部B超:无异常,%20报告日期:2019-05-07&sex=男&symptomJson=恶心呕吐腰痛&vitalJson=血压左上肢13/12mmHg&hospitalCode=A001',
-    openPage:'icssIndex.html?mrId=200408517135001432'
+    openPage:'cdss.html?mrId=200821362618001909'
   },
   stats: { children: false }
 }