瀏覽代碼

数据服务排序

zhangxc 6 年之前
父節點
當前提交
366bb13a48
共有 6 個文件被更改,包括 366 次插入149 次删除
  1. 3 0
      src/css/indexHorizontal.less
  2. 3 0
      src/css/indexVert.less
  3. 157 62
      src/js/indexHorizontal.js
  4. 16 7
      src/js/indexHorizontalDom.js
  5. 167 72
      src/js/indexVert.js
  6. 20 8
      src/js/indexVertDom.js

+ 3 - 0
src/css/indexHorizontal.less

@@ -250,4 +250,7 @@
 .recommendInfoItem {
     position: relative;
     padding-right: 15px;
+}
+.recommendNull {
+    color: #ADADAD;
 }

+ 3 - 0
src/css/indexVert.less

@@ -285,4 +285,7 @@
 }
 .labAndPacsItem:hover {
     color: #267FD7;
+}
+.recommendNull {
+    color: #ADADAD;
 }

+ 157 - 62
src/js/indexHorizontal.js

@@ -2,7 +2,7 @@ require('./../css/reset.css');
 require('./../css/indexHorizontal.less');
 // require('./../css/popup.css');
 // require('./popupEdit.js');
-const 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')
@@ -37,86 +37,181 @@ function getConf() {
   return post(config.getSysSetInfoDatas,{hospitalCode: msg.hosCode}).then((res)=>{
       const data = res.data
       if(data.code == 0){
-          console.log('data', data)
           let confArr = transConf(data.data)
           window.confArr = confArr;
-          resolve(confArr)
       }
   })
 }
 
-function pushInfo() {
+function getPushInfo() {
   return post(config.pushInner,Object.assign({featureType: '1,4,5,6,7,22'},msg)).then((res)=>{
     var data = res.data
-    if(data.code == 0){
-        var result = data.data;
-        if(result.medicalIndications && result.medicalIndications.length>0){//病情提示
-          window.pushMessage = result.medicalIndications;//计算的需要的相关数据
-          renderRecommendConditTips(conditTipsImg, 'conditTips','病情提示', result.medicalIndications)
-        }
-        if(result.dis){
-            const diagPossible = result.dis['可能诊断'] || []//可能
-            const diagDoubt = result.dis['疑似诊断'] || [] // 疑似
-            const diagDeter = result.dis['确诊'] || []//确诊
-            const diagWaring = result.dis['警惕'] || [] // 推荐警惕诊断
-            const symptomRecommend = result.symptom || []  //推荐问诊症状
-            const physiExamRecommend  = result.vital || [] //推荐体格检查
-            const diagRecommend = diagPossible.concat(diagDoubt, diagDeter) //推荐诊断
-            const labRecommend = result.lab || []
-            const pacsRecommend = result.pacs || []
-            const labAndPacsRecommend = [
-                {
-                    title: '化验',
-                    className: 'labRecommend',
-                    data:  labRecommend
-                },
-                {
-                    title: '辅检',
-                    className: 'pacsRecommend',
-                    data:  pacsRecommend
-              }
-            ]
-            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)
-        }
+    window.pushInfo = data
+    // if(data.code == 0){
+    //     var result = data.data;
+    //     renderRecommendConditTips(conditTipsImg, 'conditTips','病情提示', [])
+    //     // if(result.medicalIndications && result.medicalIndications.length>0){//病情提示
+    //     //   window.pushMessage = result.medicalIndications;//计算的需要的相关数据
+    //     //   renderRecommendConditTips(conditTipsImg, 'conditTips','病情提示', result.medicalIndications)
+    //     // }
+    //     if(result.dis){
+    //         // const diagPossible = result.dis['可能诊断'] || []//可能
+    //         // const diagDoubt = result.dis['疑似诊断'] || [] // 疑似
+    //         // const diagDeter = result.dis['确诊'] || []//确诊
+    //         // const diagWaring = result.dis['警惕'] || [] // 推荐警惕诊断
+    //         // const symptomRecommend = result.symptom || []  //推荐问诊症状
+    //         // const physiExamRecommend  = result.vital || [] //推荐体格检查
+    //         // const diagRecommend = diagPossible.concat(diagDoubt, diagDeter) //推荐诊断
+    //         // const labRecommend = result.lab || []
+    //         // const pacsRecommend = result.pacs || []
+    //         // const labAndPacsRecommend = [
+    //         //     {
+    //         //         title: '化验',
+    //         //         className: 'labRecommend',
+    //         //         data:  labRecommend
+    //         //     },
+    //         //     {
+    //         //         title: '辅检',
+    //         //         className: 'pacsRecommend',
+    //         //         data:  pacsRecommend
+    //         //   }
+    //         // ]
+
+    //         const diagPossible =[]//可能
+    //         const diagDoubt =  [] // 疑似
+    //         const diagDeter =  []//确诊
+    //         const diagWaring =  [] // 推荐警惕诊断
+    //         const symptomRecommend =  []  //推荐问诊症状
+    //         const physiExamRecommend  =  [] //推荐体格检查
+    //         const diagRecommend = diagPossible.concat(diagDoubt, diagDeter) //推荐诊断
+    //         const labRecommend =  []
+    //         const pacsRecommend =  []
+    //         const labAndPacsRecommend = [
+    //             {
+    //                 title: '化验',
+    //                 className: 'labRecommend',
+    //                 data:  labRecommend
+    //             },
+    //             {
+    //                 title: '辅检',
+    //                 className: 'pacsRecommend',
+    //                 data:  pacsRecommend
+    //           }
+    //         ]
+
+    //         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)
+    //     }
       
     
       
-    }
+    // }
   })
 }
 
 function getTreatment() {
   post(config.pushTreatment,Object.assign({featureType: '8'},msg)).then((res)=>{
     var data = res.data
-    if(data.code == 0){
-      var result = data.data;
-      console.log('treatResult', result)
-      renderTreat(treatImg, 'treatRecommend','治疗方案',result)
-      // var num = 0;
-      // if(result.commonTreatment && result.commonTreatment.content){
-      //   ++num
-      //   ybzlFun(result.commonTreatment.content)//一般治疗
-      // }
-      // if(result.treatment && result.treatment.length>0){
-      //   ++num
-      //   cyywFun(result.treatment)//常用药物
-      // }
-      // if(num == 0){
-      //   $(".conditionHintZhiliaoNull").css("display","block")
-      // }
-    }
+    window.treatInfo = data
+    // if(data.code == 0){
+    //   var result = data.data;
+    //   renderTreat(treatImg, 'treatRecommend','治疗方案',result)
+    //   // var num = 0;
+    //   // if(result.commonTreatment && result.commonTreatment.content){
+    //   //   ++num
+    //   //   ybzlFun(result.commonTreatment.content)//一般治疗
+    //   // }
+    //   // if(result.treatment && result.treatment.length>0){
+    //   //   ++num
+    //   //   cyywFun(result.treatment)//常用药物
+    //   // }
+    //   // if(num == 0){
+    //   //   $(".conditionHintZhiliaoNull").css("display","block")
+    //   // }
+    // } else {
+    //   renderTreat(treatImg,'treatRecommend','治疗方案',{})
+    // }
   })
 }
-getConf();
-pushInfo();
-getTreatment();
-// Promise.all([getConf(),pushInfo(),getTreatment()]).then(([res1, res2, res3]) =>{
-//   console.log('asddddd',res1)
-// })
+// getConf();
+// pushInfo();
+// getTreatment();
+Promise.all([getConf(),getPushInfo(),getTreatment()]).then(([res1, res2, res3]) =>{
+  if(pushInfo.code == 0) {
+    pushResult = pushInfo.data;
+  } else {
+    pushResult = {};
+  }
+  if(treatInfo.code == 0) {
+    treatResult = treatInfo.data
+  } else {
+    treatResult = {}
+  }
+  const diagPossible =  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 || []  //推荐问诊症状
+  const physiExamRecommend  = pushResult.vital || [] //推荐体格检查
+  const diagRecommend = diagPossible.concat(diagDoubt, diagDeter) //推荐诊断
+  const labRecommend = pushResult.lab || []
+  const pacsRecommend = pushResult.pacs || []
+  const medicalIndications = pushResult.medicalIndications || []
+  const labAndPacsRecommend = [
+    {
+        title: '化验',
+        className: 'labRecommend',
+        data:  labRecommend
+    },
+    {
+        title: '辅检',
+        className: 'pacsRecommend',
+        data:  pacsRecommend
+    }
+  ]
+  window.pushMessage = medicalIndications;//计算的需要的相关数据
+  for(let i = 0; i < confArr.length; i++) {
+
+    switch(confArr[i].code) {
+      case "inquiry_show":  //问诊症状
+        renderRecommendInfo(symptomImg, 'symptomRecommend', '问诊症状', symptomRecommend, false)
+        break; 
+      case "health_show": //体格检查
+        renderRecommendInfo(physiExamImg, 'physiExamRecommend', '体格检查', physiExamRecommend, false)
+        break;
+      case "illness_show": //病情提示
+        renderRecommendConditTips(conditTipsImg, 'conditTips','病情提示', medicalIndications || [])
+        break;
+      case "vigilant_show": //警惕诊断
+        renderRecommendInfo(warningImg, 'warning', '警惕诊断', diagWaring, true,7,2)
+        break;
+      case "lispacs_show": //检验检查
+        renderMultRecommendInfo(labAndPacsImg, 'labAndPacsRecommend', '检验检查', labAndPacsRecommend, false)
+        break;
+      case "cure_show": //治疗方案
+        renderTreat(treatImg, 'treatRecommend','治疗方案',treatResult)
+        break;
+      case "diagnose_show": //推荐诊断
+        renderRecommendInfo(diagImg, 'diagRecommend', '推荐诊断', diagRecommend, true,7,2)
+        break;
+      default:
+         return
+    } 
+  }
+
+  // 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('labAndPacsRecommend', '检验检查', labAndPacsRecommend, false)
+  // renderTreat(treatImg, 'treatRecommend','治疗方案',treatResult) 
+  
+  // renderRecommendConditTips(conditTipsImg, 'conditTips','病情提示', medicalIndications || [])
+  
+})
 
 
 $(".disclaimerInfo").on("click", function(){

+ 16 - 7
src/js/indexHorizontalDom.js

@@ -66,6 +66,9 @@ function renderMultRecommendInfo(icon, className,title,data, hasInfo, type, posi
             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) {
+            childrenNodeStr +='<span class="recommendNull">暂无推荐</span>'
+        }
         $('.'+className + 'box').append(childrenNodeBoxStr)
         $('.'+data[i].className+'box').append(childrenNodeStr)
         let childrenNodeStrAll = `<div class="${data[i].className+'boxAll'} itemAllBox">
@@ -77,23 +80,21 @@ function renderMultRecommendInfo(icon, className,title,data, hasInfo, type, posi
         </div>`
 
         $('.push').append(childrenNodeStrAll)
-        console.log(data[i].className,$("."+data[i].className+"box").height())
         slideToggle("."+data[i].className+"box")
     }
 
 }
 
 function renderTreat(icon, className,title, data) {
-    console.log('renderTreat')
     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>`
     $('.treat').append(str)
-    if(data.commonTreatment&&data.commonTreatment.content) {
-        renderTreatText('commonTreatment', '一般治疗', data.commonTreatment.content, className+'box')
-    }
-    renderTreatDrug('drugTreatment', '药物治疗', data.treatment, className+'box')
+    const commonTreatmentInfo = data.commonTreatment&&data.commonTreatment.content || ""
+    const treatmentList = data.treatment || []
+    renderTreatText('commonTreatment', '一般治疗', commonTreatmentInfo, className+'box')
+    renderTreatDrug('drugTreatment', '药物治疗', treatmentList, className+'box')
 }
 
 function renderTreatText(className,title,data, parentNode) {
@@ -104,6 +105,9 @@ function renderTreatText(className,title,data, parentNode) {
         </div>
     `
     $('.' + parentNode).append(childrenNodeBoxStr)
+    if(!data) {
+        data = '<span class="recommendNull">暂无推荐</span>'
+    }
     $('.' + className+'Info').html(data)
     var commonTreatHeight = $(".commonTreatmentInfo").height()
     // if(commonTreatHeight > 75){
@@ -126,6 +130,9 @@ function renderTreatDrug(className,title,data, parentNode) {
         </div>
     `
     $('.' + parentNode).append(childrenNodeBoxStr)
+    if(data.length ==0) {
+        $('.' + className+'Info').append('<span class="recommendNull">暂无推荐</span>')
+    }
     for(let i = 0; i < data.length; i++) {
         let childrenNodeStr = `<p class="drugTreatmentInfoItemBox">
             ${i+1}.${data[i].bigdrugsName}(${data[i].subdrugsName}):`
@@ -177,7 +184,9 @@ function renderRecommendConditTips(icon, className,title,data) {
                     <div class="recommendInfoBox  ${className + 'box'}"></div>
                 </div>`
     $('.push').append(str)
-   
+    if(data.length == 0) {
+        $("."+className+"box").append('<span class="recommendNull">暂无推荐</span>')
+    }
     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>'

+ 167 - 72
src/js/indexVert.js

@@ -2,7 +2,7 @@ require('./../css/reset.css');
 require('./../css/indexVert.less');
 require('./../css/popup.css');
 // require('./popupEdit.js');
-var Promise = require('./rePromise');
+// var Promise = require('./rePromise');
 
 const $ = require("jquery");
 const { post,config,getUrlArgObject,openNewWin } = require('./promise.js');
@@ -26,88 +26,183 @@ window.msg = msg
 window.pushMessage = {}
 function getConf() {
   return post(config.getSysSetInfoDatas,{hospitalCode: msg.hosCode}).then((res)=>{
-      const data = res.data
-      if(data.code == 0){
-          console.log('data', data)
-          let confArr = transConf(data.data)
-          window.confArr = confArr;
-          resolve(confArr)
-      }
+        const data = res.data
+        if(data.code == 0){
+            let confArr = transConf(data.data)
+            window.confArr = confArr;
+        }
   })
 }
 
-function pushInfo() {
-  return post(config.pushInner,Object.assign({featureType: '1,4,5,6,7,22'},msg)).then((res)=>{
-    var data = res.data
-    if(data.code == 0){
-        var result = data.data;
-        if(result.medicalIndications && result.medicalIndications.length>0){//病情提示
-          window.pushMessage = result.medicalIndications;//计算的需要的相关数据
-          renderRecommendConditTips('conditTips','病情提示', result.medicalIndications)
-        }
-        if(result.dis){
-            const diagPossible = result.dis['可能诊断'] || []//可能
-            const diagDoubt = result.dis['疑似诊断'] || [] // 疑似
-            const diagDeter = result.dis['确诊'] || []//确诊
-            const diagWaring = result.dis['警惕'] || [] // 推荐警惕诊断
-            const symptomRecommend = result.symptom || []  //推荐问诊症状
-            const physiExamRecommend  = result.vital || [] //推荐体格检查
-            const diagRecommend = diagPossible.concat(diagDoubt, diagDeter) //推荐诊断
-            const labRecommend = result.lab || []
-            const pacsRecommend = result.pacs || []
-            const labAndPacsRecommend = [
-                {
-                    title: '化验',
-                    className: 'labRecommend',
-                    data:  labRecommend
-                },
-                {
-                    title: '辅检',
-                    className: 'pacsRecommend',
-                    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)
-        }
+function getPushInfo() {
+  return  post(config.pushInner,Object.assign({featureType: '1,4,5,6,7,22'},msg)).then((res)=>{
+          var data = res.data
+          window.pushInfo = data
+          if(data.code == 0){
+              var result = data.data;
+              // if(result.medicalIndications && result.medicalIndications.length>0){//病情提示
+              //   window.pushMessage = result.medicalIndications;//计算的需要的相关数据
+              //   renderRecommendConditTips('conditTips','病情提示', result.medicalIndications || [])
+              // }
+              if(result.dis){
+                  const diagPossible = result.dis['可能诊断'] || []//可能
+                  const diagDoubt = result.dis['疑似诊断'] || [] // 疑似
+                  const diagDeter = result.dis['确诊'] || []//确诊
+                  const diagWaring = result.dis['警惕'] || [] // 推荐警惕诊断
+                  const symptomRecommend = result.symptom || []  //推荐问诊症状
+                  const physiExamRecommend  = result.vital || [] //推荐体格检查
+                  const diagRecommend = diagPossible.concat(diagDoubt, diagDeter) //推荐诊断
+                  const labRecommend = result.lab || []
+                  const pacsRecommend = result.pacs || []
+                  const labAndPacsRecommend = [
+                      {
+                          title: '化验',
+                          className: 'labRecommend',
+                          data:  labRecommend
+                      },
+                      {
+                          title: '辅检',
+                          className: 'pacsRecommend',
+                          data:  pacsRecommend
+                    }
+                  ]
       
-    
+                  // const diagPossible =[]//可能
+                  // const diagDoubt =  [] // 疑似
+                  // const diagDeter =  []//确诊
+                  // const diagWaring =  [] // 推荐警惕诊断
+                  // const symptomRecommend =  []  //推荐问诊症状
+                  // const physiExamRecommend  =  [] //推荐体格检查
+                  // const diagRecommend = diagPossible.concat(diagDoubt, diagDeter) //推荐诊断
+                  // const labRecommend =  []
+                  // const pacsRecommend =  []
+                  // const labAndPacsRecommend = [
+                  //     {
+                  //         title: '化验',
+                  //         className: 'labRecommend',
+                  //         data:  labRecommend
+                  //     },
+                  //     {
+                  //         title: '辅检',
+                  //         className: 'pacsRecommend',
+                  //         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)
+              }
+          }
   })
+  
 }
 
 function getTreatment() {
-  post(config.pushTreatment,Object.assign({featureType: '8'},msg)).then((res)=>{
-    var data = res.data
-    if(data.code == 0){
-      var result = data.data;
-      console.log('treatResult', result)
-      renderTreat('treatRecommend','治疗方案',result)
-      // var num = 0;
-      // if(result.commonTreatment && result.commonTreatment.content){
-      //   ++num
-      //   ybzlFun(result.commonTreatment.content)//一般治疗
-      // }
-      // if(result.treatment && result.treatment.length>0){
-      //   ++num
-      //   cyywFun(result.treatment)//常用药物
-      // }
-      // if(num == 0){
-      //   $(".conditionHintZhiliaoNull").css("display","block")
-      // }
-    }
+  return  post(config.pushTreatment,Object.assign({featureType: '8'},msg)).then((res)=>{
+          var data = res.data
+          window.treatInfo = data
+          // if(data.code == 0){
+          //   var result = data.data;
+          //   renderTreat('treatRecommend','治疗方案',result)
+          //   // var num = 0;
+          //   // if(result.commonTreatment && result.commonTreatment.content){
+          //   //   ++num
+          //   //   ybzlFun(result.commonTreatment.content)//一般治疗
+          //   // }
+          //   // if(result.treatment && result.treatment.length>0){
+          //   //   ++num
+          //   //   cyywFun(result.treatment)//常用药物
+          //   // }
+          //   // if(num == 0){
+          //   //   $(".conditionHintZhiliaoNull").css("display","block")
+          //   // }
+          // } else {
+          //   renderTreat('treatRecommend','治疗方案',{})
+          // }
+
   })
+  
 }
-getConf();
-pushInfo();
-getTreatment();
-// Promise.all([getConf(),pushInfo(),getTreatment()]).then(([res1, res2, res3]) =>{
-//   console.log('asddddd',res1)
-// })
+
+// getConf()
+// pushInfo()
+// getTreatment();
+Promise.all([getConf(),getPushInfo(),getTreatment()]).then(([res1, res2, res3]) =>{
+  if(pushInfo.code == 0) {
+    pushResult = pushInfo.data;
+  } else {
+    pushResult = {};
+  }
+  if(treatInfo.code == 0) {
+    treatResult = treatInfo.data
+  } else {
+    treatResult = {}
+  }
+  const diagPossible =  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 || []  //推荐问诊症状
+  const physiExamRecommend  = pushResult.vital || [] //推荐体格检查
+  const diagRecommend = diagPossible.concat(diagDoubt, diagDeter) //推荐诊断
+  const labRecommend = pushResult.lab || []
+  const pacsRecommend = pushResult.pacs || []
+  const medicalIndications = pushResult.medicalIndications || []
+  const labAndPacsRecommend = [
+    {
+        title: '化验',
+        className: 'labRecommend',
+        data:  labRecommend
+    },
+    {
+        title: '辅检',
+        className: 'pacsRecommend',
+        data:  pacsRecommend
+    }
+  ]
+  window.pushMessage = medicalIndications;//计算的需要的相关数据
+  for(let i = 0; i < confArr.length; i++) {
+
+    switch(confArr[i].code) {
+      case "inquiry_show":  //问诊症状
+        renderRecommendInfo('symptomRecommend', '问诊症状', symptomRecommend, false)
+        break; 
+      case "health_show": //体格检查
+        renderRecommendInfo('physiExamRecommend', '体格检查', physiExamRecommend, false)
+        break;
+      case "illness_show": //病情提示
+        renderRecommendConditTips('conditTips','病情提示', medicalIndications || [])
+        break;
+      case "vigilant_show": //警惕诊断
+        renderRecommendInfo('warning', '警惕诊断', diagWaring, true,7,2)
+        break;
+      case "lispacs_show": //检验检查
+        renderMultRecommendInfo('labAndPacsRecommend', '检验检查', labAndPacsRecommend, false)
+        break;
+      case "cure_show": //治疗方案
+        renderTreat('treatRecommend','治疗方案',treatResult)
+        break;
+      case "diagnose_show": //推荐诊断
+        renderRecommendInfo('diagRecommend', '推荐诊断', diagRecommend, true,7,2)
+        break;
+      default:
+         return
+    } 
+  }
+
+  // renderRecommendInfo('warning', '警惕诊断', diagWaring, true,7,2)
+  // renderRecommendInfo('diagRecommend', '推荐诊断', diagRecommend, true,7,2)
+  // renderRecommendInfo('symptomRecommend', '问诊症状', symptomRecommend, false)
+  // renderRecommendInfo('physiExamRecommend', '体格检查', physiExamRecommend, false)
+  // renderMultRecommendInfo('labAndPacsRecommend', '检验检查', labAndPacsRecommend, false)
+  // renderTreat('treatRecommend','治疗方案',treatResult) 
+  
+  // renderRecommendConditTips('conditTips','病情提示', medicalIndications || [])
+  
+})
 
 
 $(".disclaimerInfo").on("click", function(){

+ 20 - 8
src/js/indexVertDom.js

@@ -26,6 +26,9 @@ function renderRecommendInfo(className,title,data, hasInfo, type, position) {
                                 </span>`
         }
     }
+    if(!childrenNodeStr) {
+        childrenNodeStr='<span class="recommendNull">暂无推荐</span>'
+    }
     
     $('.'+className + 'box').append(childrenNodeStr)
     $('.'+className + 'box' +' .infoMsg').on('click', function(){
@@ -41,13 +44,15 @@ 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++) {
         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 class="labAndPacsItem">${data[i].data[j].name}</span>`
         }
+        if(data[i].data.length == 0) {
+            childrenNodeStr +='<span class="recommendNull">暂无推荐</span>'
+        }
         $('.'+className + 'box').append(childrenNodeBoxStr)
         $('.'+data[i].className).append(childrenNodeStr)
         slideToggle($("."+data[i].className))
@@ -56,16 +61,15 @@ function renderMultRecommendInfo(className,title,data, hasInfo, type, position)
 }
 
 function renderTreat(className,title, data) {
-    console.log('renderTreat')
     const str = `<div class="recommendInfoWrapper ${className}">
-                    <h4><i></i>${title}(${msg.diag})</h4>
+                    <h4><i></i>${title}${msg.diag?'('+msg.diag+')':''}</h4>
                     <div class="recommendInfoBox clearfix ${className + 'box'}"></div>
                 </div>`
     $('.recommendWrap').append(str)
-    if(data.commonTreatment&&data.commonTreatment.content) {
-        renderTreatText('commonTreatment', '一般治疗', data.commonTreatment.content, className+'box')
-    }
-    renderTreatDrug('drugTreatment', '常用药物治疗', data.treatment, className+'box')
+    const commonTreatmentInfo = data.commonTreatment&&data.commonTreatment.content || ""
+    const treatmentList = data.treatment || []
+    renderTreatText('commonTreatment', '一般治疗', commonTreatmentInfo, className+'box')
+    renderTreatDrug('drugTreatment', '常用药物治疗', treatmentList, className+'box')
 }
 
 function renderTreatText(className,title,data, parentNode) {
@@ -76,6 +80,9 @@ function renderTreatText(className,title,data, parentNode) {
         </div>
     `
     $('.' + parentNode).append(childrenNodeBoxStr)
+    if(!data) {
+        data = '<span class="recommendNull">暂无推荐</span>'
+    }
     $('.' + className+'Info').html(data)
     var commonTreatHeight = $(".commonTreatmentInfo").height()
     if(commonTreatHeight > 75){
@@ -98,6 +105,9 @@ function renderTreatDrug(className,title,data, parentNode) {
         </div>
     `
     $('.' + parentNode).append(childrenNodeBoxStr)
+    if(data.length ==0) {
+        $('.' + className+'Info').append('<span class="recommendNull">暂无推荐</span>')
+    }
     for(let i = 0; i < data.length; i++) {
         let childrenNodeStr = `<p class="drugTreatmentInfoItemBox">
             ${i+1}.${data[i].bigdrugsName}(${data[i].subdrugsName}):`
@@ -145,7 +155,9 @@ function renderRecommendConditTips(className,title,data) {
                     <div class="recommendInfoBox  ${className + 'box'}"></div>
                 </div>`
     $('.recommendWrap').append(str)
-   
+    if(data.length == 0) {
+        $("."+className+"box").append('<span class="recommendNull">暂无推荐</span>')
+    }
     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>'