Merge branch 'modeTree' of http://192.168.2.236:10080/zhouna/icssDService into modeTree

src/js/icssIndex.js

@@ -171,8 +171,7 @@ function getPageInfo(configArr) {
     if(hasCommon){
       if(hasCaseStandard){
         Promise.all([getHosptDeptUsal(),getPushInfo(),getAnalyse()]).then(([res1, res2, res3]) =>{
-          getPushData(res2)
-          diagCommon = res1&&res.data&&res.data.data&&res.data.data.warning || []
+          diagCommon = res1&&res.data&&res.data.data&&res.data.data || []
           diagWaring = res2&&res2.data&&res2.data.data&&res2.data.data.dis&&res2.data.data.dis['警惕'] || []
           diagFirst = res2&&res2.data&&res2.data.data&&res2.data.data.dis&&res2.data.data.dis['拟诊'] || []
           diagPossible = res2&&res2.data&&res2.data.data&&res2.data.data.dis&&res2.data.data.dis['可能诊断'] || []
@@ -204,8 +203,7 @@ function getPageInfo(configArr) {
         })
       } else{
         Promise.all([getHosptDeptUsal(),getPushInfo()]).then(([res1, res2]) =>{
-          getPushData(res2)
-          diagCommon = res1&&res1.data&&res1.data.data&&res1.data.data.warning || []
+          diagCommon = res1&&res1.data&&res1.data.data&&res1.data.data || []
           // diagWaring = res2&&res2.data&&res2.data.data&&res2.data.data.dis&&res2.data.data.dis['警惕'] || []
           diagFirst = res2&&res2.data&&res2.data.data&&res2.data.data.dis&&res2.data.data.dis['拟诊'] || []
           diagPossible = res2&&res2.data&&res2.data.data&&res2.data.data.dis&&res2.data.data.dis['可能诊断'] || []
@@ -417,7 +415,7 @@ function renderPageData(confArr,diagWaring,diagFirst,diagPossible,diagIdentify,l
           symptomRecommend.length > 0 && renderNum++
           break; 
         case "physical_show": //体格检查
-          physiExamRecommend.length > 0 &&  renderRecommendInfo(confArr[i].showNum,'physiExamRecommend', '体格检查', physiExamRecommend, false)
+          physiExamRecommend.length > 0 &&  renderRecommendInfo(5,'physiExamRecommend', '体格检查', physiExamRecommend, false)
              $('.physiExamRecommend h4 img').attr('src',physiExamImg)
           physiExamRecommend.length > 0 && renderNum++
           break;
@@ -430,7 +428,7 @@ function renderPageData(confArr,diagWaring,diagFirst,diagPossible,diagIdentify,l
           diagWaring.length > 0 &&  renderNum++;
           break;
         case "comsympto_show": //常见症状
-          diagCommon.length > 0 && renderRecommendInfo(confArr[i].showNum,'warning', '常见症状', diagCommon, true,7,2);
+          diagCommon.length > 0 && renderRecommendInfo(confArr[i].showNum,'commonSymp', '常见症状', diagCommon, true,7,2);
           diagCommon.length > 0 && renderNum++;
           break;
         case "specification_show": //病例书写规范

src/js/icssIndexDom.js

@@ -4,7 +4,6 @@ const { bindTipsEvent } = require('./popupEdit.js');
 
 function renderRecommendInfo(showNum,className,title,data, hasInfo, type, position) {
     let showNumCopy = showNum || 5
-    console.log('renderRecommendInfo')
     const dataLen = data.length
     const str = `<div class="recommendInfoWrapper ${className}">
                     <h4><img class="titleIcon" src="./images/knzd.png" alt="icon" />${title}</h4>
@@ -267,7 +266,6 @@ function renderRecommendConditTips(className,title,data) {
 
 
 function renderCaseStandard(className,title,data){
-    console.log('renderCaseStandard',className,title)
     const str = `<div class="recommendInfoWrapper ${className}">
         <h4><img class="titleIcon" src="./images/knzd.png" alt="icon" /> ${title}</h4>
         <div class="recommendInfoBox">
@@ -279,7 +277,6 @@ function renderCaseStandard(className,title,data){
     for(let i = 0; i < data.length; i++){
         childStr += `<p>${data[i]}</p>`
     }
-    console.log('childStr',childStr, )
     $('.recommendWrap').append(str)
     $(`.${className}box`).html(childStr)
 }