横版8720

src/js/cdss.js

@@ -67,7 +67,7 @@ let treatDisName;
 function getMRInfo() {
    return post(config.getMr2,{mrId:mrId})
 }
-$('.empty').css("display","none")
+//$('.empty').css("display","none")
 if(mrId){
   Promise.all([getConf(),getMRInfo()]).then(([res1,res2])=>{
     const data = res1.data.data&&res1.data.data[0]
@@ -212,15 +212,16 @@ function getDisclaimer() {
 }
 
 function renderPage(pageSet){
-  if(!pageSet || !pageSet.sysSetInfo){
+  const setInfo = pageSet.sysSetInfo;
+  if(!pageSet || !setInfo){
     return
   }
-  renderTab(pageSet.sysSetInfo)
+  renderTab(setInfo)
   adjustHei()
-  const hasAuxiliary = hasTab("辅助信息",pageSet.sysSetInfo)
-  const hasMedical = hasTab("医学知识",pageSet.sysSetInfo)
-  const hasFollowUp = hasTab("随访计划",pageSet.sysSetInfo)
-  const hasTcm = hasTab("中医辅助", pageSet.sysSetInfo);
+  const hasAuxiliary = hasTab("辅助信息",setInfo);
+  const hasMedical = hasTab("医学知识",setInfo)
+  const hasFollowUp = hasTab("随访计划",setInfo)
+  const hasTcm = hasTab("中医辅助", setInfo);
 
   if (hasTcm) {
       getTcmMr(mrId, hasTcm);
@@ -229,11 +230,12 @@ function renderPage(pageSet){
     empty()
     return
   }
+  const planDetail = hasAuxiliary.planDetails;
   if(hasAuxiliary){
-    renderModuleWrapper(hasAuxiliary.planDetails)
-    let needPush = isNeedPush(hasAuxiliary.planDetails)
-    let needPushWarning = isNeedPushWarning(hasAuxiliary.planDetails)
-    let needWriteStandardPush = isNeedwriteStandardPush(hasAuxiliary.planDetails)
+    renderModuleWrapper(planDetail)
+    let needPush = isNeedPush(planDetail)
+    let needPushWarning = isNeedPushWarning(planDetail)
+    let needWriteStandardPush = isNeedwriteStandardPush(planDetail);
     if(needPush || needPushWarning){
       renderPushData()
       allInterface++
@@ -310,37 +312,40 @@ function adjustHei(){
   $(".tabList").css("height",iframeHei+'px')
 }
 function isNeedPush(list){
+  let pass = false;
   let pushCode = ["diag","lis","pacs","symptom","vital","treat","medicines"]
   for(let i = 0; i < list.length; i++){
     if(pushCode.indexOf(list[i].code)>-1){
       if(list[i].status == "1"){
-        return true
+        pass = true
       }
     }
   }
-  return false
+  return pass;
 }
 function isNeedwriteStandardPush(list){
+    let pass = false;
   let pushCode = ["casewriting"]
   for(let i = 0; i < list.length; i++){
     if(pushCode.indexOf(list[i].code)>-1){
       if(list[i].status == "1"){
-        return true
+          pass = true
       }
     }
   }
-  return false
+  return pass
 }
 function isNeedPushWarning(list){
-    let pushCode = ["crivalue", "rationali", "highrisk", "otherremind"]
+    let pushCode = ["crivalue", "rationali", "highrisk", "otherremind"];
+    let pass = false;
   for(let i = 0; i < list.length; i++){
-    if(pushCode.indexOf(list[i].code)>-1){
-      if(list[i].status == "1"){
-        return true
+    if(pushCode.indexOf(list[i].code.trim())>-1){
+      if(+list[i].status === 1){
+          pass=true
       }
     }
   }
-  return false
+  return pass
 }
 //let popNum = 0;//气泡显示数字
 function renderPushWarning(){
@@ -601,7 +606,7 @@ function renderOperationPush(list,showNum){
 function renderItemWrapper(list, showNum) {
   let showNum1 = showNum || 5
   let shortStr = '', longStr = ''
-
+  $('.empty').css("display","none")
   for(let i = 0; i < list.length; i++){
     if(i <= showNum1-1){
       shortStr += renderPushItem(list[i])

src/js/cdssHorizontal.js

@@ -308,7 +308,7 @@ function renderPushData() {
           width: "100%"
         })
       }
-      if ((!$(".moduleItem.medicine") && !$(".moduleItem.operation") && !(".moduleItem.general")) || ($(".moduleItem.general").length === 0 && $(".moduleItem.medicine").length === 0 && $(".moduleItem.operation").length === 0)) {
+      if ((!$(".moduleItem.medicine") && !$(".moduleItem.operation") && !(".moduleItem.general")) || ($(".moduleItem.general").length === 0 && $(".moduleItem.medicine").length === 0 && $(".moduleItem.operation").length === 0 && $(".moduleItem.nurse").length === 0)) {
         $(".rightWrapper").css("display", "none")
         $(".leftWrapper").css({
           borderRight: "0px",