问题修改

src/js/cdss.js

@@ -334,7 +334,8 @@ function renderPushData() {
       let medicinesNum = $(".moduleItem.medicine").attr("data-num") || 5
       let operationsNum = $(".moduleItem.operation").attr("data-num") || 5
       let nurseNum = $(".moduleItem.nurse").attr("data-num") || 5
-
+      let maydiagnoseNum = $(".moduleItem.nurse").attr("data-num") || 5
+      let hasdiagnoseNum = $(".moduleItem.nurse").attr("data-num") || 5
       renderLis(lisPush, lisNum)
       renderScale(scalePush, scaleNum)
       renderPacs(pacsPush, pacsNum)
@@ -345,8 +346,8 @@ function renderPushData() {
       renderOperationPush(operationsPush, operationsNum)
       rendergeneraTreatPush(generaTreatPush)
       // renderNurse(nursePush, nurseNum)
-      renderDiagList(diagList)
-      renderAffListList(AffList)
+      renderDiagList(diagList,maydiagnoseNum)
+      renderAffListList(AffList,hasdiagnoseNum)
       bindOpenInfo()
       moreInfo()
       bindSlide();
@@ -370,7 +371,14 @@ function renderpushByMayDisease(name, i) {
       let medicinesPush = result.medicines || []
       let operationsPush = result.operations || []
       let nursePush = result.nurse || []
-      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) {
+      let isShow = false
+      for (let i = 0; i < treatPush.length; i++) {
+        const it = treatPush[i];
+        if(it.generaTreat){
+          isShow = true
+        }
+      }
+      if (symptomPush.length == 0 && vitalPush.length == 0 && lisPush.length == 0 && pacsPush.length == 0 && scalePush.length == 0 && disPush.length == 0 && medicinesPush.length == 0 && operationsPush.length == 0 && nursePush.length == 0 && !isShow) {
         $.toast('toast1', '', 3000, '.maydiagnose', i);
       } else if (maydiagnoseType) {
         $.toast('toast2', '', 3000, '.maydiagnose', i);
@@ -415,6 +423,13 @@ function renderpushByHasDisease(name, i) {
       let medicinesPush = result.medicines || {}
       let operationsPush = result.operations || {}
       let nursePush = result.nurse || {}
+      let isShow = false
+      for (let i = 0; i < treatPush.length; i++) {
+        const it = treatPush[i];
+        if(it.generaTreat){
+          isShow = true
+        }
+      }
       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) {
@@ -670,12 +685,12 @@ function renderDiagList(list, showNum) {
     for (var i = 0; i < list.length; i++) {
       const item = list[i];
       str +=
-        `<div class='box ${i > 2 ? `box-1` : ''}' data-index="${i}">
+        `<div class='box ${i > showNum ? `box-1` : ''}' data-index="${i}">
           <p class='box-p goDetail' data-name="${item.name}" data-index="${i}"><span class='box-title'>${item.name}</span><img class="box-img" src=${down} /></p>
           <div class="moduleCenter"></div>
         </div>`
     }
-    str += `${list.length > 3 ? `<p class="toogle">加载更多<img src=${more}/></p>` : ''} </div>`
+    str += `${list.length > showNum ? `<p class="toogle">加载更多<img src=${more}/></p>` : ''} </div>`
 
     $('.moduleItem.maydiagnose').append(str)
     $('.moduleItem.maydiagnose').css("display", "block")
@@ -708,12 +723,12 @@ function renderAffListList(list, showNum) {
     for (var i = 0; i < list.length; i++) {
       const item = list[i];
       str +=
-        `<div class='box ${i > 2 ? `box-1` : ''}' data-index="${i}">
+        `<div class='box ${i > showNum ? `box-1` : ''}' data-index="${i}">
           <p class='box-p goDetail' data-name="${item.name}" data-index="${i}"><span class='box-title'>${item.name}</span><img class="box-img" src=${down} /></p>
           <div class="moduleCenter"></div>
         </div>`
     }
-    str += `${list.length > 3 ? `<p class="toogle">加载更多<img src=${more}/></p>` : ''} </div>`
+    str += `${list.length > showNum ? `<p class="toogle">加载更多<img src=${more}/></p>` : ''} </div>`
 
     $('.moduleItem.hasdiagnose').append(str)
     $('.moduleItem.hasdiagnose').css("display", "block")
@@ -1072,7 +1087,7 @@ function renderHasPush(treatPush, medicinesPush, operationsPush, nursePush) {
     ${nursePush.length > 0 && nursestate != 0 ? `<li class="nurse" data-index="3">推荐护理</li>` : ''}
   </ul>
   <div class="centerBoxItem">
-    ${treatPush.length > 0 && isShow && generalstate != 0 ? `<div class="checkBox generalItem hasgeneral" data-index="0"></div>` : ''}
+    ${treatPush.length > 0 && isShow &&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>` : ''}

src/js/cdssHorizontal.js

@@ -423,7 +423,14 @@ function renderpushByMayDisease(name, i, inx) {
       let medicinesPush = result.medicines || {}
       let operationsPush = result.operations || {}
       let nursePush = result.nurse || {}
-      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) {
+      let isShow = false
+      for (let i = 0; i < treatPush.length; i++) {
+        const it = treatPush[i];
+        if (it.generaTreat) {
+          isShow = true
+        }
+      }
+      if (symptomPush.length == 0 && vitalPush.length == 0 && lisPush.length == 0 && pacsPush.length == 0 && scalePush.length == 0 && disPush.length == 0 && medicinesPush.length == 0 && operationsPush.length == 0 && nursePush.length == 0 && !isShow) {
         $.toast('toast3', '', 3000, '.maydiagnose', i);
         $(".maydiagnose .item").css("display", "none")
       } else if (maydiagnoseType) {
@@ -461,7 +468,14 @@ function renderpushByHasDisease(name, i, inx) {
       let medicinesPush = result.medicines || {}
       let operationsPush = result.operations || {}
       let nursePush = result.nurse || {}
-      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) {
+      let isShow = false
+      for (let i = 0; i < treatPush.length; i++) {
+        const it = treatPush[i];
+        if (it.generaTreat) {
+          isShow = true
+        }
+      }
+      if (symptomPush.length == 0 && vitalPush.length == 0 && lisPush.length == 0 && pacsPush.length == 0 && scalePush.length == 0 && disPush.length == 0 && medicinesPush.length == 0 && operationsPush.length == 0 && nursePush.length == 0 && !isShow) {
         $.toast('toast3', '', 3000, '.hasdiagnose', i);
         $(".hasdiagnose .item").css("display", "none")
       } else if (hasdiagnoseType) {
@@ -797,7 +811,7 @@ function renderHasDisPush(list, inx) {
   }
 }
 function renderMayPush(treatPush, medicinesPush, operationsPush, nursePush, inx) {
-  let generalstate, medicinestate, operationstate, nursestate
+  let generalstate, medicinestate, operationstate, nursestate, isShow = false
   for (let i = 0; i < maydiagnoseList.length; i++) {
     const item = maydiagnoseList[i];
     if (item.code == 'maygeneral') {
@@ -810,15 +824,21 @@ function renderMayPush(treatPush, medicinesPush, operationsPush, nursePush, inx)
       nursestate = item.status
     }
   }
+  for (let i = 0; i < treatPush.length; i++) {
+    const it = treatPush[i];
+    if (it.generaTreat) {
+      isShow = true
+    }
+  }
   $(".maydiagnose .item[data-index=" + inx + "]").append("<div class='centerBox'></div>")
   let str = `<ul>
-  ${treatPush.length > 0 && generalstate != 0 ? `<li class="general" data-index="0">一般治疗</li>` : ''}
+  ${treatPush.length > 0 && isShow && 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 && generalstate != 0 ? `<div class="checkBox generalItem maygeneral" data-index="0"></div>` : ''}
+  ${treatPush.length > 0 && isShow && 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>` : ''}
@@ -841,7 +861,7 @@ function renderMayPush(treatPush, medicinesPush, operationsPush, nursePush, inx)
   });
 }
 function renderHasPush(treatPush, medicinesPush, operationsPush, nursePush, inx) {
-  let generalstate, medicinestate, operationstate, nursestate
+  let generalstate, medicinestate, operationstate, nursestate, isShow = false
   for (let i = 0; i < maydiagnoseList.length; i++) {
     const item = maydiagnoseList[i];
     if (item.code == 'maygeneral') {
@@ -854,15 +874,21 @@ function renderHasPush(treatPush, medicinesPush, operationsPush, nursePush, inx)
       nursestate = item.status
     }
   }
+  for (let i = 0; i < treatPush.length; i++) {
+    const it = treatPush[i];
+    if (it.generaTreat) {
+      isShow = true
+    }
+  }
   $(".hasdiagnose .item[data-index=" + inx + "]").append("<div class='centerBox'></div>")
   let str = `<ul>
-    ${treatPush.length > 0 && generalstate != 0 ? `<li class="general" data-index="0">一般治疗</li>` : ''}
+    ${treatPush.length > 0 && isShow && 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 && generalstate != 0 ? `<div class="checkBox generalItem hasgeneral" data-index="0"></div>` : ''}
+    ${treatPush.length > 0 && isShow && 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>` : ''}
@@ -1144,7 +1170,7 @@ function renderPushWarning() {
       let dubugStr = result.dubugStr || []  //注意调试信息
       let otherList = result.otherList || []  //其他提醒
       let nurseList = result.nurseList || []  //推荐护理
-      localStorage.setItem('nurseList',JSON.stringify(nurseList))
+      localStorage.setItem('nurseList', JSON.stringify(nurseList))
       renderBillingPush(billMsgList, '开单合理性', 'rationali')
       renderBillingPush(highRiskList, '高风险提示', 'highrisk')
       renderBillingPush(criticalValList, '危急值提醒', 'crivalue')
@@ -1195,7 +1221,7 @@ function renderBillingPush(list, name, code) {
   $("." + code).append(boxStr)
   $('.moduleItem.' + code).addClass("tips").attr("code", code).css("display", "block")
 }
-function renderNursePush(list){
+function renderNursePush(list) {
   let str = ``
   for (let i = 0; i < list.length; i++) {
     const item = list[i];
@@ -1228,9 +1254,9 @@ function renderBillingNursePush(list) {
     })
   }
 }
-function showMoreNewNurse(){
+function showMoreNewNurse() {
   $(".showMoreNewPage").on("click", function () {
-    openNewWin(`nurseAlert.html?mrId=${mrId}&hospitalId=${hospitalIdUrl}` );
+    openNewWin(`nurseAlert.html?mrId=${mrId}&hospitalId=${hospitalIdUrl}`);
   })
 }
 function renderLongStr(name, longStr, location) {