数据服务横板

src/css/indexHorizontal.less

@@ -0,0 +1,253 @@
+
+ .push .recommendInfoWrapper {
+    height: 20px;
+    line-height: 20px;
+    overflow: hidden;
+    margin-top: 10px;
+    h4 {
+        float: left;
+    }
+}
+.push .labAndPacsRecommend {
+    height: 50px;
+}
+.recommendInfoBox  {
+    margin-left: 100px;
+    position: relative;
+}
+.labAndPacsWrapper{
+    height: 20px;
+    line-height: 20px;
+    overflow: hidden;
+}
+.push {
+    width: 60%;
+    float: left;
+    position: relative;
+}
+.treat {
+    width: 40%;
+    float: left;
+    position: relative;
+}
+
+.warning, .diagRecommend {
+    h4 {
+        color: #FF545B;
+    }
+}
+.symptomRecommend, .physiExamRecommend, .labAndPacsRecommend {
+    h4 {
+        color: #157FD5;
+    }
+}
+.conditTips {
+    h4 {
+        color: #E66225;
+    }
+}
+.treatRecommend  {
+    h4 {
+        color: #1AB3A9;
+    }
+}
+.icon{
+    display: block;
+    width: 20px;
+    float: left;
+}
+.labAndPacsBox, .treatItemBox {
+    position: relative;
+}
+.itemAllBox {
+    padding-right: 40px;
+    background: #fff;
+    border: 1px solid #3A73E1;
+    border-radius: 4px;
+    box-sizing: border-box;
+}
+.slideDown {
+    background-color: #fff;
+    position: absolute;
+    top: 0px;
+    right: 0px;
+    height: 20px;
+    line-height: 20px;
+    box-shadow: -2px 0px 15px 0px #fff;
+    cursor: pointer;
+
+    i {
+        width: 20px;
+        height: 20px;
+        display: inline-block;
+        position: relative;
+        top: 0px;
+        background: url('../images/show.png') center center no-repeat;
+    }
+}
+
+.slideup {
+    background-color: #fff;
+    position: absolute;
+    float: right;
+    top: 0px;
+    right: 0px;
+    cursor: pointer;
+    line-height: 10px;
+    box-shadow: -2px 0px 15px 0px #fff;
+    i {
+        width: 20px;
+        height: 2px;
+        display: inline-block;
+        position: relative;
+        top: 0px;
+        background: url('../images/collapse.png') center center no-repeat;
+    }
+}
+.itemAllBox{
+    position: absolute;
+    width: 100%;
+    height: auto;
+    max-height: 100%;
+    display: none;
+    background: #fff;
+    z-index: 2;
+    left: 0;
+    top: 0;
+}
+.ellipse{
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+}
+.conditTipsbox .conditionMain {
+    height: 20px;
+    .mayIllness{
+        float: left;
+    }
+}
+.infoMsg,
+.infoMsgOn {
+    position: absolute;
+    top: 2px;
+    right: 0px;
+}
+.infoMsg,
+.infoMsgOn {
+    display: none;
+    cursor: pointer;
+}
+
+.recommendInfoItem:hover,
+.diagNameBox:hover,
+.durgNameBox:hover {
+    color: #267FD7;
+
+    .infoMsg {
+        display: inline-block;
+        width: 14px;
+        height: 14px;
+        background: url(/images/msg1.png) center center no-repeat;
+    }
+
+    .infoMsg:hover {
+        background: url(/images/msg2.png) center center no-repeat;
+    }
+}
+.labAndPacsItem:hover{
+    color: #267FD7;
+}
+.diagNameBox {
+    position: relative;
+    padding-right: 15px;
+}
+ .more {
+    display: inline-block;
+    background-color: #fff;
+    position: absolute;
+    right: 0px;
+    color: #267FD7;
+    height: 20px;
+    line-height: 20px;
+    box-shadow: -2px 0px 15px 0px #fff;
+    cursor: pointer;
+}
+.conditTipsbox .more {
+    top: 0px;
+}
+.diagName {
+    color: #040428;
+}
+.treatItemTitle {
+    font-weight: bold;
+    font-size: 13px;
+    color: #7C828E;
+    float: left;
+    width: 60px;
+    height: 30px;
+    line-height: 30px;
+    float: left;
+}
+.treat .recommendInfoBox {
+    margin-left: 0px;
+}
+.treat .commonTreatmentInfo {
+    margin-left: 80px;
+    line-height: 30px;
+    height: 90px;
+    overflow:hidden;
+    text-overflow:ellipsis; 
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 3;
+}
+.treat .drugTreatmentInfo {
+    margin-left: 80px;
+    line-height: 30px;
+    height: 90px;
+    overflow: hidden;
+}
+.drugTreatmentInfoItemBox {
+    .ellipse;
+    height: 30px;
+}
+.treat .treatRecommend {
+    margin-top: 10px;
+}
+.labAndPacsRecommend  .labAndPacsTitle {
+    padding:5px; 
+    margin-right: 5px;
+    background: #e2eaf2;
+    border-radius: 4px;
+}
+.pacsRecommendwrapper {
+    margin-top: 10px;
+}
+.labAndPacsItem {
+    display: inline-block;
+    padding-right: 15px;
+}
+.treatRecommendbox {
+    margin-top: 10px;
+}
+.treatItemBox .more{
+    bottom: 0;
+    height: 30px;
+    line-height: 30px;
+}
+.itemAllBox h4{
+    float: left;
+    margin-right: 10px;
+}
+.recommendInfoItem {
+    position: relative;
+    display: inline-block;
+}
+.itemAll{
+    height: 100%;
+    overflow-y: auto
+}
+.recommendInfoItem {
+    position: relative;
+    padding-right: 15px;
+}

src/css/indexVert.less

@@ -80,15 +80,17 @@
 }
 
 .recommendInfoItem {
-    margin-right: 18px;
+    padding-right: 15px;
     float: left;
     line-height: 25px;
+    position: relative;
 }
 
 .infoMsg,
 .infoMsgOn {
-    position: relative;
-    top: 4px;
+    position: absolute;
+    top: 6px;
+    right: 0;
 }
 
 .infoMsg,
@@ -104,8 +106,8 @@
 
     .infoMsg {
         display: inline-block;
-        width: 16px;
-        height: 16px;
+        width: 14px;
+        height: 14px;
         background: url(/images/msg1.png) center center no-repeat;
     }
 
@@ -128,6 +130,13 @@
 // }
 .diagNameBox,
 .durgNameBox {
+    position: relative;
+    padding-right: 15px;
+    .infoMsg, .infoMsgOn {
+        top: 4px;
+    }
+}
+.durgName, .diagName {
     border-bottom: 1px solid #D1D1D1;
 }
 
@@ -149,10 +158,6 @@
     line-height: 28px;
 }
 
-.labAndPacsTitle i {
-    color: #ADADAD;
-}
-
 .labAndPacsBox {
     line-height: 25px;
 }
@@ -273,4 +278,11 @@
     border-right: 2px solid #ADADAD;
     padding-right:5px; 
     margin-right: 5px;
+}
+.labAndPacsItem {
+    display: inline-block;
+    padding-right: 15px;
+}
+.labAndPacsItem:hover {
+    color: #267FD7;
 }

src/html/indexHorizontal.html

@@ -14,7 +14,10 @@
 <body>
   <div class="bodyWrap">
       <div class="iframeWrap">
-        <div class="recommendWrap"></div>
+        <div class="recommendWrap clearfix">
+            <div class="push"></div>
+            <div class="treat"></div>
+        </div>
         <!-- <p class="responsibility">以上推送为常见诊断及问诊内容，实际以医生临床判断为准</p> -->
       </div>
       <!-- <div class="disclaimer clearfix">

src/js/indexHorizontal.js

@@ -2,12 +2,21 @@ require('./../css/reset.css');
 require('./../css/indexHorizontal.less');
 // require('./../css/popup.css');
 // require('./popupEdit.js');
-var Promise = require('./rePromise');
+const Promise = require('./rePromise');
+const warningImg = require('./../images/warings.png')
+const diagImg = require('./../images/yszd.png')
+const symptomImg = require('./../images/inquire.png')
+const physiExamImg = require('./../images/tgjc.png')
+const labAndPacsImg = require('./../images/inspect.png')
+const conditTipsImg = require('./../images/tips.png')
+const treatImg = require('./../images/zhiliao.png')
+
+
 
 const $ = require("jquery");
 const { post,config,getUrlArgObject,openNewWin } = require('./promise.js');
 const { transConf } = require('./util.js');
-const { renderRecommendInfo, renderMultRecommendInfo, renderTreat, renderRecommendConditTips } = require('./indexVertDom.js');
+const { renderRecommendInfo, renderMultRecommendInfo, renderTreat, renderRecommendConditTips } = require('./indexHorizontalDom.js');
 
 var msg = {
     age: getUrlArgObject('age'),
@@ -43,7 +52,7 @@ function pushInfo() {
         var result = data.data;
         if(result.medicalIndications && result.medicalIndications.length>0){//病情提示
           window.pushMessage = result.medicalIndications;//计算的需要的相关数据
-          renderRecommendConditTips('conditTips','病情提示', result.medicalIndications)
+          renderRecommendConditTips(conditTipsImg, 'conditTips','病情提示', result.medicalIndications)
         }
         if(result.dis){
             const diagPossible = result.dis['可能诊断'] || []//可能
@@ -67,11 +76,11 @@ function pushInfo() {
                     data:  pacsRecommend
               }
             ]
-            renderRecommendInfo('warning', '警惕诊断', diagWaring, true,7,2)
-            renderRecommendInfo('diagRecommend', '推荐诊断', diagRecommend, true,7,2)
-            renderRecommendInfo('symptomRecommend', '问诊症状', symptomRecommend, false)
-            renderRecommendInfo('physiExamRecommend', '体格检查', physiExamRecommend, false)
-            renderMultRecommendInfo('labAndPacsRecommend', '检验检查', labAndPacsRecommend, false)
+            renderRecommendInfo(warningImg, 'warning', '警惕诊断', diagWaring, true,7,2)
+            renderRecommendInfo(diagImg, 'diagRecommend', '推荐诊断', diagRecommend, true,7,2)
+            renderRecommendInfo(symptomImg, 'symptomRecommend', '问诊症状', symptomRecommend, false)
+            renderRecommendInfo(physiExamImg, 'physiExamRecommend', '体格检查', physiExamRecommend, false)
+            renderMultRecommendInfo(labAndPacsImg,'labAndPacsRecommend', '检验检查', labAndPacsRecommend, false)
         }
       
     
@@ -86,7 +95,7 @@ function getTreatment() {
     if(data.code == 0){
       var result = data.data;
       console.log('treatResult', result)
-      renderTreat('treatRecommend','治疗方案',result)
+      renderTreat(treatImg, 'treatRecommend','治疗方案',result)
       // var num = 0;
       // if(result.commonTreatment && result.commonTreatment.content){
       //   ++num

src/js/indexHorizontalDom.js

@@ -2,15 +2,16 @@ const $ = require("jquery");
 const { openNewWin } = require('./promise.js');
 const { bindTipsEvent } = require('./popupEdit.js');
 
-function renderRecommendInfo(className,title,data, hasInfo, type, position) {
-    const str = `<div class="recommendInfoWrapper ${className}">
-                    <h4><i></i>${title}</h4>
+//推荐诊断等单种类型的
+function renderRecommendInfo(icon, className,title,data, hasInfo, type, position) {
+    const str = `<div class="recommendInfoWrapper ${className} clearfix">
+                    <h4><img src=${icon} title="${title}" class="icon">${title}:</h4>
                     <div class="recommendInfoBox">
                         <div class="clearfix recommendInfoItemBox ${className + 'box'}">
                         </div>
                     </div>
                 </div>`
-    $('.recommendWrap').append(str)
+    $('.push').append(str)
     let childrenNodeStr = ''
     if(hasInfo) {
         for (let i = 0; i < data.length; i++) {
@@ -26,74 +27,101 @@ function renderRecommendInfo(className,title,data, hasInfo, type, position) {
                                 </span>`
         }
     }
-    
+    if(!childrenNodeStr) {
+        childrenNodeStr = '<span class ="recommendNull">暂无推荐</span>'
+    }
     $('.'+className + 'box').append(childrenNodeStr)
+    let childrenNodeStrAll = `<div class="${className+'boxAll'} itemAllBox">
+            <h4>${title}:</h4>
+            <div class="itemAll">
+                ${childrenNodeStr}
+            </div>
+            <span class="slideup"><i></i></span>
+        </div>`
+
+    $('.push').append(childrenNodeStrAll)
     $('.'+className + 'box' +' .infoMsg').on('click', function(){
         const infoMsgName = $(this).attr('data-name')
         openNewWin(`information.html?type=${type}&position=${position}&name=${infoMsgName}`)
     })
-    slideToggle($("."+className+"box"))
+    slideToggle("."+className+"box")
 }
 
-function renderMultRecommendInfo(className,title,data, hasInfo, type, position) {
-    const str = `<div class="recommendInfoWrapper ${className}">
-                    <h4><i></i>${title}</h4>
+//化验和辅检等多种类型
+function renderMultRecommendInfo(icon, className,title,data, hasInfo, type, position) {
+    const str = `<div class="recommendInfoWrapper ${className} clearfix">
+                    <h4><img src=${icon} title="${title}" class="icon">${title}:</h4>
                     <div class="recommendInfoBox ${className + 'box'}"></div>
                 </div>`
-    $('.recommendWrap').append(str)
+    $('.push').append(str)
     
     for(let i = 0; i < data.length; i++) {
-        let childrenNodeBoxStr  = `<div class="labAndPacsBox ${data[i].className} clearfix"> </div>`
+        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 childrenNodeItemStrAll =  '' //更多展开框中的字符串
         for(let j = 0; j < data[i].data.length; j++) {
-            childrenNodeStr += `<span>${data[i].data[j].name}</span>`
+            childrenNodeStr += `<span class="labAndPacsItem">${data[i].data[j].name}</span>`
+            childrenNodeItemStrAll += `<span class="labAndPacsItem">${data[i].data[j].name}</span>`
         }
         $('.'+className + 'box').append(childrenNodeBoxStr)
-        $('.'+data[i].className).append(childrenNodeStr)
-        slideToggle($("."+data[i].className))
+        $('.'+data[i].className+'box').append(childrenNodeStr)
+        let childrenNodeStrAll = `<div class="${data[i].className+'boxAll'} itemAllBox">
+            <h4>${data[i].title}:</h4>
+            <div class="itemAll">
+                ${childrenNodeItemStrAll}
+                <span class="slideup"><i></i></span>
+            </div>
+        </div>`
+
+        $('.push').append(childrenNodeStrAll)
+        console.log(data[i].className,$("."+data[i].className+"box").height())
+        slideToggle("."+data[i].className+"box")
     }
 
 }
 
-function renderTreat(className,title, data) {
+function renderTreat(icon, className,title, data) {
     console.log('renderTreat')
-    const str = `<div class="recommendInfoWrapper ${className}">
-                    <h4><i></i>${title}</h4>
+    const str = `<div class="recommendInfoWrapper ${className} clearfix">
+                    <h4><img src=${icon} title="${title}" class="icon">${title}:<span class="diagName">${msg.diag}</span></h4>
                     <div class="recommendInfoBox clearfix ${className + 'box'}"></div>
                 </div>`
-    $('.recommendWrap').append(str)
+    $('.treat').append(str)
     if(data.commonTreatment&&data.commonTreatment.content) {
         renderTreatText('commonTreatment', '一般治疗', data.commonTreatment.content, className+'box')
     }
-    renderTreatDrug('drugTreatment', '常用药物治疗', data.treatment, className+'box')
+    renderTreatDrug('drugTreatment', '药物治疗', data.treatment, className+'box')
 }
 
 function renderTreatText(className,title,data, parentNode) {
     const childrenNodeBoxStr = `
         <div class = "treatItemBox ${className + 'box'}">
-            <p class="treatItemTitle">${title}</p>
+            <p class="treatItemTitle">${title}:</p>
             <p class="${className + 'Info'} clearfix"></p>
         </div>
     `
     $('.' + parentNode).append(childrenNodeBoxStr)
     $('.' + className+'Info').html(data)
     var commonTreatHeight = $(".commonTreatmentInfo").height()
-    if(commonTreatHeight > 75){
-        $(".commonTreatmentInfo").addClass('commonTreatmentInfoLimit').append('<span class="slideDown">更多 <i></i></span>')
-    }
-    $(".treatItemBox").on('click',".slideDown",function(){
-        $(this).parents(".commonTreatmentInfo").removeClass("commonTreatmentInfoLimit").append('<span class="slideup">收起 <i></i></span>')
-        $(this).remove()
-    })
-    $(".treatItemBox").on('click',".slideup",function(){
-        $(this).parents(".commonTreatmentInfo").addClass("commonTreatmentInfoLimit").append('<span class="slideDown">更多 <i></i></span>')
-        $(this).remove()
-    })
+    // if(commonTreatHeight > 75){
+    //     $(".commonTreatmentInfo").addClass('commonTreatmentInfoLimit').append('<span class="slideDown">更多 <i></i></span>')
+    // }
+    // $(".treatItemBox").on('click',".slideDown",function(){
+    //     $(this).parents(".commonTreatmentInfo").removeClass("commonTreatmentInfoLimit").append('<span class="slideup">收起 <i></i></span>')
+    //     $(this).remove()
+    // })
+    // $(".treatItemBox").on('click',".slideup",function(){
+    //     $(this).parents(".commonTreatmentInfo").addClass("commonTreatmentInfoLimit").append('<span class="slideDown">更多 <i></i></span>')
+    //     $(this).remove()
+    // })
 }
 function renderTreatDrug(className,title,data, parentNode) {
     const childrenNodeBoxStr = `
         <div class = "treatItemBox ${className + 'box'}">
-            <p class="treatItemTitle">${title}</p>
+            <p class="treatItemTitle">${title}:</p>
             <p class="${className + 'Info'}"></p>
         </div>
     `
@@ -123,134 +151,51 @@ function renderTreatDrug(className,title,data, parentNode) {
         const infoMsgName = $(this).attr('data-name')
         openNewWin(`information.html?type=8&position=5&name=${infoMsgName}`)
     })
+    $('.drugTreatmentbox').append('<span class="more">更多</span>')
+    $(".treat").on('click',".more",function(){
+        openNewWin(`treatplan.html?age=${msg.age}&sex=${msg.sex}&symptomJson=${msg.symptom}&vitalJson=${msg.vital}&lisJson=${msg.lis}&pacsJson=${msg.pacs}&diagJson=${msg.diag}&otherJson=${msg.other}&hospitalCode=${msg.hosCode}`)
+      })
     var treatList = $(".drugTreatmentInfo").find(".drugTreatmentInfoItemBox")
-    for(var h = 0;h < treatList.length;h++){ 
-        if($(treatList[h]).height() > 25){
-        $(treatList[h]).addClass('recommendInfoItemBoxLimit').append('<span class="slideDown">更多 <i></i></span>')
-        }
-        $(".drugTreatmentInfo").on('click',".slideDown",function(){
-        $(this).parents(".drugTreatmentInfoItemBox ").removeClass("recommendInfoItemBoxLimit").append('<span class="slideup">收起 <i></i></span>')
-        $(this).remove()
-        })
-        $(".drugTreatmentInfo").on('click',".slideup",function(){
-        $(this).parents(".drugTreatmentInfoItemBox ").addClass("recommendInfoItemBoxLimit").append('<span class="slideDown">更多 <i></i></span>')
-        $(this).remove()
-        })
-    }
+    // for(var h = 0;h < treatList.length;h++){ 
+    //     if($(treatList[h]).height() > 25){
+    //     $(treatList[h]).addClass('recommendInfoItemBoxLimit').append('<span class="slideDown">更多 <i></i></span>')
+    //     }
+    //     $(".drugTreatmentInfo").on('click',".slideDown",function(){
+    //     $(this).parents(".drugTreatmentInfoItemBox ").removeClass("recommendInfoItemBoxLimit").append('<span class="slideup">收起 <i></i></span>')
+    //     $(this).remove()
+    //     })
+    //     $(".drugTreatmentInfo").on('click',".slideup",function(){
+    //     $(this).parents(".drugTreatmentInfoItemBox ").addClass("recommendInfoItemBoxLimit").append('<span class="slideDown">更多 <i></i></span>')
+    //     $(this).remove()
+    //     })
+    // }
 }
 
-function renderRecommendConditTips(className,title,data) {
-    const str = `<div class="recommendInfoWrapper ${className}">
-                    <h4><i></i>${title}</h4>
+function renderRecommendConditTips(icon, className,title,data) {
+    const str = `<div class="recommendInfoWrapper ${className} clearfix">
+                    <h4><img src=${icon} title="${title}" class="icon">${title}:</h4>
                     <div class="recommendInfoBox  ${className + 'box'}"></div>
                 </div>`
-    $('.recommendWrap').append(str)
+    $('.push').append(str)
    
     for(var k = 0;k < data.length;k++){
         var tmpBq = data[k]
         var tmpBqStr = '<p class="mayIllness">患者可能有 <span>'+tmpBq.name+'<span title="点击该名称可看详细说明" class="infoMsg"></span></span> :</p>'
         var tmpBqStr = `<p class="mayIllness">
-                            患者可能有 <span class="diagNameBox">${tmpBq.name}
+                            患者可能有 <span class="diagNameBox">${tmpBq.name}:
                                 <span title="点击该名称可看详细说明" class="infoMsg" data-name=${tmpBq.name}></span>
-                            </span> :
+                            </span> 
                         </p>`
         var tmpBqDetailStr = ''
         for(var m = 0;m < tmpBq.details.length;m++){
           var tmpBqDetail = tmpBq.details[m]
           if(tmpBqDetail.type == 1){
-            tmpBqDetailStr+=`<span data-url=scale.html?featureType=21&sex=${msg.sex}&lis=${JSON.stringify(msg.lis)}&diag=${msg.diag}&scaleName=${tmpBqDetail.content.name}&symptom=${msg.symptom}&other=${msg.other}&pacs=${msg.pacs}&vital=${msg.vital}&age=${msg.age}&scaleId=${tmpBqDetail.content.id} class="illnessTable">${tmpBqDetail.content.name}</span>`
+            tmpBqDetailStr+=`<span data-url=scale.html?featureType=21&sex=${msg.sex}&lis=${JSON.stringify(msg.lis)}&diag=${msg.diag}&scaleName=${tmpBqDetail.content.name}&symptom=${msg.symptom}&other=${msg.other}&pacs=${msg.pacs}&vital=${msg.vital}&age=${msg.age}&scaleId=${tmpBqDetail.content.id} class="illnessTable">【${tmpBqDetail.content.name}】</span>`
           }
-          if(tmpBqDetail.type == 2){
-            var deepDetailName = `<div class="modalTitle">${tmpBqDetail.content.name}<i class="closeModal"></i></div>`
-            var deepDetailStr = ''
-            var deepDetailResultStr = ''
-            for(var n = 0;n < tmpBqDetail.content.details.length;n++){
-              var deepDetail = tmpBqDetail.content.details[n]
-              if(deepDetail.controlType == 2){//0-radio,1-checkbox,2-text,3-dropdownlist
-                deepDetailStr+=`<li class="radioCheck"><span class="modalMaintltle">请输入${deepDetail.name}: </span><input type="text" placeholder="请输入" value=${deepDetail.value}><i class="uint">${deepDetail.uint}</i></li>`
-              }
-              if(deepDetail.controlType == 0){
-                let tooDeepDetailStr = ''
-                for(var f = 0;f<deepDetail.details.length;f++){
-                  var tooDeepDetail = deepDetail.details[f]
-                  if(deepDetail.name == '性别'){
-                    tooDeepDetailStr+='<li class="radioChecks '+(tooDeepDetail.state == 1?"radioCheckSec":"")+'" data-select="'+(tooDeepDetail.state == 1?"select":"")+'"><i></i><span>'+tooDeepDetail.detailName+'</span></li>'
-                  }else{
-                    tooDeepDetailStr+='<li class="radioChecks"><i></i><span>'+tooDeepDetail.detailName+'</span>'+(tooDeepDetail.state == 1?"<a>（智能推荐）</a>":"")+'</li>'
-                  }
-                }
-                
-                
-                deepDetailStr+=`<li class="radioCheck"><span class="modalMaintltle">${deepDetail.name}: </span>
-                                <ul class="clearfix caculateLis">
-                                    ${tooDeepDetailStr}
-                                </ul>
-                            </li>`
-                  
-              }
-            }
-            for(var v = 0;v < tmpBqDetail.content.result.length;v++){
-              deepDetailResultStr+='<p class="result"><span class="calculateName">'+tmpBqDetail.content.result[v].name+'：</span><span class="calculateResult"></span></p>'
-            }
-            tmpBqDetailStr+=`<div class="mayResult">
-                计算公式结果：
-                <span class="mayResultSelect" data-num="${k}">
-                    <span class="makesureResult">请选择</span>
-                    <span class="sanjiao"></span>
-                    <div class="popupModal">
-                        ${deepDetailName}
-                        <div class="modalMainTwo">
-                            <ul class="clearfix">
-                                ${deepDetailStr}
-                            </ul>
-                            <div class="calculate" data-num="${k}">计算</div>
-                            <p class="calculateError">请填写计算公式内容</p>
-                            <div class="resultLis">
-                                ${deepDetailResultStr}
-                            </div>
-                        </div>
-                        <div class="btnWrap clearfix">
-                            <div class="sureScore" data-type="2">关闭</div>
-                        </div>
-                    </div>
-                </span>
-            </div>`
-            
-          }
-          if(tmpBqDetail.type == 3){
-            var deepDetailName = '<span class="modalMaintltle">'+tmpBqDetail.content.name+': </span>'
-            var deepDetailStr = ''
-            for(var n = 0;n < tmpBqDetail.content.details.length;n++){
-              var deepDetail = tmpBqDetail.content.details[n]
-              deepDetailStr+='<li class="radioChecks"><i></i><span>'+deepDetail.detailName+'</span>'+(deepDetail.state == 1?"<a>（智能推荐）</a>":"")+'</li>'
-            }
-
-              tmpBqDetailStr+=`<div class="mayResult">
-                可能结果：
-                <span class="mayResultSelect" data-num="${k}"><span class="makesureResult">请选择</span><i class="sanjiao"></i>
-                    <div class="popupModal">
-                    <div class="modalTitle">
-                        结果选择<i class="closeModal"></i>
-                    </div>
-                    <div class="modalMainOne">
-                        ${deepDetailName}
-                        <ul class="clearfix">
-                            ${deepDetailStr}
-                        </ul>
-                    </div>
-                    <div class="btnWrap clearfix">
-                        <div class="sureScore" data-type="3" data-num="${k}">确定</div>
-                    </div>
-                </div>
-                </span>
-            </div>`
-          }
-        }
-        if(tmpBqStr != '' || tmpBqDetailStr != ''){
-          $(".conditionHintTipsNull").css("display","none")
+        
         }
-        // $(".conditionHintTips").append('<div class="conditionMain clearfix">'+tmpBqStr+'<div class="alertModal">'+tmpBqDetailStr+'</div></div>')
-        $("."+className+"box").append('<div class="conditionMain clearfix">'+tmpBqStr+'<div class="alertModal">'+tmpBqDetailStr+'</div></div>')
+        
+        $("."+className+"box").append('<div class="conditionMain ellipse clearfix">'+tmpBqStr+'<div class="alertModal">'+tmpBqDetailStr+'</div><span class="more">更多</span></div>')
       }
       $('.mayIllness .infoMsg').on('click', function(){
         const infoMsgName = $(this).attr('data-name')
@@ -260,19 +205,24 @@ function renderRecommendConditTips(className,title,data) {
         const infoMsgUrl = $(this).attr('data-url')
         openNewWin(infoMsgUrl)
       })
+      $(".conditTipsbox").on('click',".more",function(){
+        openNewWin(`illness.html?age=${msg.age}&sex=${msg.sex}&symptomJson=${msg.symptom}&vitalJson=${msg.vital}&lisJson=${msg.lis}&pacsJson=${msg.pacs}&diagJson=${msg.diag}&otherJson=${msg.other}&hospitalCode=${msg.hosCode}`)
+      })
       bindTipsEvent()
 }
-function slideToggle(domName){//展开收起
-    if(domName.height() > 25){
-      domName.addClass("recommendInfoItemBoxLimit").append('<span class="slideDown">更多 <i></i></span>')
+function slideToggle(className){//展开收起
+    const domName = $(className)
+    const domNameBoxAll = $(className+'All')
+    if(domName.height() > 20){
+      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()
+        $(".itemAllBox").css('display', 'none')
+        $(domNameBoxAll).css('display', 'block')
+      
     })
-    domName.on('click',".slideup",function(){
-      domName.addClass("recommendInfoItemBoxLimit").append('<span class="slideDown">更多 <i></i></span>')
-      $(this).remove()
+    domNameBoxAll.on('click',".slideup",function(){
+        $(domNameBoxAll).css('display', 'none')
     })
   }
 

src/js/indexVertDom.js

@@ -46,7 +46,7 @@ function renderMultRecommendInfo(className,title,data, hasInfo, type, position)
         let childrenNodeBoxStr  = `<div class="labAndPacsBox ${data[i].className} clearfix"> </div>`
         let childrenNodeStr =  `<span class="labAndPacsTitle">${data[i].title}<i></i></span>`
         for(let j = 0; j < data[i].data.length; j++) {
-            childrenNodeStr += `<span>${data[i].data[j].name}</span>`
+            childrenNodeStr += `<span class="labAndPacsItem">${data[i].data[j].name}</span>`
         }
         $('.'+className + 'box').append(childrenNodeBoxStr)
         $('.'+data[i].className).append(childrenNodeStr)
@@ -102,7 +102,7 @@ function renderTreatDrug(className,title,data, parentNode) {
         let childrenNodeStr = `<p class="drugTreatmentInfoItemBox">
             ${i+1}.${data[i].bigdrugsName}(${data[i].subdrugsName}):`
         for (let j = 0; j < data[i].medicitionsList.length; j++) {
-            childrenNodeStr += `<span class="durgNameBox">${data[i].medicitionsList[j].medicitionName}`
+            childrenNodeStr += `<span class="durgNameBox"><span class="durgName">${data[i].medicitionsList[j].medicitionName}</span>`
             if(data[i].medicitionsList[j].drugsForbidden == '1') {
                 childrenNodeStr += `<span>慎用</span>`
             } else if(data[i].medicitionsList[j].drugsForbidden == '2') {
@@ -150,10 +150,10 @@ function renderRecommendConditTips(className,title,data) {
         var tmpBq = data[k]
         var tmpBqStr = '<p class="mayIllness">患者可能有 <span>'+tmpBq.name+'<span title="点击该名称可看详细说明" class="infoMsg"></span></span> :</p>'
         var tmpBqStr = `<p class="mayIllness">
-                            患者可能有 <span class="diagNameBox">${tmpBq.name}
+                            患者可能有 <span class="diagNameBox"><span class="diagName">${tmpBq.name}:</span>
                                 <span title="点击该名称可看详细说明" class="infoMsg" data-name=${tmpBq.name}></span>
-                            </span> :
-                        </p>`
+                            </span>
+                        </span>`
         var tmpBqDetailStr = ''
         for(var m = 0;m < tmpBq.details.length;m++){
           var tmpBqDetail = tmpBq.details[m]