1178232204@qq.com před 3 roky
rodič
revize
cbc71f868b
6 změnil soubory, kde provedl 195 přidání a 223 odebrání
  1. 9 2
      src/css/cdss.less
  2. binární
      src/images/d2.png
  3. binární
      src/images/toast-4.png
  4. 92 117
      src/js/cdss.js
  5. 93 104
      src/js/cdssHorizontal.js
  6. 1 0
      src/js/util.js

+ 9 - 2
src/css/cdss.less

@@ -652,8 +652,8 @@ body {
   .haslis,
   .mayevaluation,
   .hasevaluation,
-  .maydis,
-  .hasdis {
+  .mayantidias,
+  .hasantidias {
     .shortBox,
     .longBox {
       padding: 4px 0;
@@ -692,6 +692,7 @@ body {
       float: right;
       margin-top: 11px;
       margin-right: 5px;
+      width: 10px;
     }
     .moduleCenter {
       display: none;
@@ -757,3 +758,9 @@ body {
   top: 0;
   height: 30px;
 }
+.box-title{
+  color: #000;
+}
+.shortBox-tit{
+  color: #333;
+}

binární
src/images/d2.png


binární
src/images/toast-4.png


+ 92 - 117
src/js/cdss.js

@@ -36,6 +36,7 @@ let iconMark = require('./../images/icon_mark.png').replace(/^undefined/g, '')
 let warnImg = require('./../images/icon_warning.png').replace(/^undefined/g, '')
 let warnImgWhite = require('./../images/icon_waring_white.png').replace(/^undefined/g, '')
 let down = require('./../images/d1.png').replace(/^undefined/g, '')
+let ups = require('./../images/d2.png').replace(/^undefined/g, '')
 let more = require('./../images/more.png').replace(/^undefined/g, '')
 let up = require('./../images/icon-up.png').replace(/^undefined/g, '')
 let maydiagnoseList = [], hasdiagnoseList = [];
@@ -369,10 +370,10 @@ function renderpushByMayDisease(name, i) {
       let nursePush = result.nurse || []
       console.log(maydiagnoseType);
       if (symptomPush.length == 0 && vitalPush.length == 0 && lisPush.length == 0 && pacsPush.length == 0 && scalePush.length == 0 && disPush.length == 0 && treatPush.length == 0 && medicinesPush.length == 0 && operationsPush.length == 0 && nursePush.length == 0) {
-        $.toast('toast1', '', 3000,'.maydiagnose',i);
-      } else if(maydiagnoseType){
-        $.toast('toast2', '', 3000,'.maydiagnose',i);
-      }else{
+        $.toast('toast1', '', 3000, '.maydiagnose', i);
+      } else if (maydiagnoseType) {
+        $.toast('toast2', '', 3000, '.maydiagnose', i);
+      } else {
         renderMaySymptomPush(symptomPush)
         renderMayVitalPush(vitalPush)
         renderMayLisPush(lisPush)
@@ -415,10 +416,10 @@ function renderpushByHasDisease(name, i) {
       let nursePush = result.nurse || {}
       console.log(hasdiagnoseType);
       if (symptomPush.length == 0 && vitalPush.length == 0 && lisPush.length == 0 && pacsPush.length == 0 && scalePush.length == 0 && disPush.length == 0 && treatPush.length == 0 && medicinesPush.length == 0 && operationsPush.length == 0 && nursePush.length == 0) {
-        $.toast('toast1', '', 3000,'.hasdiagnose',i);
-      } else if(hasdiagnoseType){
-        $.toast('toast2', '', 3000,'.hasdiagnose',i);
-      }else {
+        $.toast('toast1', '', 3000, '.hasdiagnose', i);
+      } else if (hasdiagnoseType) {
+        $.toast('toast2', '', 3000, '.hasdiagnose', i);
+      } else {
         renderHasSymptomPush(symptomPush)
         renderHasVitalPush(vitalPush)
         renderHasLisPush(lisPush)
@@ -663,10 +664,13 @@ function renderDiagList(list, showNum) {
         $(".loading").show();
         $(".maydiagnose .box[data-index=" + i + "]").find(".moduleCenter").html('')
         $(".maydiagnose .box").find(".moduleCenter").css("display", "none")
+        $(".maydiagnose .box").find(".box-img").attr('src',down)
         $(".maydiagnose .box[data-index=" + i + "]").find(".moduleCenter").css("display", "block")
+        $(e.target).find(".box-img").attr('src',ups)
         renderpushByMayDisease(name, i)
       } else {
         $(".maydiagnose .box[data-index=" + i + "]").find(".moduleCenter").css("display", "none")
+        $(e.target).find(".box-img").attr('src',down)
       }
     });
   }
@@ -965,26 +969,42 @@ function renderHasDisPush(list) {
   }
 }
 function renderMayPush(treatPush, medicinesPush, operationsPush, nursePush) {
+  let generalstate, medicinestate, operationstate, nursestate, medicinenum, operationnum, nursenum
+  for (let i = 0; i < maydiagnoseList.length; i++) {
+    const item = maydiagnoseList[i];
+    if (item.code == 'maygeneral') {
+      generalstate = item.status
+    } else if (item.code == 'maymedicine') {
+      medicinestate = item.status
+      medicinenum = item.number
+    } else if (item.code == 'mayoperation') {
+      operationstate = item.status
+      operationnum = item.number
+    } else if (item.code == 'maynurse') {
+      nursestate = item.status
+      nursenum = item.number
+    }
+  }
   $(".box[data-index=" + indexNow + "]").find(".moduleCenter").append("<div class='centerBox'></div>")
   let str = `<ul>
-    ${treatPush.length > 0 ? `<li class="general">一般治疗</li>` : ''}
-    ${medicinesPush.length > 0 ? `<li class="medicine">推荐用药</li>` : ''}
-    ${operationsPush.length > 0 ? `<li class="operation">推荐手术/操作</li>` : ''}
-    ${nursePush.length > 0 ? `<li class="nurse">推荐护理</li>` : ''}
+    ${treatPush.length > 0 && generalstate != 0 ? `<li class="general" data-index="0">一般治疗</li>` : ''}
+    ${medicinesPush.length > 0 && medicinestate != 0 ? `<li class="medicine" data-index="1">推荐用药</li>` : ''}
+    ${operationsPush.length > 0 && operationstate != 0 ? `<li class="operation" data-index="2">推荐手术/操作</li>` : ''}
+    ${nursePush.length > 0 && nursestate != 0 ? `<li class="nurse" data-index="3">推荐护理</li>` : ''}
   </ul>
   <div class="centerBoxItem">
-    ${treatPush.length > 0 ? `<div class="checkBox generalItem maygeneral" data-index="0"></div>` : ''}
-    ${medicinesPush.length > 0 ? `<div class="checkBox medicineItem maymedicine" data-index="1"></div>` : ''}
-    ${operationsPush.length > 0 ? `<div class="checkBox operationItem mayoperation" data-index="2"></div>` : ''}
-    ${nursePush.length > 0 ? `<div class="checkBox nurseItem maynurse" data-index="3"></div>` : ''}
+    ${treatPush.length > 0 && generalstate != 0 ? `<div class="checkBox generalItem maygeneral" data-index="0"></div>` : ''}
+    ${medicinesPush.length > 0 && medicinestate != 0 ? `<div class="checkBox medicineItem maymedicine" data-index="1"></div>` : ''}
+    ${operationsPush.length > 0 && operationstate != 0 ? `<div class="checkBox operationItem mayoperation" data-index="2"></div>` : ''}
+    ${nursePush.length > 0 && nursestate != 0 ? `<div class="checkBox nurseItem maynurse" data-index="3"></div>` : ''}
   </div>`
   $(".maydiagnose  .box[data-index=" + indexNow + "]").find(".moduleCenter .centerBox").append(str)
   renderMayTreatPush(treatPush)
-  renderMayMedicPush(medicinesPush)
-  renderMayOperationsPush(operationsPush)
-  renderMayNursePush(nursePush)
+  renderMayMedicPush(medicinesPush, medicinenum)
+  renderMayOperationsPush(operationsPush, operationnum)
+  renderMayNursePush(nursePush, nursenum)
   $('.maydiagnose .centerBox ul li').click(function () {
-    var i = $(this).index();
+    var i = $(this).attr('data-index');
     if ($(this).hasClass('active')) {
       $(this).removeClass('active');
       $(".maydiagnose .checkBox[data-index=" + i + "]").removeClass('onshow');
@@ -995,26 +1015,42 @@ function renderMayPush(treatPush, medicinesPush, operationsPush, nursePush) {
   });
 }
 function renderHasPush(treatPush, medicinesPush, operationsPush, nursePush) {
+  let generalstate, medicinestate, operationstate, nursestate, medicinenum, operationnum, nursenum
+  for (let i = 0; i < maydiagnoseList.length; i++) {
+    const item = maydiagnoseList[i];
+    if (item.code == 'maygeneral') {
+      generalstate = item.status
+    } else if (item.code == 'maymedicine') {
+      medicinestate = item.status
+      medicinenum = item.number
+    } else if (item.code == 'mayoperation') {
+      operationstate = item.status
+      operationnum = item.number
+    } else if (item.code == 'maynurse') {
+      nursestate = item.status
+      nursenum = item.number
+    }
+  }
   $(".hasdiagnose .box[data-index=" + indexNow + "]").find(".moduleCenter").append("<div class='centerBox'></div>")
   let str = `<ul>
-    ${treatPush.length > 0 ? `<li class="general">一般治疗</li>` : ''}
-    ${medicinesPush.length > 0 ? `<li class="medicine">推荐用药</li>` : ''}
-    ${operationsPush.length > 0 ? `<li class="operation">推荐手术/操作</li>` : ''}
-    ${nursePush.length > 0 ? `<li class="nurse">推荐护理</li>` : ''}
+    ${treatPush.length > 0 && generalstate != 0 ? `<li class="general" data-index="0">一般治疗</li>` : ''}
+    ${medicinesPush.length > 0 && medicinestate != 0 ? `<li class="medicine" data-index="1">推荐用药</li>` : ''}
+    ${operationsPush.length > 0 && operationstate != 0 ? `<li class="operation" data-index="2">推荐手术/操作</li>` : ''}
+    ${nursePush.length > 0 && nursestate != 0 ? `<li class="nurse" data-index="3">推荐护理</li>` : ''}
   </ul>
   <div class="centerBoxItem">
-    ${treatPush.length > 0 ? `<div class="checkBox generalItem hasgeneral" data-index="0"></div>` : ''}
-    ${medicinesPush.length > 0 ? `<div class="checkBox medicineItem hasmedicine" data-index="1"></div>` : ''}
-    ${operationsPush.length > 0 ? `<div class="checkBox operationItem hasoperation" data-index="2"></div>` : ''}
-    ${nursePush.length > 0 ? `<div class="checkBox nurseItem hasnurse" data-index="3"></div>` : ''}
+    ${treatPush.length > 0 && generalstate != 0 ? `<div class="checkBox generalItem hasgeneral" data-index="0"></div>` : ''}
+    ${medicinesPush.length > 0 && medicinestate != 0 ? `<div class="checkBox medicineItem hasmedicine" data-index="1"></div>` : ''}
+    ${operationsPush.length > 0 && operationstate != 0 ? `<div class="checkBox operationItem hasoperation" data-index="2"></div>` : ''}
+    ${nursePush.length > 0 && nursestate != 0 ? `<div class="checkBox nurseItem hasnurse" data-index="3"></div>` : ''}
   </div>`
   $(".hasdiagnose .box[data-index=" + indexNow + "]").find(".moduleCenter .centerBox").append(str)
   renderHasTreatPush(treatPush)
-  renderHasMedicPush(medicinesPush)
-  renderHasOperationsPush(operationsPush)
-  renderHasNursePush(nursePush)
+  renderHasMedicPush(medicinesPush,medicinenum)
+  renderHasOperationsPush(operationsPush,operationnum)
+  renderHasNursePush(nursePush,nursenum)
   $('.hasdiagnose .centerBox ul li').click(function () {
-    var i = $(this).index();
+    var i = $(this).attr('data-index');
     if ($(this).hasClass('active')) {
       $(this).removeClass('active');
       $(".hasdiagnose .checkBox[data-index=" + i + "]").removeClass('onshow');
@@ -1026,124 +1062,63 @@ function renderHasPush(treatPush, medicinesPush, operationsPush, nursePush) {
   });
 }
 function renderMayTreatPush(list) {
-  let state
-  for (let i = 0; i < maydiagnoseList.length; i++) {
-    const item = maydiagnoseList[i];
-    if (item.code == 'maygeneral') {
-      state = item.status
-    }
-  }
-  if (list.length > 0 && state != 0) {
+  if (list.length > 0) {
     let str = ''
     for (let i = 0; i < list.length; i++) {
       const item = list[i];
-      str = `${item.generaTreat}`
+      str = `${item.generaTreat || ''}`
     }
     $(".maygeneral").append(str)
   }
 }
 function renderHasTreatPush(list) {
-  let state
-  for (let i = 0; i < hasdiagnoseList.length; i++) {
-    const item = hasdiagnoseList[i];
-    if (item.code == 'hasgeneral') {
-      state = item.status
-    }
-  }
-  if (list.length > 0 && state != 0) {
+  if (list.length > 0) {
     let str = ''
     for (let i = 0; i < list.length; i++) {
       const item = list[i];
-      str = `${item.generaTreat}`
+      str = `${item.generaTreat || ''}`
     }
     $(".hasgeneral").append(str)
   }
 }
-function renderMayMedicPush(list) {
-  let num, state
-  for (let i = 0; i < maydiagnoseList.length; i++) {
-    const item = maydiagnoseList[i];
-    if (item.code == 'maymedicine') {
-      num = item.number
-      state = item.status
-    }
-  }
-  if (list.length > 0 && state != 0) {
+function renderMayMedicPush(list, num) {
+  if (list.length > 0) {
     moduleNum++
     let { shortStr, longStr } = renderItemWrapper(list, num)
     $(".maymedicine").append(shortStr).append(longStr)
   }
 }
-function renderHasMedicPush(list) {
-  let num, state
-  for (let i = 0; i < hasdiagnoseList.length; i++) {
-    const item = hasdiagnoseList[i];
-    if (item.code == 'hasmedicine') {
-      num = item.number
-      state = item.status
-    }
-  }
-  if (list.length > 0 && state != 0) {
+function renderHasMedicPush(list,num) {
+  if (list.length > 0 ) {
     moduleNum++
     let { shortStr, longStr } = renderItemWrapper(list, num)
     $(".hasmedicine").append(shortStr).append(longStr)
   }
 }
-function renderMayOperationsPush(list) {
-  let num, state
-  for (let i = 0; i < maydiagnoseList.length; i++) {
-    const item = maydiagnoseList[i];
-    if (item.code == 'mayoperation') {
-      num = item.number
-      state = item.status
-    }
-  }
-  if (list.length > 0 && state != 0) {
+function renderMayOperationsPush(list, num) {
+  if (list.length > 0) {
     moduleNum++
     let { shortStr, longStr } = renderItemWrapper(list, num)
     $(".mayoperation").append(shortStr).append(longStr)
   }
 }
-function renderHasOperationsPush(list) {
-  let num, state
-  for (let i = 0; i < hasdiagnoseList.length; i++) {
-    const item = hasdiagnoseList[i];
-    if (item.code == 'hasoperation') {
-      num = item.number
-      state = item.status
-    }
-  }
-  if (list.length > 0 && state != 0) {
+function renderHasOperationsPush(list,num) {
+
+  if (list.length > 0) {
     moduleNum++
     let { shortStr, longStr } = renderItemWrapper(list, num)
     $(".hasoperation").append(shortStr).append(longStr)
   }
 }
-function renderMayNursePush(list) {
-  let num, state
-  for (let i = 0; i < maydiagnoseList.length; i++) {
-    const item = maydiagnoseList[i];
-    if (item.code == 'maynurse') {
-      num = item.number
-      state = item.status
-    }
-  }
-  if (list.length > 0 && state != 0) {
+function renderMayNursePush(list, num) {
+  if (list.length > 0) {
     moduleNum++
     let { shortStr, longStr } = renderItemWrapper(list, num)
     $(".maynurse").append(shortStr).append(longStr)
   }
 }
-function renderHasNursePush(list) {
-  let num, state
-  for (let i = 0; i < hasdiagnoseList.length; i++) {
-    const item = hasdiagnoseList[i];
-    if (item.code == 'hasnurse') {
-      num = item.number
-      state = item.status
-    }
-  }
-  if (list.length > 0 && state != 0) {
+function renderHasNursePush(list,num) {
+  if (list.length > 0) {
     moduleNum++
     let { shortStr, longStr } = renderItemWrapper(list, num)
     $(".hasnurse").append(shortStr).append(longStr)
@@ -1199,15 +1174,15 @@ function renderItemWrapper(list, showNum, name) {
   }
   if (showNum1 >= list.length) {
     return {
-      shortStr: `<div class="shortBox">${name ? name + ':' : ''}${shortStr}</div>`,
+      shortStr: `<div class="shortBox"><span class="shortBox-tit">${name ? name + ':' : ''}</span>${shortStr}</div>`,
       longStr: ''
     }
   } else {
     shortStr += `<span class="showMore"><img class="iconArrowImg" src="${iconArrowDown}"></span>`
     longStr += `<span class="showLess"><img class="iconArrowImg"  src="${iconArrowUp}"></span>`
     return {
-      shortStr: `<div class="shortBox">${name ? name + ':' : ''}${shortStr}</div>`,
-      longStr: `<div class="longBox">${name ? name + ':' : ''}${longStr}</div></div>`
+      shortStr: `<div class="shortBox"><span class="shortBox-tit">${name ? name + ':' : ''}</span>${shortStr}</div>`,
+      longStr: `<div class="longBox"><span class="shortBox-tit">${name ? name + ':' : ''}</span>${longStr}</div></div>`
     }
   }
 }
@@ -1253,22 +1228,22 @@ function renderModuleWrapper(moduleList) {
         maydiagnoseList = moduleList[i].planDetails
         moduleStr += `<div class="moduleItem ${moduleList[i].code}"  data-num="${moduleList[i].number}" style="display:none"></div>`
         let arr = []
-        for (let j = 0; j <  moduleList[i].planDetails.length; j++) {
+        for (let j = 0; j < moduleList[i].planDetails.length; j++) {
           let item = moduleList[i].planDetails[j]
           arr.push(item.status)
         }
-        if(arr.indexOf(1) == -1){
+        if (arr.indexOf(1) == -1) {
           maydiagnoseType = true
         }
       } else if (moduleList[i].code == 'hasdiagnose') {
         hasdiagnoseList = moduleList[i].planDetails
         moduleStr += `<div class="moduleItem ${moduleList[i].code}"  data-num="${moduleList[i].number}" style="display:none"></div>`
         let arr = []
-        for (let j = 0; j <  moduleList[i].planDetails.length; j++) {
+        for (let j = 0; j < moduleList[i].planDetails.length; j++) {
           let item = moduleList[i].planDetails[j]
           arr.push(item.status)
         }
-        if(arr.indexOf(1) == -1){
+        if (arr.indexOf(1) == -1) {
           hasdiagnoseType = true
         }
       } else {

+ 93 - 104
src/js/cdssHorizontal.js

@@ -389,7 +389,6 @@ function renderPushData() {
           width: "100%"
         })
       }
-      console.log(123);
       rendergeneraTreatPush(generaTreatPush)
       renderMedicinesPush(medicinesPush, medicinesNum)
       renderOperationPush(operationsPush, operationsNum)
@@ -423,7 +422,7 @@ function renderpushByMayDisease(name, i, inx) {
         $.toast('toast3', '', 3000, '.maydiagnose', i);
         $(".maydiagnose .item").css("display", "none")
       } else if (maydiagnoseType) {
-        $.toast('toast3', '', 3000, '.maydiagnose', i);
+        $.toast('toast4', '', 3000, '.maydiagnose', i);
         $(".maydiagnose .item").css("display", "none")
       } else {
         renderMaySymptomPush(symptomPush, inx)
@@ -461,7 +460,7 @@ function renderpushByHasDisease(name, i, inx) {
         $.toast('toast3', '', 3000, '.hasdiagnose', i);
         $(".hasdiagnose .item").css("display", "none")
       } else if (hasdiagnoseType) {
-        $.toast('toast3', '', 3000, '.hasdiagnose', i);
+        $.toast('toast4', '', 3000, '.hasdiagnose', i);
         $(".hasdiagnose .item").css("display", "none")
       } else {
         renderHasSymptomPush(symptomPush, inx)
@@ -501,7 +500,7 @@ function renderDiagList(list, showNum) {
   }
   $('.moduleItem.maydiagnose .moduleItemTitBox').append(titleStr("maydiagnosePush"))
   let str = ``
-  let { shortStr, longStr } = renderItemWrapper(list, 10)
+  let { shortStr, longStr } = renderItemWrapper(list, 10, '', 1)
   let boxStr = `<div class="moduleBox">
         ${str}
         ${shortStr}
@@ -540,7 +539,7 @@ function renderAffListList(list, showNum) {
   }
   $('.moduleItem.hasdiagnose .moduleItemTitBox').append(titleStr("hasdiagnosePush"))
   let str = ``
-  let { shortStr, longStr } = renderItemWrapper(list, 10)
+  let { shortStr, longStr } = renderItemWrapper(list, 10, '', 1)
   let boxStr = `<div class="moduleBox">
         ${str}
         ${shortStr}
@@ -792,24 +791,40 @@ function renderHasDisPush(list, inx) {
   }
 }
 function renderMayPush(treatPush, medicinesPush, operationsPush, nursePush, inx) {
+  let generalstate, medicinestate, operationstate, nursestate, medicinenum, operationnum, nursenum
+  for (let i = 0; i < maydiagnoseList.length; i++) {
+    const item = maydiagnoseList[i];
+    if (item.code == 'maygeneral') {
+      generalstate = item.status
+    } else if (item.code == 'maymedicine') {
+      medicinestate = item.status
+      medicinenum = item.number
+    } else if (item.code == 'mayoperation') {
+      operationstate = item.status
+      operationnum = item.number
+    } else if (item.code == 'maynurse') {
+      nursestate = item.status
+      nursenum = item.number
+    }
+  }
   $(".maydiagnose .item[data-index=" + inx + "]").append("<div class='centerBox'></div>")
   let str = `<ul>
-    ${treatPush.length > 0 ? `<li class="general">一般治疗</li>` : ''}
-    ${medicinesPush.length > 0 ? `<li class="medicine">推荐用药</li>` : ''}
-    ${operationsPush.length > 0 ? `<li class="operation">推荐手术/操作</li>` : ''}
-    ${nursePush.length > 0 ? `<li class="nurse">推荐护理</li>` : ''}
+  ${treatPush.length > 0 && generalstate != 0 ? `<li class="general" data-index="0">一般治疗</li>` : ''}
+  ${medicinesPush.length > 0 && medicinestate != 0 ? `<li class="medicine" data-index="1">推荐用药</li>` : ''}
+  ${operationsPush.length > 0 && operationstate != 0 ? `<li class="operation" data-index="2">推荐手术/操作</li>` : ''}
+  ${nursePush.length > 0 && nursestate != 0 ? `<li class="nurse" data-index="3">推荐护理</li>` : ''}
   </ul>
   <div class="centerBoxItem">
-    ${treatPush.length > 0 ? `<div class="checkBox generalItem maygeneral" data-index="0"></div>` : ''}
-    ${medicinesPush.length > 0 ? `<div class="checkBox medicineItem maymedicine" data-index="1"></div>` : ''}
-    ${operationsPush.length > 0 ? `<div class="checkBox operationItem mayoperation" data-index="2"></div>` : ''}
-    ${nursePush.length > 0 ? `<div class="checkBox nurseItem maynurse" data-index="3"></div>` : ''}
+  ${treatPush.length > 0 && generalstate != 0 ? `<div class="checkBox generalItem maygeneral" data-index="0"></div>` : ''}
+  ${medicinesPush.length > 0 && medicinestate != 0 ? `<div class="checkBox medicineItem maymedicine" data-index="1"></div>` : ''}
+  ${operationsPush.length > 0 && operationstate != 0 ? `<div class="checkBox operationItem mayoperation" data-index="2"></div>` : ''}
+  ${nursePush.length > 0 && nursestate != 0 ? `<div class="checkBox nurseItem maynurse" data-index="3"></div>` : ''}
   </div>`
   $(".maydiagnose .item[data-index=" + inx + "] .centerBox").append(str)
   renderMayTreatPush(treatPush, inx)
-  renderMayMedicinesPush(medicinesPush, inx)
-  renderMayOperationsPush(operationsPush, inx)
-  renderMayNursePush(nursePush, inx)
+  renderMayMedicinesPush(medicinesPush, inx, medicinenum)
+  renderMayOperationsPush(operationsPush, inx, operationnum)
+  renderMayNursePush(nursePush, inx, nursenum)
   $(".maydiagnose .item[data-index=" + inx + "] .centerBox ul li").click(function () {
     var i = $(this).index();
     if ($(this).hasClass('actives')) {
@@ -823,26 +838,42 @@ function renderMayPush(treatPush, medicinesPush, operationsPush, nursePush, inx)
   });
 }
 function renderHasPush(treatPush, medicinesPush, operationsPush, nursePush, inx) {
+  let generalstate, medicinestate, operationstate, nursestate, medicinenum, operationnum, nursenum
+  for (let i = 0; i < maydiagnoseList.length; i++) {
+    const item = maydiagnoseList[i];
+    if (item.code == 'maygeneral') {
+      generalstate = item.status
+    } else if (item.code == 'maymedicine') {
+      medicinestate = item.status
+      medicinenum = item.number
+    } else if (item.code == 'mayoperation') {
+      operationstate = item.status
+      operationnum = item.number
+    } else if (item.code == 'maynurse') {
+      nursestate = item.status
+      nursenum = item.number
+    }
+  }
   $(".hasdiagnose .item[data-index=" + inx + "]").append("<div class='centerBox'></div>")
   let str = `<ul>
-    ${treatPush.length > 0 ? `<li class="general">一般治疗</li>` : ''}
-    ${medicinesPush.length > 0 ? `<li class="medicine">推荐用药</li>` : ''}
-    ${operationsPush.length > 0 ? `<li class="operation">推荐手术/操作</li>` : ''}
-    ${nursePush.length > 0 ? `<li class="nurse">推荐护理</li>` : ''}
+    ${treatPush.length > 0 && generalstate != 0 ? `<li class="general" data-index="0">一般治疗</li>` : ''}
+    ${medicinesPush.length > 0 && medicinestate != 0 ? `<li class="medicine" data-index="1">推荐用药</li>` : ''}
+    ${operationsPush.length > 0 && operationstate != 0 ? `<li class="operation" data-index="2">推荐手术/操作</li>` : ''}
+    ${nursePush.length > 0 && nursestate != 0 ? `<li class="nurse" data-index="3">推荐护理</li>` : ''}
   </ul>
   <div class="centerBoxItem">
-    ${treatPush.length > 0 ? `<div class="checkBox generalItem hasgeneral" data-index="0"></div>` : ''}
-    ${medicinesPush.length > 0 ? `<div class="checkBox medicineItem hasmedicine" data-index="1"></div>` : ''}
-    ${operationsPush.length > 0 ? `<div class="checkBox operationItem hasoperation" data-index="2"></div>` : ''}
-    ${nursePush.length > 0 ? `<div class="checkBox nurseItem hasnurse" data-index="3"></div>` : ''}
+    ${treatPush.length > 0 && generalstate != 0 ? `<div class="checkBox generalItem hasgeneral" data-index="0"></div>` : ''}
+    ${medicinesPush.length > 0 && medicinestate != 0 ? `<div class="checkBox medicineItem hasmedicine" data-index="1"></div>` : ''}
+    ${operationsPush.length > 0 && operationstate != 0 ? `<div class="checkBox operationItem hasoperation" data-index="2"></div>` : ''}
+    ${nursePush.length > 0 && nursestate != 0 ? `<div class="checkBox nurseItem hasnurse" data-index="3"></div>` : ''}
   </div>`
   $(".hasdiagnose .item[data-index=" + inx + "] .centerBox").append(str)
   renderHasTreatPush(treatPush, inx)
-  renderHasMedicinesPush(medicinesPush, inx)
-  renderHasOperationsPush(operationsPush, inx)
-  renderHasNursePush(nursePush, inx)
+  renderHasMedicinesPush(medicinesPush, inx, medicinenum)
+  renderHasOperationsPush(operationsPush, inx, operationnum)
+  renderHasNursePush(nursePush, inx, nursenum)
   $(".hasdiagnose .item[data-index=" + inx + "] .centerBox ul li").click(function () {
-    var i = $(this).index();
+    var i = $(this).attr('data-index');
     if ($(this).hasClass('actives')) {
       $(this).removeClass('actives');
       $(".hasdiagnose .item[data-index=" + inx + "] .checkBox[data-index=" + i + "]").removeClass('onshow');
@@ -867,7 +898,7 @@ function renderMayTreatPush(list, inx) {
     let str = ''
     for (let i = 0; i < list.length; i++) {
       const item = list[i];
-      str = `${item.generaTreat}`
+      str = `${item.generaTreat || ''}`
     }
     $(".moduleItem .item[data-index=" + inx + "] .maygeneral").append(str)
   }
@@ -885,21 +916,13 @@ function renderHasTreatPush(list, inx) {
   if (list.length > 0 && state != 0) {
     for (let i = 0; i < list.length; i++) {
       const item = list[i];
-      str = `${item.generaTreat}`
+      str = `${item.generaTreat || ''}`
     }
     $(".moduleItem .item[data-index=" + inx + "] .hasgeneral").append(str)
   }
 }
-function renderMayMedicinesPush(list, inx) {
-  let num, state
-  for (let i = 0; i < maydiagnoseList.length; i++) {
-    const item = maydiagnoseList[i];
-    if (item.code == 'maymedicine') {
-      num = item.number
-      state = item.status
-    }
-  }
-  if (list.length > 0 && state != 0) {
+function renderMayMedicinesPush(list, inx, num) {
+  if (list.length > 0) {
     moduleNum++
     let { shortStr, longStr } = renderItemWrapper(list, num)
     console.log($(".moduleItem .item[data-index=" + inx + "] .maymedicine"));
@@ -907,48 +930,24 @@ function renderMayMedicinesPush(list, inx) {
     $(".moduleItem .item[data-index=" + inx + "] .maymedicine").append(renderLongStr(titleConfigH["drugPush"].name, longStr, titleConfigH["drugPush"].location))
   }
 }
-function renderHasMedicinesPush(list, inx) {
-  let num, state
-  for (let i = 0; i < hasdiagnoseList.length; i++) {
-    const item = hasdiagnoseList[i];
-    if (item.code == 'hasmedicine') {
-      num = item.number
-      state = item.status
-    }
-  }
-  if (list.length > 0 && state != 0) {
+function renderHasMedicinesPush(list, inx, num) {
+  if (list.length > 0) {
     moduleNum++
     let { shortStr, longStr } = renderItemWrapper(list, num)
     $(".moduleItem .item[data-index=" + inx + "] .hasmedicine").append(shortStr)
     $(".moduleItem .item[data-index=" + inx + "] .hasmedicine").append(renderLongStr(titleConfigH["drugPush"].name, longStr, titleConfigH["drugPush"].location))
   }
 }
-function renderMayOperationsPush(list, inx) {
-  let num, state
-  for (let i = 0; i < maydiagnoseList.length; i++) {
-    const item = maydiagnoseList[i];
-    if (item.code == 'mayoperation') {
-      num = item.number
-      state = item.status
-    }
-  }
-  if (list.length > 0 && state != 0) {
+function renderMayOperationsPush(list, inx, num) {
+  if (list.length > 0) {
     moduleNum++
     let { shortStr, longStr } = renderItemWrapper(list, num)
     $(".moduleItem .item[data-index=" + inx + "] .mayoperation").append(shortStr)
     $(".moduleItem .item[data-index=" + inx + "] .mayoperation").append(renderLongStr(titleConfigH["operationPush"].name, longStr, titleConfigH["operationPush"].location))
   }
 }
-function renderHasOperationsPush(list, inx) {
-  let num, state
-  for (let i = 0; i < hasdiagnoseList.length; i++) {
-    const item = hasdiagnoseList[i];
-    if (item.code == 'hasoperation') {
-      num = item.number
-      state = item.status
-    }
-  }
-  if (list.length > 0 && state != 0) {
+function renderHasOperationsPush(list, inx, num) {
+  if (list.length > 0) {
     moduleNum++
     let { shortStr, longStr } = renderItemWrapper(list, num)
     $(".moduleItem .item[data-index=" + inx + "] .hasoperation").append(shortStr)
@@ -956,32 +955,16 @@ function renderHasOperationsPush(list, inx) {
   }
 }
 
-function renderMayNursePush(list, inx) {
-  let num, state
-  for (let i = 0; i < maydiagnoseList.length; i++) {
-    const item = maydiagnoseList[i];
-    if (item.code == 'maynurse') {
-      num = item.number
-      state = item.status
-    }
-  }
-  if (list.length > 0 && state != 0) {
+function renderMayNursePush(list, inx, num) {
+  if (list.length > 0) {
     moduleNum++
     let { shortStr, longStr } = renderItemWrapper(list, num)
     $(".moduleItem .item[data-index=" + inx + "] .maynurse").append(shortStr)
     $(".moduleItem .item[data-index=" + inx + "] .maynurse").append(renderLongStr(titleConfigH["nursePush"].name, longStr, titleConfigH["nursePush"].location))
   }
 }
-function renderHasNursePush(list, inx) {
-  let num, state
-  for (let i = 0; i < hasdiagnoseList.length; i++) {
-    const item = hasdiagnoseList[i];
-    if (item.code == 'hasnurse') {
-      num = item.number
-      state = item.status
-    }
-  }
-  if (list.length > 0 && state != 0) {
+function renderHasNursePush(list, inx, num) {
+  if (list.length > 0) {
     moduleNum++
     let { shortStr, longStr } = renderItemWrapper(list, num)
     $(".moduleItem .item[data-index=" + inx + "] .hasnurse").append(shortStr)
@@ -1044,18 +1027,18 @@ function renderSymptomPush(list, showNum) {
   }
 
 }
-// function renderMedicinesPush(list, showNum) {
+function renderMedicinesPush(list, showNum) {
 
-//   if (list.length > 0 && $(".moduleItem.medicine").length > 0) {
-//     moduleNum++
-//     $('.moduleItem.medicine .moduleItemTitBox').append(titleStr("drugPush"))
-//     let { shortStr, longStr } = renderItemWrapper(list, showNum)
-//     $(".moduleItem.medicine").append(shortStr)
-//     $(".moduleItem.medicine").append(renderLongStr(titleConfigH["drugPush"].name, longStr, titleConfigH["drugPush"].location))
-//     $(".moduleItem.medicine").css("display", "block")
-//   }
+  if (list.length > 0 && $(".moduleItem.medicine").length > 0) {
+    moduleNum++
+    $('.moduleItem.medicine .moduleItemTitBox').append(titleStr("drugPush"))
+    let { shortStr, longStr } = renderItemWrapper(list, showNum)
+    $(".moduleItem.medicine").append(shortStr)
+    $(".moduleItem.medicine").append(renderLongStr(titleConfigH["drugPush"].name, longStr, titleConfigH["drugPush"].location))
+    $(".moduleItem.medicine").css("display", "block")
+  }
 
-// }
+}
 function renderOperationPush(list, showNum) {
   if (list.length > 0 && $(".moduleItem.operation").length > 0) {
     moduleNum++
@@ -1225,15 +1208,14 @@ function renderLongStr(name, longStr, location) {
 }
 
 
-function renderItemWrapper(list, showNum, name) {
-  console.log(name);
+function renderItemWrapper(list, showNum, name, type) {
   let showNum1 = showNum || 5
   let shortStr = '', longStr = ''
   for (let i = 0; i < list.length; i++) {
     if (i <= showNum1 - 1) {
-      shortStr += renderPushItem(list[i], i)
+      shortStr += type == 1 || type == 2 ? renderPushItem2(list[i], i) : renderPushItem(list[i], i)
     }
-    longStr += renderPushItem(list[i], i)
+    longStr += type || type == 2 ? renderPushItem2(list[i], i) : renderPushItem(list[i], i)
   }
 
   if (showNum1 >= list.length) {
@@ -1257,6 +1239,13 @@ function renderPushItem(item, i) {
   str += '</span >'
   return str
 }
+function renderPushItem2(item, i) {
+  str = `<span class="pushItemBox" data-name="${item.name}" data-type="${item.type}" data-index="${i}">`
+  str += `${item.hasScale == "0" ? `<span class="pushItemName" title="${item.name}">${item.type == 8 ? ('【' + item.name + '】') : item.name}</span>` : item.hasScale == "1" ? `<span class="pushItemName evaluationtitle" title="${item.name}">${item.type == 8 ? ('【' + item.name + '】') : item.name}</span>` : `<span class="pushItemName" title="${item.name}">${item.type == 8 ? ('【' + item.name + '】') : item.name}</span>`}`
+  str += `${item.hasInfo == "1" ? `<img class="infoImg" src="${infoImg}">` : ""}`
+  str += '</span >'
+  return str
+}
 function bindOpenInfo() {
   $(".infoImg").on("mouseenter", function () {
     $(this).attr("src", infoImgOn)

+ 1 - 0
src/js/util.js

@@ -76,6 +76,7 @@ function toggleWarnBox(text) {
                 'toast1': require('./../images/toast-1.png').replace(/^undefined/g, ''),
                 'toast2': require('./../images/toast-2.png').replace(/^undefined/g, ''),
                 'toast3': require('./../images/toast-3.png').replace(/^undefined/g, ''),
+                'toast4': require('./../images/toast-4.png').replace(/^undefined/g, ''),
               };
               console.log(type);
               if(type == 'toast1' || type == 'toast2'){