Merge branch 'master' into his/zjhospital

src/css/indexHorizontal.less

@@ -1,27 +1,33 @@
 @import './common.less';
  .push .recommendInfoWrapper {
-    height: 20px;
-    line-height: 20px;
-    overflow: hidden;
-    margin-top: 10px;
+    line-height: 25px;
     h4 {
         float: left;
     }
+    .showTopTitle {
+        float: none;
+    }
 }
-.push .labAndPacsRecommend {
-    height: 50px;
-}
+
 .recommendInfoBox  {
     margin-left: 100px;
     position: relative;
 }
+.showTopInfo{
+    margin-left: 100px;
+}
+.topSmallTitle {
+    position: absolute;
+    left: -60px;
+}
 .recommendWrap {
     height: 250px;
 }
 .labAndPacsWrapper{
-    height: 20px;
-    line-height: 20px;
-    overflow: hidden;
+    line-height: 25px;
+}
+.labAndPacsItemBox {
+    float: left;
 }
 .push {
     margin-top: 10px;
@@ -97,6 +103,8 @@
     display: block;
     width: 20px;
     float: left;
+    position: relative;
+    top: 3px;
 }
 .labAndPacsBox, .treatItemBox {
     position: relative;
@@ -110,7 +118,7 @@
 .slideDown {
     background-color: #fff;
     position: absolute;
-    top: 0px;
+    bottom: 0px;
     right: 0px;
     height: 20px;
     line-height: 20px;
@@ -120,12 +128,11 @@
     img {
         display: inline-block;
         position: relative;
-        top: 2px;
+        top: 0px;
     }
 }
 
 .slideup {
-    background-color: #fff;
     position: absolute;
     float: right;
     top: 0px;
@@ -136,7 +143,7 @@
     img {
         display: inline-block;
         position: relative;
-        top: 2px;
+        top: 0px;
     }
 }
 .itemAllBox{
@@ -149,7 +156,6 @@
     z-index: 2;
     left: 0;
     top: 0;
-    margin: 10px 0;
 }
 .ellipse{
     overflow: hidden;
@@ -157,26 +163,26 @@
     text-overflow: ellipsis;
 }
 .conditTipsbox .conditionMain {
-    height: 20px;
+    height: 25px;
     .mayIllness{
         float: left;
         position: relative;
-        top: -5px;
+        top: -2px;
     }
 }
 .recommendInfoItem,.diagNameBox {
     .infoMsg,
     .infoMsgOn {
-        top: 4px;
+        top: 2px;
     }
 }
 .infoMsg,
 .infoMsgOn {
-    top: 8px;
+    top: 2px;
 }
 .infoMsg,
 .infoMsgOn {
-    position: absolute;
+    position: relative;
     right: 0px;
     display: none;
     cursor: pointer;
@@ -190,7 +196,7 @@
 .diagNameBox:hover,
 .durgNameBox:hover {
     color: #267FD7;
-
+    padding-right: 0;
     .infoMsg {
         display: inline-block;
         width: 14px;
@@ -214,7 +220,7 @@
     right: 0px;
     color: #267FD7;
     height: 20px;
-    line-height: 20px;
+    line-height: 24px;
     box-shadow: -2px 0px 15px 0px #fff;
     cursor: pointer;
 }
@@ -285,9 +291,12 @@
     margin-right: 5px;
     background: #e2eaf2;
     border-radius: 4px;
+    height: 22px;
+    line-height: 22px;
+    top: 1px;
 }
 .pacsRecommendwrapper {
-    margin-top: 10px;
+    // margin-top: 10px;
 }
 .labAndPacsItem {
     display: inline-block;
@@ -316,7 +325,7 @@
 }
 .recommendInfoItem {
     position: relative;
-    padding-right: 15px;
+    padding-right: 18px;
 }
 .recommendNull {
     color: #ADADAD;

src/css/indexVert.less

@@ -175,6 +175,7 @@
 }
 
 .labAndPacsBox {
+    position: relative;
     line-height: 25px;
 }
 

src/html/information.html

@@ -73,8 +73,12 @@
       background: #fff;
       margin: 0 auto;
       padding: 30px 0 30px 24px;
+   
+    }
+    pre {
+      white-space: pre-wrap;
+      word-wrap: break-word;
     }
-
     .anchors {
       width: 160px;
       position: absolute;

src/js/index.js

@@ -86,13 +86,13 @@ function getPageInfo() {
     const pushInfo = res2&&res2.data || {}
     const treatInfo = res3&&res3.data || {}
     const tipsInfo = res4&&res4.data || []
-    const confArr = transConf(configArr)
+    const {confArr, showLabsNum, showPacsNum, labsAndPacMode} = transConf(configArr)
     pushResult = pushInfo.data || {};
     treatResult = treatInfo.data || {}
     tipsResult = tipsInfo.data || {}
 
     const diagPossible =  pushResult.dis&&pushResult.dis['可能诊断'] || []//可能
-    const diagDoubt = pushResult.dis&&pushResult.dis['疑似诊断'] || [] // 疑似
+    const diagDoubt = pushResult.dis&&pushResult.dis['拟诊'] || [] // 疑似
     const diagDeter = pushResult.dis&&pushResult.dis['确诊'] || []//确诊
     const diagWaring = pushResult.dis&&pushResult.dis['警惕'] || [] // 推荐警惕诊断
     const symptomRecommend = pushResult.symptom || []  //推荐问诊症状
@@ -105,12 +105,14 @@ function getPageInfo() {
       {
           title: '化验',
           className: 'labRecommend',
-          data:  labRecommend
+          data:  labRecommend,
+          showNum: showLabsNum
       },
       {
           title: '辅检',
           className: 'pacsRecommend',
-          data:  pacsRecommend
+          data:  pacsRecommend,
+          showNum: showPacsNum
       }
     ]
     window.pushMessage = medicalIndications;//计算的需要的相关数据
@@ -119,16 +121,16 @@ function getPageInfo() {
 
       switch(confArr[i].code) {
         case "inquiry_show":  //问诊症状
-          renderRecommendInfo('symptomRecommend', '问诊症状', symptomRecommend, false)
+          renderRecommendInfo(confArr[i].showNum,'symptomRecommend', '问诊症状', symptomRecommend, false)
           break; 
         case "health_show": //体格检查
-          renderRecommendInfo('physiExamRecommend', '体格检查', physiExamRecommend, false)
+          renderRecommendInfo(confArr[i].showNum,'physiExamRecommend', '体格检查', physiExamRecommend, false)
           break;
         case "illness_show": //病情提示
           renderRecommendConditTips('conditTips','病情提示', medicalIndications || [])
           break;
         case "vigilant_show": //警惕诊断
-          renderRecommendInfo('warning', '警惕诊断', diagWaring, true,7,2)
+          renderRecommendInfo(confArr[i].showNum,'warning', '警惕诊断', diagWaring, true,7,2)
           break;
         case "lispacs_show": //检验检查
           renderMultRecommendInfo('labAndPacsRecommend', '检验检查', labAndPacsRecommend, false)
@@ -137,7 +139,7 @@ function getPageInfo() {
           renderTreat('treatRecommend','治疗方案',treatResult)
           break;
         case "diagnose_show": //推荐诊断
-          renderRecommendInfo('diagRecommend', '推荐诊断', diagRecommend, true,7,2)
+          renderRecommendInfo(confArr[i].showNum,'diagRecommend', '推荐诊断', diagRecommend, true,7,2)
           break;
         case "tip_show": //提示信息
           renderTipsInfo('tipsInfo','提示信息',tipsResult)

src/js/indexHorizontal.js

@@ -98,14 +98,13 @@ function getPageInfo() {
     const configArr = res1&&res1.data&&res1.data.data || []
     const pushInfo = res2.data || {}
     const treatInfo = res3.data || {}
-    const tipsInfo = res4.data || []
-    const confArr = transConf(configArr)
-    pushResult = pushInfo.data || {};
-    treatResult = treatInfo.data || {}
-    tipsResult = tipsInfo.data || {}
-    
+    const tipsInfo = res4.data || {}
+    const {confArr, showLabsNum, showPacsNum, labsAndPacMode} = transConf(configArr)
+    const pushResult = pushInfo.data || {};
+    const treatResult = treatInfo.data || {}
+    const tipsResult = tipsInfo.data&&tipsInfo.data || []
     const diagPossible =  pushResult.dis&&pushResult.dis['可能诊断'] || []//可能
-    const diagDoubt = pushResult.dis&&pushResult.dis['疑似诊断'] || [] // 疑似
+    const diagDoubt = pushResult.dis&&pushResult.dis['拟诊'] || [] // 疑似
     const diagDeter = pushResult.dis&&pushResult.dis['确诊'] || []//确诊
     const diagWaring = pushResult.dis&&pushResult.dis['警惕'] || [] // 推荐警惕诊断
     const symptomRecommend = pushResult.symptom || []  //推荐问诊症状
@@ -118,12 +117,14 @@ function getPageInfo() {
       {
           title: '化验',
           className: 'labRecommend',
-          data:  labRecommend
+          data:  labRecommend,
+          showNum: showLabsNum
       },
       {
           title: '辅检',
           className: 'pacsRecommend',
-          data:  pacsRecommend
+          data:  pacsRecommend,
+          showNum: showPacsNum
       }
     ]
     window.pushMessage = medicalIndications;//计算的需要的相关数据
@@ -131,26 +132,26 @@ function getPageInfo() {
     for(let i = 0; i < confArr.length; i++) {
       switch(confArr[i].code) {
         case "inquiry_show":  //问诊症状
-          renderRecommendInfo(symptomImg, 'symptomRecommend', '问诊症状', symptomRecommend, false)
+          renderRecommendInfo(confArr[i].showNum, symptomImg, 'symptomRecommend', '问诊症状', symptomRecommend, false)
           break; 
         case "health_show": //体格检查
-          renderRecommendInfo(physiExamImg, 'physiExamRecommend', '体格检查', physiExamRecommend, false)
+          renderRecommendInfo(confArr[i].showNum, physiExamImg, 'physiExamRecommend', '体格检查', physiExamRecommend, false)
           break;
         case "illness_show": //病情提示
           renderRecommendConditTips(conditTipsImg, 'conditTips','病情提示', medicalIndications || [])
           break;
         case "vigilant_show": //警惕诊断
-          renderRecommendInfo(warningImg, 'warning', '警惕诊断', diagWaring, true,7,2)
+          renderRecommendInfo(confArr[i].showNum, warningImg, 'warning', '警惕诊断', diagWaring, true,7,2)
           break;
         case "lispacs_show": //检验检查
-          renderMultRecommendInfo(labAndPacsImg, 'labAndPacsRecommend', '检验检查', labAndPacsRecommend, false)
+          renderMultRecommendInfo(labsAndPacMode,labAndPacsImg, 'labAndPacsRecommend', '检验检查', labAndPacsRecommend, false)
           break;
         case "cure_show": //治疗方案
           tipsNum++;
           renderTreat(treatImg, 'treatRecommend','治疗方案',treatResult)
           break;
         case "diagnose_show": //推荐诊断
-          renderRecommendInfo(diagImg, 'diagRecommend', '推荐诊断', diagRecommend, true,7,2)
+          renderRecommendInfo(confArr[i].showNum, diagImg, 'diagRecommend', '推荐诊断', diagRecommend, true,7,2)
           break;
         case "tip_show": //提示信息
           tipsNum++;

src/js/indexHorizontalDom.js

@@ -13,7 +13,9 @@ if(is8Ie) {
 }
 
 //推荐诊断等单种类型的
-function renderRecommendInfo(icon, className,title,data, hasInfo, type, position) {
+function renderRecommendInfo(showNum, icon, className,title,data, hasInfo, type, position) {
+    let showNumCopy = showNum || 5
+    const dataLen = data.length
     const str = `<div class="recommendInfoWrapper ${className} clearfix">
                     <h4><img src=${icon} title="${title}" class="icon">${title}:</h4>
                     <div class="recommendInfoBox">
@@ -22,29 +24,47 @@ function renderRecommendInfo(icon, className,title,data, hasInfo, type, position
                     </div>
                 </div>`
     $('.push').append(str)
-    let childrenNodeStr = ''
+    let dataShort
+    if(showNumCopy&& dataLen > showNumCopy) {
+        dataShort = data.slice(0, showNumCopy)
+    } else {
+        dataShort = data
+    }
+    let childrenNodeStrShort = ''
+    let childrenNodeStrLong = ''
     if(hasInfo) {
+        for (let i = 0; i < dataShort.length; i++) {
+            childrenNodeStrShort += `<span class="recommendInfoItem recommendInfoItemHasInfo">
+                                    ${data[i].name}
+                                    <span  title="点击i图标可查看详细说明" class="infoMsg" data-name=${data[i].name}></span>
+                                </span>`
+        }
         for (let i = 0; i < data.length; i++) {
-            childrenNodeStr += `<span class="recommendInfoItem recommendInfoItemHasInfo">
+            childrenNodeStrLong += `<span class="recommendInfoItem recommendInfoItemHasInfo">
                                     ${data[i].name}
                                     <span  title="点击i图标可查看详细说明" class="infoMsg" data-name=${data[i].name}></span>
                                 </span>`
         }
     } else {
+        for (let i = 0; i < dataShort.length; i++) {
+            childrenNodeStrShort += `<span class="recommendInfoItem" data-name="${data[i].name}">
+                                    ${data[i].name}
+                                </span>`
+        }
         for (let i = 0; i < data.length; i++) {
-            childrenNodeStr += `<span class="recommendInfoItem" data-name="${data[i].name}">
+            childrenNodeStrLong += `<span class="recommendInfoItem" data-name="${data[i].name}">
                                     ${data[i].name}
                                 </span>`
         }
     }
-    if(!childrenNodeStr) {
-        childrenNodeStr = '<span class ="recommendNull">暂无推荐</span>'
+    if(!childrenNodeStrShort) {
+        childrenNodeStrShort = '<span class ="recommendNull">暂无推荐</span>'
     }
-    $('.'+className + 'box').append(childrenNodeStr)
+    $('.'+className + 'box').append(childrenNodeStrShort)
     let childrenNodeStrAll = `<div class="${className+'boxAll'} itemAllBox">
             <h4>${title}:</h4>
             <div class="itemAll">
-                ${childrenNodeStr}
+                ${childrenNodeStrLong}
             </div>
             <span class="slideup"><img src="${collapseImg}"></span>
         </div>`
@@ -58,26 +78,38 @@ function renderRecommendInfo(icon, className,title,data, hasInfo, type, position
         const infoMsgName = $(this).attr('data-name')
         openNewWin(`information.html?type=${type}&position=${position}&name=${infoMsgName}`)
     })
-    slideToggle("."+className+"box")
+    slideToggle("."+className+"box", showNumCopy, dataLen)
+
 }
 
 //化验和辅检等多种类型
-function renderMultRecommendInfo(icon, className,title,data, hasInfo, type, position) {
+function renderMultRecommendInfo(labsAndPacMode,icon, className,title,data, hasInfo, type, position) {
+    console.log(labsAndPacMode)
     const str = `<div class="recommendInfoWrapper ${className} clearfix">
-                    <h4><img src=${icon} title="${title}" class="icon">${title}:</h4>
-                    <div class="recommendInfoBox ${className + 'box'}"></div>
+                    <h4 class ="${+labsAndPacMode === 1 ? 'showTopTitle':'showRightTitle'}"><img src=${icon} title="${title}" class="icon">${title}:</h4>
+                    <div class="recommendInfoBox ${className + 'box'} ${+labsAndPacMode === 1 ? 'showTopInfo':'showRightInfo'}"></div>
                 </div>`
     $('.push').append(str)
     
     for(let i = 0; i < data.length; i++) {
+        const showNum = data[i].showNum || 5
+        const dataLen = data[i].data.length
         let childrenNodeBoxStr  = `<div class="labAndPacsWrapper ${data[i].className+'wrapper'}">
                 <div class="labAndPacsBox ${data[i].className+'box'} clearfix"> 
                 </div>
             </div>`
-        let childrenNodeStr =  `<span class="labAndPacsTitle">${data[i].title}<i></i></span>`
+        let childrenNodeStr =  `<span class="labAndPacsTitle ${+labsAndPacMode === 1 ? 'topSmallTitle':'rightSmallTitle'}"">${data[i].title}<i></i></span>`
         let childrenNodeItemStrAll =  '' //更多展开框中的字符串
+        let dataShort
+        if(showNum&& dataLen > showNum) {
+            dataShort = data[i].data.slice(0, showNum)
+        } else {
+            dataShort = data[i].data
+        }
+        for(let j = 0; j < dataShort.length; j++) {
+            childrenNodeStr += `<span class="labAndPacsItem">${dataShort[j].name}</span>`
+        }
         for(let j = 0; j < data[i].data.length; j++) {
-            childrenNodeStr += `<span class="labAndPacsItem">${data[i].data[j].name}</span>`
             childrenNodeItemStrAll += `<span class="labAndPacsItem">${data[i].data[j].name}</span>`
         }
         if(data[i].data.length == 0) {
@@ -94,7 +126,7 @@ function renderMultRecommendInfo(icon, className,title,data, hasInfo, type, posi
         </div>`
 
         $('.push').append(childrenNodeStrAll)
-        slideToggle("."+data[i].className+"box")
+        slideToggle("."+data[i].className+"box", showNum, dataLen)
     }
 
 }
@@ -352,11 +384,11 @@ function renderRecommendConditTips(icon, className,title,data) {
       })
       bindTipsEvent()
 }
-function slideToggle(className){//展开收起
+function slideToggle(className, showNum, dataLen){//展开收起
     const domName = $(className)
     const domNameBoxAll = $(className+'All')
     setTimeout(() => {
-        if(domName.height() > 20){
+        if(showNum < dataLen){
           domName.append(`<span class="slideDown"><img src="${showImg}"></span>`)
         }
     });
@@ -369,6 +401,7 @@ function slideToggle(className){//展开收起
         $(domNameBoxAll).css('display', 'none')
     })
   }
+
 //打开免责申明
   $(".disclaimer .logo").on("click",function() {
     openNewWin("disclaimer.html");

src/js/indexVertDom.js

@@ -2,7 +2,8 @@ const $ = require("jquery");
 const { openNewWin,imageUrlPrefix } = require('./promise.js');
 const { bindTipsEvent } = require('./popupEdit.js');
 
-function renderRecommendInfo(className,title,data, hasInfo, type, position) {
+function renderRecommendInfo(showNum,className,title,data, hasInfo, type, position) {
+    const dataLen = data.length
     const str = `<div class="recommendInfoWrapper ${className}">
                     <h4><i></i>${title}</h4>
                     <div class="recommendInfoBox">
@@ -11,31 +12,51 @@ function renderRecommendInfo(className,title,data, hasInfo, type, position) {
                     </div>
                 </div>`
     $('.recommendWrap').append(str)
-    let childrenNodeStr = ''
+    let dataShort
+    if(showNum&& dataLen > showNum) {
+        dataShort = data.slice(0, showNum)
+    } else {
+        dataShort = data
+    }
+    let childrenNodeStrShort = ''
+    let childrenNodeStrLong = ''
     if(hasInfo) {
+        for (let i = 0; i < dataShort.length; i++) {
+            childrenNodeStrShort += `<span class="recommendInfoItem recommendInfoItemHasInfo">
+                                    ${dataShort[i].name}
+                                    <span  title="点击i图标可查看详细说明" class="infoMsg" data-name=${dataShort[i].name}></span>
+                                </span>`
+        }
         for (let i = 0; i < data.length; i++) {
-            childrenNodeStr += `<span class="recommendInfoItem recommendInfoItemHasInfo">
+            childrenNodeStrLong += `<span class="recommendInfoItem recommendInfoItemHasInfo">
                                     ${data[i].name}
                                     <span  title="点击i图标可查看详细说明" class="infoMsg" data-name=${data[i].name}></span>
                                 </span>`
         }
     } else {
+        for (let i = 0; i < dataShort.length; i++) {
+            childrenNodeStrShort += `<span class="recommendInfoItem" data-name="${dataShort[i].name}">
+                                    ${dataShort[i].name}
+                                </span>`
+        }
         for (let i = 0; i < data.length; i++) {
-            childrenNodeStr += `<span class="recommendInfoItem" data-name="${data[i].name}">
+            childrenNodeStrLong += `<span class="recommendInfoItem" data-name="${data[i].name}">
                                     ${data[i].name}
                                 </span>`
         }
     }
-    if(!childrenNodeStr) {
-        childrenNodeStr='<span class="recommendNull">暂无推荐</span>'
+    if(!childrenNodeStrShort) {
+        childrenNodeStrShort='<span class="recommendNull">暂无推荐</span>'
     }
     
-    $('.'+className + 'box').append(childrenNodeStr)
+    $('.'+className + 'box').append(childrenNodeStrShort)
     $('.'+className + 'box' +' .infoMsg').on('click', function(){
         const infoMsgName = $(this).attr('data-name')
         openNewWin(`information.html?type=${type}&position=${position}&name=${infoMsgName}`)
     })
-    slideToggle($("."+className+"box"))
+    if(dataLen > showNum) {
+        slideToggle($("."+className+"box"), childrenNodeStrShort,childrenNodeStrLong)
+    }
 }
 
 function renderMultRecommendInfo(className,title,data, hasInfo, type, position) {
@@ -44,18 +65,33 @@ function renderMultRecommendInfo(className,title,data, hasInfo, type, position)
                     <div class="recommendInfoBox ${className + 'box'}"></div>
                 </div>`
     $('.recommendWrap').append(str)
+    
     for(let i = 0; i < data.length; i++) {
+        const showNum = data[i].showNum
+        const dataLen = data[i].data.length
         let childrenNodeBoxStr  = `<div class="labAndPacsBox ${data[i].className} clearfix"> </div>`
-        let childrenNodeStr =  `<span class="labAndPacsTitle">${data[i].title}<i></i></span>`
+        let childrenNodeStrShort =  `<span class="labAndPacsTitle">${data[i].title}<i></i></span>`
+        let childrenNodeStrLong =  `<span class="labAndPacsTitle">${data[i].title}<i></i></span>`
+        let dataShort
+        if(showNum&& dataLen > showNum) {
+            dataShort = data[i].data.slice(0, showNum)
+        } else {
+            dataShort = data[i].data
+        }
+        for(let j = 0; j < dataShort.length; j++) {
+            childrenNodeStrShort += `<span class="labAndPacsItem">${dataShort[j].name}</span>`
+        }
         for(let j = 0; j < data[i].data.length; j++) {
-            childrenNodeStr += `<span class="labAndPacsItem">${data[i].data[j].name}</span>`
+            childrenNodeStrLong += `<span class="labAndPacsItem">${data[i].data[j].name}</span>`
         }
         if(data[i].data.length == 0) {
-            childrenNodeStr +='<span class="recommendNull">暂无推荐</span>'
+            childrenNodeStrShort +='<span class="recommendNull">暂无推荐</span>'
         }
         $('.'+className + 'box').append(childrenNodeBoxStr)
-        $('.'+data[i].className).append(childrenNodeStr)
-        slideToggle($("."+data[i].className))
+        $('.'+data[i].className).append(childrenNodeStrShort)
+        if(dataLen > showNum) {
+            slideToggle($("."+data[i].className), childrenNodeStrShort,childrenNodeStrLong)
+        }
     }
 
 }
@@ -373,17 +409,17 @@ function renderRecommendConditTips(className,title,data) {
       })
       bindTipsEvent()
 }
-function slideToggle(domName){//展开收起
-    if(domName.height() > 25){
-      domName.addClass("recommendInfoItemBoxLimit").append('<span class="slideDown">更多 <i></i></span>')
-    }
+function slideToggle(domName,childrenNodeStrShort,childrenNodeStrLong){//展开收起
+    domName.append('<span class="slideDown">更多 <i></i></span>')
     domName.on('click',".slideDown",function(){
-      domName.removeClass("recommendInfoItemBoxLimit").append('<span class="slideup">收起 <i></i></span>')
-      $(this).remove()
+        domName.html(childrenNodeStrLong)
+        domName.append('<span class="slideup">收起 <i></i></span>')
+        $(this).remove()
     })
     domName.on('click',".slideup",function(){
-      domName.addClass("recommendInfoItemBoxLimit").append('<span class="slideDown">更多 <i></i></span>')
-      $(this).remove()
+        domName.html(childrenNodeStrShort)
+        domName.append('<span class="slideDown">更多 <i></i></span>')
+        $(this).remove()
     })
   }
 

src/js/information.js

@@ -13,10 +13,16 @@ function getInfomation() {
     "name": getUrlArgObject('name'),
     "position": getUrlArgObject('position')
   };
+  const uname = getUrlArgObject('uname')
+  const showName = param.name
+  if (param.type == 5 || param.type == 51) {
+    param.type = 12;
+    param.name = uname;
+  }
 
   post(config.information, param).then((res) => {
     const data = res.data.data
-    document.title = data.name
+    document.title = showName
     var str = '';
     var anchors = '';
     var item = '';
@@ -26,7 +32,7 @@ function getInfomation() {
       return;
     }
     var list = data.details;
-    $("h1").html(data.name);
+    $("h1").html(showName);
     $("h1").css({
       "color": "#267FD7",
       "borderBottom": "4px solid  #E9E9E9",
@@ -45,7 +51,7 @@ function getInfomation() {
         str += item.title
       }
       str += '</h2></div>' +
-        '<div>' + item.content + '<div>';
+        '<div><pre>' + item.content + '</pre><div>';
       if (i != list.length - 1 && getUrlArgObject('type') != 8) {
         str += '<div class="line"></div>'
       }

src/js/staticSearch.js

@@ -55,7 +55,7 @@ function getKnowledgeData(value) {
             if(knowledgeLis&&knowledgeLis.length>0){
                 for(var i = 0;i<knowledgeLis.length;i++){
                     var tmpPart = knowledgeLis[i]
-                    var tmpLi = `<li data-name='${(tmpPart.type==5 ||tmpPart.type==51)?tmpPart.uniqueName:tmpPart.name}' data-type='1' data-sign='${(tmpPart.type==5 ||tmpPart.type==51)?12:tmpPart.type}'>
+                    var tmpLi = `<li data-name='${tmpPart.name}' data-uname='${tmpPart.uniqueName}' data-type='1' data-sign='${tmpPart.type}'>
                         <p>${tmpPart.name}<i>${tmpPart.libTypeName?('( '+tmpPart.libTypeName+' )'):''}</i></p>
                         ${tmpPart.retrievalName?('<span>• '+tmpPart.retrievalName+'</span>'):''}
                     </li>`
@@ -114,10 +114,11 @@ $(window).on('resize', function(){
 
 $(".staticSearchB ul").on("click","li",function(){
     const infoMsgName = $(this).attr('data-name')
+    const infoMsgUName = $(this).attr('data-uname')
     const type = $(this).attr('data-type')
     const sign = $(this).attr('data-sign')
     if(type == 1){
-        openNewWin(`information.html?type=${sign}&position=0&name=${infoMsgName}`)
+        openNewWin(`information.html?type=${sign}&position=0&name=${infoMsgName}&uname=${infoMsgUName}`)
     }else{
         let msg = JSON.parse(getUrlArgObject("msg"));
         openNewWin(`scale.html?featureType=21&sex=${msg.sex}&lis=${JSON.stringify(msg.lis)}&diag=${msg.diag}&diseaseName=${msg.diseaseName}&scaleName=${infoMsgName}&symptom=${msg.symptom}&other=${msg.other}&pacs=${msg.pacs}&vital=${msg.vital}&age=${msg.age}`)

src/js/util.js

@@ -22,18 +22,30 @@ const transConf = function(arr) {
     //     {hospitalCode: "A001", sysType: 16, name: "警惕诊断", code: "vigilant_no", value: 3}
     // ]
     const reg = /_show$/g;
-    var newArr = arr.filter(item => item.code.match(reg) && item.value === 1 )
+    let newArr = arr.filter(item => item.code.match(reg) && item.value === 1 )
     for(let i = 0; i < newArr.length; i++) {
         for (let j = 0; j < arr.length; j++) {
             if(arr[j].code.match(/_no$/g) && arr[j].code.replace('_no', ' ') === newArr[i].code.replace('_show', ' ')) {
                 newArr[i].orderNo = arr[j].value
             }
+            if(arr[j].code.match(/_num$/g) && arr[j].code.replace('_num', ' ') === newArr[i].code.replace('_show', ' ')) {
+                newArr[i].showNum = arr[j].value
+            }
         }
     }
     newArr.sort((a, b) => {
         return a.orderNo - b.orderNo
     })
-    return newArr
+    let showLabsNum, showPacsNum, labsAndPacMode
+    showLabsNum = arr.filter(item => item.code === 'inspeclis_num')[0].value
+    showPacsNum = arr.filter(item => item.code === 'inspecpacs_num')[0].value
+    labsAndPacMode = arr.filter(item => item.code === 'lispacs_place')[0].value
+    return {
+        confArr: newArr,
+        showLabsNum,
+        showPacsNum,
+        labsAndPacMode
+    }
 }
 
 

webpack.config.js

@@ -4,7 +4,7 @@ const CleanWebpackPlugin = require('clean-webpack-plugin') // 清空打包目录
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
 const webpack = require('webpack');
-const proxyHost = "http://192.168.2.241:5050";
+const proxyHost = "http://192.168.2.236:5050";
 module.exports = {
   entry: {
     index: path.resolve(__dirname, 'src/js', 'index.js'),