Merge branch 'testMerged' into pushParm

src/css/staticSearch.css

@@ -31,9 +31,7 @@
     position: relative;
     top: 1px;
 }
-.container .searchScale {
-    display: none;
-}
+
 .container .staticSearchT button {
     position: absolute;
     right: 0;
@@ -98,4 +96,16 @@
     font-size: 12px;
     margin-bottom: 10px;
     line-height: 20px;
+}
+.searchTypeBox {
+    margin: 10px 0 0 0;
+}
+.medicalTypeItem{
+    display: inline-block;
+    margin: 0 20px 10px 0;
+    cursor: pointer;
+}
+.medicalTypeItem img {
+    vertical-align: text-bottom;
+    margin: 0  3px 2px 0;
 }

src/html/staticSearch.html

@@ -46,22 +46,8 @@
                 <i id="clearKnowledge"></i>
                 <button >搜索</button>
             </div>
-            <div class="staticSearchB">
-                <p class="tip">查询内容</p>
-                <p class="empty">暂无搜索结果！</p>
-                <ul>
-                    
-                </ul>
-            </div>
-        </div>
-        <div class="searchScale">
-            <div class="staticSearchT">
-                <div class="ipt">
-                    <input type="text" value="" placeholder="量表搜索">
-                </div>
-                <i id="clearScale"></i>
-                <button >搜索</button>
-            </div>
+            <div class="searchTypeBox"></div>
+
             <div class="staticSearchB">
                 <p class="tip">查询内容</p>
                 <p class="empty">暂无搜索结果！</p>

src/js/index.js

@@ -182,7 +182,7 @@ function moreInfo() {
   $('.moreInfo').click(function(){
     const name = $(this).attr('data-name')
     const type = $(this).attr('data-type')
-    openNewWin(`information.html?type=${type}&position=0&name=${encodeURIComponent(name)}`)
+    openNewWin(`information.html?type=${encodeURIComponent(type)}&position=0&name=${encodeURIComponent(name)}`)
   })
 }
 

src/js/indexHorizontal.js

@@ -206,7 +206,7 @@ function getPageInfo() {
       $('.moreInfo').click(function(){
         const name = $(this).attr('data-name')
         const type = $(this).attr('data-type')
-        openNewWin(`information.html?type=${type}&position=0&name=${encodeURIComponent(name)}`)
+        openNewWin(`information.html?type=${encodeURIComponent(type)}&position=0&name=${encodeURIComponent(name)}`)
       })
     }
     

src/js/indexHorizontalDom.js

@@ -155,7 +155,7 @@ function renderKnowledgeInfo(icon, className,title, data) {
                 </div>`
     $('.infomationBox').append(str)
     $('.'+className+'.staticWin' ).on('click', function(){
-        openNewWin(`staticSearch.html?type=1`)
+        openNewWin(`staticSearch.html?msg=${encodeURIComponent(JSON.stringify(msg))}`)
     })
 }
 function renderScaleInfo(icon, className,title, data) {
@@ -165,7 +165,7 @@ function renderScaleInfo(icon, className,title, data) {
                 </div>`
     $('.infomationBox').append(str)
     $('.'+className+'.staticWin' ).on('click', function(){
-        openNewWin(`staticSearch.html?type=2&msg=${encodeURIComponent(JSON.stringify(msg))}`)
+        openNewWin(`staticSearch.html?msg=${encodeURIComponent(JSON.stringify(msg))}`)
     })
 }
 
@@ -189,7 +189,10 @@ function renderTreatText(className,title,data, parentNode) {
     }
     $(".infomationBox .treatTextBox").on('click',".more",function(){
         openNewWin(`treatplan.html?msg=${encodeURIComponent(JSON.stringify(msg))}`)
-      })
+    })
+    $('.' + className + 'box' + ' img').bind('contextmenu', function(){
+        return false
+    })
     
 }
 function renderTreatDrug(className,title,data, parentNode) {
@@ -283,7 +286,7 @@ function renderTipsInfo(icon, className,title,data) {
         </div>`
     } else {
         str = `<div class="informationBox tipsInfoWrapper ${className} clearfix">
-                    <div class="tipsInfoBox clearfix ${className + 'box'}">
+                    <div class="tipsInfoBox clearfix ${className + 'box'} disCopy">
                     </div>
                 </div>`
     }
@@ -292,6 +295,9 @@ function renderTipsInfo(icon, className,title,data) {
     for(let i = 0; i < data.length; i++) {
         renderTipsInfoText('','诊断依据',data[i],className + 'box')
     }
+    $('.' + className + 'box' + ' img').bind('contextmenu', function(){
+        return false
+    })
     // if(data.name) {
     //     renderTipsInfoText('','诊断依据',data.details,className + 'box')
     // }

src/js/indexVertDom.js

@@ -53,7 +53,7 @@ function renderRecommendInfo(showNum,className,title,data, hasInfo, type, positi
     $('.'+className + 'box').append(childrenNodeStrShort)
     $('.'+className + 'box' +' .infoMsg').on('click', function(){
         const infoMsgName = $(this).attr('data-name')
-        openNewWin(`information.html?type=${type}&position=${position}&name=${encodeURIComponent(infoMsgName)}`)
+        openNewWin(`information.html?type=${encodeURIComponent(type)}&position=${encodeURIComponent(position)}&name=${encodeURIComponent(infoMsgName)}`)
     })
     if(dataLen > showNumCopy) {
         slideToggle($("."+className+"box"), childrenNodeStrShort,childrenNodeStrLong)
@@ -119,6 +119,9 @@ function renderTipsInfo(className,title, data) {
         // renderTipsInfoMsg('tipsInfo', data.name, data.details, className+'box')
         $('.' + className+'box').append('<p class="TipsInfoNull">暂无数据</p>')
     }
+    $('.' + className + 'box' + ' img').bind('contextmenu', function(){
+        return false
+    })
 }
 
 function renderKnowledgeInfo(className,title, data) {
@@ -129,7 +132,7 @@ function renderKnowledgeInfo(className,title, data) {
     $('.recommendWrap').append(str)
     $('.' + className+'box').append('<p class="TipsInfoNull staticWin">'+data+'</p>')
     $('.'+className+' .staticWin' ).on('click', function(){
-        openNewWin(`staticSearch.html?type=1`)
+        openNewWin(`staticSearch.html?msg=${encodeURIComponent(JSON.stringify(msg))}`)
     })
 }
 
@@ -141,13 +144,13 @@ function renderScaleInfo(className,title, data) {
     $('.recommendWrap').append(str)
     $('.' + className+'box').append('<p class="TipsInfoNull staticWin">'+data+'</p>')
     $('.'+className+' .staticWin' ).on('click', function(){
-        openNewWin(`staticSearch.html?type=2&msg=${encodeURIComponent(JSON.stringify(msg))}`)
+        openNewWin(`staticSearch.html?msg=${encodeURIComponent(JSON.stringify(msg))}`)
     })
 }
 
 function renderTipsInfoMsg(className,item,data, parentNode) {
     const childrenNodeBoxStr = `
-        <div class = "treatItemBox ${className + 'box'}">
+        <div class = "treatItemBox ${className + 'box'} disCopy">
             <p class="treatItemTitle">${item.name} <span class="moreInfo" data-name="${item.name}" data-type="${item.type}"}>详情</span></p>
             <p class="${className + 'Info'} clearfix"></p>
         </div>
@@ -198,6 +201,9 @@ function renderTreatText(className,title,data, parentNode) {
     $(".treatItemBox").on('click',".slideDown",function(){
         openNewWin(`treatplan.html?msg=${encodeURIComponent(JSON.stringify(msg))}`)
     })
+    $('.' + className + 'Info' + ' img').bind('contextmenu', function(){
+        return false
+    })
 }
 function renderTreatDrug(className,title,data, parentNode) {
     const childrenNodeBoxStr = `

src/js/information.js

@@ -60,6 +60,9 @@ function getInfomation() {
     }
     addLinkClickEvent();
     adjustHeight();
+    $('.content img').bind('contextmenu', function(){
+      return false
+    })
     function addScrollEvent() {
       var scrollTop = $('.infos').scrollTop()
       var divHeight = 0;

src/js/promise.js

@@ -42,6 +42,7 @@ const config = {
   getVersion: '/api/data/versionInfo/getVersionInfoAlls',
   getStaticKnowledge: '/api/data/search/getStaticKnowledge',
   getStaticScale: '/api/data/search/getScale',
+  dictionaryInfo: '/api/data/dictionaryInfo/getList', //字典信息
   ruleTypeMap:{     //大数据推送参数featureType对应
     '22':'1,2',
     '11':'3',

src/js/scale.js

@@ -24,10 +24,9 @@ $(function () {
             $('.content').append(scaleInfo[i].content)
           }
         }
-
-        
-
-        
+        $('.content img').bind('contextmenu', function(){
+          return false
+        })
       }
     })
   }

src/js/staticSearch.js

@@ -1,52 +1,99 @@
 require('./../css/staticSearch.css');
 require('./../images/del_nor.png')
 var $ = require("jquery");
-var { post,config,getUrlArgObject,openNewWin } = require('./promise.js');
+var { post,config,getUrlArgObject,openNewWin,isIe8 } = require('./promise.js');
+let checkOffImg = require('./../images/check_off.png')
+let checkOnImg = require('./../images/check_on.png')
+
+
+let medicalTypesList = []
+let first = true
+const is8Ie = isIe8() //判断是否为IE8
+if(is8Ie) {
+  let reg = /undefined/g
+  checkOffImg = showImg.replace(reg, '')
+  checkOnImg = collapseImg.replace(reg, '')
+}
 
-var type = getUrlArgObject("type");
 $(".staticSearchT input").keyup(function(e) {
     const ev = e||window.event;
     const val = $(this).val();
-    const place = $(this).attr("placeholder")
     $(this).parents(".staticSearchT").find("i").css({display:val==""?"none":"inline-block"})
-    
-    if(place == '量表搜索'){
-        if(val == ''){
-            $(".searchScale .staticSearchB .empty").css({display:'none'})
-            $(".searchScale .staticSearchB .tip").css({display:'none'})
-            $(".searchScale .staticSearchB ul").html('')
-        }
-        ev.keyCode == 13&&getScaleData(val);
-    }else if(place == '医学知识搜索'){
-        if(val == ''){
-            $(".searchKnowledge .staticSearchB .empty").css({display:'none'})
-            $(".searchKnowledge .staticSearchB .tip").css({display:'none'})
-            $(".searchKnowledge .staticSearchB ul").html('')
-        }
-        ev.keyCode == 13&&getKnowledgeData(val);
+    if(val == ''){
+        $(".searchKnowledge .staticSearchB .empty").css({display:'none'})
+        $(".searchKnowledge .staticSearchB .tip").css({display:'none'})
+        $(".searchKnowledge .staticSearchB ul").html('')
     }
+    ev.keyCode == 13&&getKnowledgeData(val);
+})
+document.title = "医学知识搜索"
+$(".searchScale").css({display:'none'})
+$(".searchKnowledge").css({display:'block'})
+$(".searchKnowledge .staticSearchT").on('click','button',function() {
+    var val = $(this).parents(".staticSearchT").find("input").val()
+    val!=''&&getKnowledgeData(val)
 })
-if(type == 1){
-    document.title = "医学知识搜索"
-    $(".searchScale").css({display:'none'})
-    $(".searchKnowledge").css({display:'block'})
-    $(".searchKnowledge .staticSearchT").on('click','button',function() {
-        var val = $(this).parents(".staticSearchT").find("input").val()
-        val!=''&&getKnowledgeData(val)
+
+
+function getMedicalTypes() {
+    post(config.dictionaryInfo,{}).then((res) =>{
+        const data = res.data
+        if(data.code == 0) {
+            medicalTypesList = res.data.data[7]
+            medicalTypesList[0].checked = true
+            renderMedicalType(medicalTypesList)
+        } else {
+            console.log(res)
+        }
     })
-}else if(type == 2){
-    document.title = "量表搜索"
-    $(".searchKnowledge").css({display:'none'})
-    $(".searchScale").css({display:'block'})
-    $(".searchScale .staticSearchT").on('click','button',function(e) {
-        var val = $(this).parents(".staticSearchT").find("input").val()
-        val!=''&&getScaleData(val)
+}
+function renderMedicalType(medicalTypesList) {
+    let str = ''
+    for(let i = 0; i < medicalTypesList.length; i++) {
+        str += `<span class='medicalTypeItem' data-index=${i}><img src = ${medicalTypesList[i].checked? checkOnImg:checkOffImg}>${medicalTypesList[i].name}</span>`
+    }
+    $('.searchTypeBox').html(str)
+    bindMedicalTypeClick();
+}
+function bindMedicalTypeClick() {
+    $('.searchTypeBox .medicalTypeItem').on("click", function(){
+        const index = $(this).attr('data-index')
+        if(index == 0) {
+            if(medicalTypesList[0].checked) {
+                medicalTypesList[0].checked = false
+            }else {
+                for(let i = 0; i < medicalTypesList.length; i++) {
+                    medicalTypesList[i].checked = false
+                }
+                medicalTypesList[0].checked = true
+            }
+            renderMedicalType(medicalTypesList)
+        } else {
+            if(medicalTypesList[0].checked) {
+                medicalTypesList[0].checked = false
+            }
+            medicalTypesList[index].checked = !medicalTypesList[index].checked
+        }
+        renderMedicalType(medicalTypesList)
     })
 }
-
+getMedicalTypes()
 function getKnowledgeData(value) {
+    if(first) {
+        adjustHeight()
+        first =false
+    }
+    let medicalTypes = []
+    for(let i = 0; i < medicalTypesList.length; i++) {
+        if(medicalTypesList[i].checked) {
+            if(i !== 0) {
+                medicalTypes.push(medicalTypesList[i].val)
+            }
+        }
+    }
     post(config.getStaticKnowledge,{
-        inputStr: value
+        inputStr: value.replace(/\\/g,'\\\\').replace(/%/g,'\\%').replace(/\_/g,'\\_'),
+        types:medicalTypes
         }).then((res) => {
         const data = res.data
         if(data.code == 0) {
@@ -55,7 +102,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.name}' data-uname='${tmpPart.uniqueName}' data-type='1' data-sign='${tmpPart.type}'>
+                    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>
                         ${tmpPart.retrievalName?('<span>• '+tmpPart.retrievalName+'</span>'):''}
                     </li>`
@@ -74,39 +121,11 @@ function getKnowledgeData(value) {
         }
     })
 }
-function getScaleData(value) {
-    post(config.getStaticScale,{
-        filterName: [],
-        name: value
-    }).then((res) => {
-        const data = res.data
-        if(data.code == 0) {
-            var knowledgeLis = data.data;
-            var lisStr = ''
-            if(knowledgeLis&&knowledgeLis.length>0){
-                for(var i = 0;i<knowledgeLis.length;i++){
-                    var tmpPart = knowledgeLis[i]
-                    var tmpLi = `<li data-name='${tmpPart.name}' data-type='2'>
-                        <p>${tmpPart.name}<i>${tmpPart.libTypeName?('( '+tmpPart.libTypeName+' )'):''}</i></p>
-                    </li>`
-                    lisStr += tmpLi
-                }
-                $(".searchScale .staticSearchB ul").html(lisStr)
-                $(".searchScale .staticSearchB .empty").css({display:'none'})
-                $(".searchScale .staticSearchB .tip").css({display:'block'})
-            }else{
-                $(".searchScale .staticSearchB .empty").css({display:'block'})
-                $(".searchScale .staticSearchB .tip").css({display:'none'})
-                $(".searchScale .staticSearchB ul").html('')
-            }
-        }else{
-            console.log(res)
-        }
-    })
-}
+
 function adjustHeight() {
     var ht = window.innerHeight;
-    $(".staticSearchB ul").height(ht - 120 + "px");
+    var ht2 = $(".searchTypeBox").outerHeight(true)
+    $(".staticSearchB ul").height(ht - 120 - ht2 + "px");
 }
 $(window).on('resize', function(){
     adjustHeight()
@@ -117,11 +136,12 @@ $(".staticSearchB ul").on("click","li",function(){
     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=${encodeURIComponent(infoMsgName)}&uname=${encodeURIComponent(infoMsgUName)}`)
+    if(type != 48){
+        openNewWin(`information.html?type=${encodeURIComponent(sign)}&position=0&name=${encodeURIComponent(infoMsgName)}&uname=${encodeURIComponent(infoMsgUName)}`)
     }else{
         let msg = JSON.parse(getUrlArgObject("msg"));
         const msg1 = JSON.parse(JSON.stringify(msg))
+        console.log('scaleName', msg,infoMsgName)
         msg1.scaleName = infoMsgName
         msg1.featureType = 21
         openNewWin(`scale.html?msg=${encodeURIComponent(JSON.stringify(msg1))}`)
@@ -137,11 +157,3 @@ $(".staticSearchT").on('click','#clearKnowledge',function() {
     $(this).prev('.ipt').find('input').focus()
     $(this).css({display:"none"})
 })
-$(".staticSearchT").on('click','#clearScale',function() {
-    $(".staticSearchT input").val("")
-    $(".searchScale .staticSearchB ul").html('')
-    $(".searchScale .staticSearchB .tip").css({display:'none'})
-    $(".searchScale .staticSearchB .empty").css({display:'none'})
-    $(this).prev('.ipt').find('input').focus()
-    $(this).css({display:"none"})
-})

src/js/util.js

@@ -37,9 +37,9 @@ const transConf = function(arr) {
         return a.orderNo - b.orderNo
     })
     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
+    showLabsNum = arr.filter(item => item.code === 'inspeclis_num')[0]&&arr.filter(item => item.code === 'inspeclis_num')[0].value
+    showPacsNum = arr.filter(item => item.code === 'inspecpacs_num')[0]&&arr.filter(item => item.code === 'inspecpacs_num')[0].value
+    labsAndPacMode = arr.filter(item => item.code === 'lispacs_place')[0]&&arr.filter(item => item.code === 'lispacs_place')[0].value
     return {
         confArr: newArr,
         showLabsNum,