瀏覽代碼

Merge remote-tracking branch 'origin/syfTempMaster' into referMaster

# Conflicts:
#	src/js/promise.js
zhouna 5 年之前
父節點
當前提交
3a98eac8a3

+ 1 - 0
src/css/index.css

@@ -179,6 +179,7 @@
 .iframeWrap .illnessTable {
   color: #267FD7;
   line-height: 28px;
+  cursor: pointer;
 }
 .iframeWrap h4 {
   color: #000;

+ 12 - 2
src/css/index.less

@@ -198,6 +198,7 @@
   .illnessTable {
     color: @colorBlue;
     line-height: 28px;
+    cursor: pointer;
   }
   .conditionHint{
   }
@@ -357,11 +358,19 @@
     background: url(/images/select.png) center center no-repeat;
   }
   .conditionHintTips .mayIllness{
-    margin: 20px 0 0 0;
-    border-top:1px #E8EAEC solid;
+    line-height: 30px;
     span,a,.modalMainOne,.modalMainTwo{
       border-bottom:none;
     }
+    .diagName {
+      border-bottom: 1px solid #1E1E1E;
+    }
+    .sriticalinfo {
+      height:30px;
+      background:#F5F5F5;
+      line-height: 30px;
+      margin: 10px 0;
+  }
     span .infoMsg{
       float: none;
       top: 5px;
@@ -371,6 +380,7 @@
       display: inline-block;
     }
   }
+  
   .mayResult {
     margin: 20px 0 0 0;
     color: #838383;

+ 52 - 9
src/css/indexHorizontal.less

@@ -32,7 +32,7 @@
     border-right: 1px solid #f0efef;
     box-sizing: border-box;
 }
-.treat {
+.infomationBox {
     margin-top: 10px;
     width: 38%;
     float: left;
@@ -68,6 +68,9 @@
         color: #1AB3A9;
     }
 }
+.treatRecommend  {
+    position: relative;
+}
 .icon{
     display: block;
     width: 20px;
@@ -188,23 +191,30 @@
 .conditTipsbox .more {
     top: 0px;
 }
+.push .conditTips {
+    height: 100%;
+    max-height: 40px;
+}
 .diagName {
     color: #040428;
 }
-.treatItemTitle {
-    font-weight: bold;
-    font-size: 13px;
-    color: #7C828E;
+.treatItemTitle, .tipsTitle {
+    // font-weight: bold;
+    font-size: 14px;
+    color: #000000;
     float: left;
     width: 60px;
     height: 30px;
     line-height: 30px;
     float: left;
 }
-.treat .recommendInfoBox {
+.tipsTitle {
+    margin-top: 10px;
+}
+.infomationBox .recommendInfoBox {
     margin-left: 0px;
 }
-.treat .treatTextBox {
+.infomationBox .treatTextBox {
     margin-left: 80px;
     line-height: 30px;
     height: 90px;
@@ -214,17 +224,26 @@
     // -webkit-box-orient: vertical;
     // -webkit-line-clamp: 3;
 }
-.treat .treatDrugBox {
+.infomationBox .treatDrugBox {
     margin-left: 80px;
     line-height: 30px;
     height: 90px;
     overflow: hidden;
 }
+.tipsInfoBox {
+    margin: 10px 0 0 80px;
+    line-height: 30px;
+    height: 180px;
+    overflow-y: auto;
+    img {
+        display: none;
+    }
+}
 .drugTreatmentInfoItemBox {
     .ellipse;
     height: 30px;
 }
-.treat .treatRecommend {
+.infomationBox .treatRecommend {
     margin-top: 10px;
 }
 .labAndPacsRecommend  .labAndPacsTitle {
@@ -270,3 +289,27 @@
 .disclaimer, .illnessTable {
     cursor: pointer;
 }
+.tipsInfoWrapper  {
+    position: relative;
+    margin: 10px 0 0 0;
+}
+.infoTab {
+    margin-right: 15px;
+    cursor: pointer;
+}
+.activeTab {
+    color: #267FD7;
+    border-bottom: 2px solid #267FD7;
+}
+.moreInfo {
+    display: inline-block;
+    width:42px;
+    height:20px;
+    border-radius:4px;
+    border:1px solid #267FD7;
+    line-height:20px;
+    color: #267FD7;
+    text-align: center;
+    margin-left: 20px;
+    cursor: pointer;
+}

+ 30 - 4
src/css/indexVert.less

@@ -40,6 +40,12 @@
         background-color: #E3FEFE;
     }
 }
+.tipsInfo {
+    h4 {
+        background-color: #E3FEFE;
+    }
+}
+
 
 .conditTips {
     h4 {
@@ -54,6 +60,9 @@
 .treatRecommend h4 i {
     background: url(/images/zhiliao.png) center center no-repeat;
 }
+.tipsInfo h4 i {
+    background: url(/images/zhiliao.png) center center no-repeat;
+}
 
 .conditTips h4 i {
     background: url(/images/tips.png) center center no-repeat;
@@ -136,10 +145,15 @@
         top: 4px;
     }
 }
-.durgName, .diagName {
-    border-bottom: 1px solid #D1D1D1;
+.durgName, .diagName{
+    border-bottom: 1px solid #1E1E1E;
+}
+.sriticalinfo {
+    height:30px;
+    background:#F5F5F5;
+    line-height: 30px;
+    margin: 10px 0;
 }
-
 .recommendInfoBox p {
     line-height: 25px;
 }
@@ -285,7 +299,7 @@
     padding-right: 15px;
 }
 
-.recommendNull {
+.recommendNull,.TipsInfoNull {
     color: #ADADAD;
 }
 .treatItemTitle {
@@ -294,4 +308,16 @@
 }
 .disclaimerInfo {
     cursor: pointer;
+}
+.moreInfo {
+    display: inline-block;
+    width:42px;
+    height:20px;
+    border-radius:4px;
+    border:1px solid #267FD7;
+    line-height:20px;
+    color: #267FD7;
+    text-align: center;
+    margin-left: 20px;
+    cursor: pointer;
 }

+ 3 - 0
src/css/popup.css

@@ -121,6 +121,9 @@
 .popupModal .modalMainTwo .radioCheck input[type=text]:hover {
   border: 1px solid #3B9ED0;
 }
+.popupModal .modalMainTwo .radioCheck input[type=text]:focus {
+  border: 1px solid #3B9ED0;
+}
 .popupModal .modalMainTwo .radioChecks {
   height: 30px;
   line-height: 30px;

+ 3 - 1
src/css/popup.less

@@ -121,7 +121,9 @@
       input[type=text]:hover {
         border: 1px solid #3B9ED0;
       }
-
+      input[type=text]:focus {
+        border: 1px solid #3B9ED0;
+      }
     }
     .radioChecks {
       height: 30px;

+ 3 - 1
src/html/indexHorizontal.html

@@ -21,7 +21,9 @@
             <span class="logo">智<br/>能<br/>推<br/>送<br/>仅<br/>供<br/>参<br/>考<br/>&copy; <br/>朗<br/>通<br/>医<br/>疗</span>
           </div>
             <div class="push"></div>
-            <div class="treat"></div>
+            <div class="infomationBox clearfix">
+              <div class="infoTabBox"></div>
+            </div> 
         </div>
         <!-- <p class="responsibility">以上推送为常见诊断及问诊内容,实际以医生临床判断为准</p> -->
       </div>

+ 1 - 1
src/index.js

@@ -16,7 +16,7 @@ var msg = {
   lis: getUrlArgObject('lisJson')? JSON.parse(getUrlArgObject('lisJson')) : [],
   pacs: getUrlArgObject('pacsJson'),
   diag: getUrlArgObject('diagJson'),
-  diseaseName: getUrlArgObject('diagJson'),
+  diseaseName: getUrlArgObject('diseaseName'),
   other: getUrlArgObject('otherJson') + getUrlArgObject('pastJson'),
   hosCode:getUrlArgObject('hospitalCode') || ''
 }//推送相关信息

+ 61 - 21
src/js/illness.js

@@ -5,23 +5,24 @@ require('./popup');
 const $ = require("jquery");
 const { post,config,getUrlArgObject,openNewWin } = require('./promise.js');
 
-var msg = {
-  age: getUrlArgObject('age'),
-  sex: getUrlArgObject('sex') == '男'?1:(getUrlArgObject('sex') == '女'?2:(getUrlArgObject('sex') == '通用'?3:getUrlArgObject('sex'))),
-  symptom: getUrlArgObject('symptomJson'),
-  vital: getUrlArgObject('vitalJson'),
-  lis: getUrlArgObject('lisJson')? JSON.parse(getUrlArgObject('lisJson')) : [],
-  pacs: getUrlArgObject('pacsJson'),
-  diag: getUrlArgObject('diagJson'),
-  diseaseName: getUrlArgObject('diagJson'),
-  other: getUrlArgObject('otherJson') + getUrlArgObject('pastJson'),
-  hosCode:getUrlArgObject('hospitalCode') || ''
-}//推送相关信息
+// var msg = {
+//   age: getUrlArgObject('age'),
+//   sex: getUrlArgObject('sex') == '男'?1:(getUrlArgObject('sex') == '女'?2:(getUrlArgObject('sex') == '通用'?3:getUrlArgObject('sex'))),
+//   symptom: getUrlArgObject('symptomJson'),
+//   vital: getUrlArgObject('vitalJson'),
+//   lis: getUrlArgObject('lisJson')? JSON.parse(getUrlArgObject('lisJson')) : [],
+//   pacs: getUrlArgObject('pacsJson'),
+//   diag: getUrlArgObject('diagJson'),
+//   diseaseName: getUrlArgObject('diagJson'),
+//   other: getUrlArgObject('otherJson') + getUrlArgObject('pastJson'),
+//   hosCode:getUrlArgObject('hospitalCode') || ''
+// }//推送相关信息
 
+var msg = JSON.parse(getUrlArgObject('msg'))
 window.msg = msg
 window.pushMessage = {}
 
-post(config.pushInner,Object.assign({featureType: '22'},msg)).then((res)=>{
+post(config.pushInner,Object.assign(msg,{featureType: '22'})).then((res)=>{
   var data = res.data
   if(data.code == 0) {
     var result = data.data;
@@ -33,14 +34,39 @@ post(config.pushInner,Object.assign({featureType: '22'},msg)).then((res)=>{
 });
 
 function bqtsFun(data){//病情提示
+  let tmpBqDetailAllStr = '';
+  //let names = [];
   for(var k = 0;k < data.length;k++){
     var tmpBq = data[k]
-    var tmpBqStr = '<div class="mayIllness">患者可能有 <span data-name='+tmpBq.name+'>'+tmpBq.name+'<span target="_blank" title="点击该名称可看详细说明" class="infoMsg" href="information.html?type=22&position=2&name='+tmpBq.name+'"></span></span> :';
+    let hasSritical = false
+        let tmpBqStr;
+        if(tmpBq.details) {
+            for(let i = 0; i < tmpBq.details.length; i++) {
+                if(tmpBq.details[i].type == 4) {
+                    hasSritical= true
+                }
+            }
+        }
+        if(hasSritical) {
+          /*if(names.includes(tmpBq.name)){    //name相同去重
+            tmpBqStr='';
+          }else{
+            names.push(tmpBq.name);*/
+            tmpBqStr = `<p class="mayIllness">
+            <span class="sriticalNameBox"><span class="sriticalName">${tmpBq.name}</span>
+            </span>
+        </span></p>`
+          //}
+
+        } else {
+            tmpBqStr =  '<div class="mayIllness">患者可能有 <span class="diagName" data-name='+tmpBq.name+'>'+tmpBq.name+'<span target="_blank" title="点击该名称可看详细说明" class="infoMsg" href="information.html?type=22&position=2&name='+tmpBq.name+'"></span></span> :';
+        }
+
     var tmpBqDetailStr = ''
     for(var m = 0;m < tmpBq.details.length;m++){
       var tmpBqDetail = tmpBq.details[m]
       if(tmpBqDetail.type == 1){
-        tmpBqDetailStr+=tmpBqStr+ "<span target='_blank' data-scaleName="+tmpBqDetail.content.name+" href='scale.html?featureType=21&sex="+msg.sex+"&lis="+JSON.stringify(msg.lis)+"&diag="+msg.diag+"&scaleName="+tmpBqDetail.content.name+"&symptom="+msg.symptom+"&other="+msg.other+"&pacs="+msg.pacs+"&vital="+msg.vital+"&age="+msg.age+"&scaleId="+tmpBqDetail.content.id+"' class='illnessTable'>【"+tmpBqDetail.content.name+"】</span>"+
+        tmpBqDetailStr+=tmpBqStr+ "<div target='_blank' data-scaleName="+tmpBqDetail.content.name+" href='scale.html?featureType=21&sex="+msg.sex+"&lis="+JSON.stringify(msg.lis)+"&diseaseName"+msg.diseaseName+"&diag="+msg.diag+"&scaleName="+tmpBqDetail.content.name+"&symptom="+msg.symptom+"&other="+msg.other+"&pacs="+msg.pacs+"&vital="+msg.vital+"&age="+msg.age+"&scaleId="+tmpBqDetail.content.id+"' class='illnessTable'>【"+tmpBqDetail.content.name+"】</div>"+
           '</div>';
       }
       if(tmpBqDetail.type == 2){
@@ -50,20 +76,27 @@ function bqtsFun(data){//病情提示
         for(var n = 0;n < tmpBqDetail.content.details.length;n++){
           var deepDetail = tmpBqDetail.content.details[n]
           if(deepDetail.controlType == 2){//0-radio,1-checkbox,2-text,3-dropdownlist
-            deepDetailStr+='<li class="radioCheck"><span class="modalMaintltle">请输入'+deepDetail.name+': </span><input type="text" placeholder="请输入" value="'+deepDetail.value+'"><i class="uint">'+deepDetail.uint+'</i></li>'
+            if(deepDetail.isShow == 0) {
+              deepDetailStr+='<li class="radioCheck"><span class="modalMaintltle">'+deepDetail.name+': </span>' + deepDetail.value +' '+ deepDetail.uint+'</li>'
+            } else {
+              deepDetailStr+='<li class="radioCheck"><span class="modalMaintltle">请输入'+deepDetail.name+': </span><input class="'+ tmpBqDetail.content.name+deepDetail.name+'" type="text" placeholder="请输入"' +(deepDetail.isShow == 0 ? 'readonly':'') + ' value="'+deepDetail.value+'"><i class="uint">'+deepDetail.uint+'</i></li>'
+            }
           }
           if(deepDetail.controlType == 0){
             let tooDeepDetailStr = ''
             for(var f = 0;f<deepDetail.details.length;f++){
               var tooDeepDetail = deepDetail.details[f]
-              if(deepDetail.name == '性别'){
-                tooDeepDetailStr+='<li class="radioChecks '+(tooDeepDetail.state == 1?"radioCheckSec":"")+'" data-select="'+(tooDeepDetail.state == 1?"select":"")+'"><i></i><span>'+tooDeepDetail.detailName+'</span></li>'
+              if(deepDetail.isShow == '0'){
+                if(tooDeepDetail.state == 1) {
+                  // tooDeepDetailStr+='<li><span>'+tooDeepDetail.detailName+'</span></li>'
+                  tooDeepDetailStr+='<li class="radioChecks" data-select="'+(tooDeepDetail.state == 1?"select":"")+'"><span>'+tooDeepDetail.detailName+'</span></li>'
+                }
               }else{
                 tooDeepDetailStr+='<li class="radioChecks"><i></i><span>'+tooDeepDetail.detailName+'</span>'+(tooDeepDetail.state == 1?"<a>(智能推荐)</a>":"")+'</li>'
               }
             }
             deepDetailStr+='<li class="radioCheck"><span class="modalMaintltle">'+deepDetail.name+': </span>'+
-              '<ul class="clearfix caculateLis">'+
+              '<ul class="clearfix caculateLis" data-isShow="'+deepDetail.isShow+'">'+
               tooDeepDetailStr+
               '</ul>'+
               '</li>'
@@ -113,18 +146,25 @@ function bqtsFun(data){//病情提示
           '</div>'+
           '</span></div></div>'
       }
+      if(tmpBqDetail.type == 4){
+        tmpBqDetailStr+=tmpBqStr + 
+        // "<div class='sriticalinfo'>诊断要点:"+tmpBqDetail.content.name+"</div>"+
+          '</div>';
+      }
     }
     /*if(tmpBqStr != '' || tmpBqDetailStr != ''){
       $(".conditionHintTipsNull").css("display","none")
     }*/
-    $(".conditionHintTipsNull").html('<div class="conditionMain clearfix">'+'<div class="alertModal">'+tmpBqDetailStr+'</div></div>')
+    tmpBqDetailAllStr += tmpBqDetailStr
   }
+  $(".conditionHintTipsNull").html('<div class=" clearfix">'+'<div class="sriticalinfo">'+tmpBqDetailAllStr+'</div></div>')
+
   $(".mayIllness .infoMsg").on("click",function(){
     const infoMsgName = $(this).parent().attr('data-name')
     openNewWin(`information.html?type=22&position=2&name=${infoMsgName}`)
   })
   $(".illnessTable").on('click',function(){
     const scaleName = $(this).attr('data-scaleName')
-    openNewWin(`scale.html?featureType=21&sex=${msg.sex}&lis=${JSON.stringify(msg.lis)}&diag=${msg.diag}&scaleName=${scaleName}&symptom=${msg.symptom}&other=${msg.other}&pacs=${msg.pacs}&vital=${msg.vital}&age=${msg.age}`)
+    openNewWin(`scale.html?featureType=21&sex=${msg.sex}&lis=${JSON.stringify(msg.lis)}&diag=${msg.diag}&diseaseName=${msg.diseaseName}&scaleName=${scaleName}&symptom=${msg.symptom}&other=${msg.other}&pacs=${msg.pacs}&vital=${msg.vital}&age=${msg.age}`)
   })
 }

+ 158 - 128
src/js/index.js

@@ -7,9 +7,22 @@ var Promise = require("bluebird");
 const $ = require("jquery");
 const { post,config,getUrlArgObject,openNewWin } = require('./promise.js');
 const { transConf } = require('./util.js');
-const { renderRecommendInfo, renderMultRecommendInfo, renderTreat, renderRecommendConditTips } = require('./indexVertDom.js');
+const { renderRecommendInfo, renderMultRecommendInfo, renderTreat, renderRecommendConditTips, renderTipsInfo } = require('./indexVertDom.js');
 
-var msg = {
+let mrId = getUrlArgObject('mrId') 
+let msg;
+if(mrId) {
+ post(config.getMr,{mrId:mrId}).then((res) => {
+    const data = res.data
+    if(data.code == 0) {
+      msg = Object.assign(data.data, {hosCode:getUrlArgObject('hospitalCode') || '',plan:getUrlArgObject('plan') || '0',})
+      window.msg = msg
+      window.pushMessage = {} 
+      getPageInfo();
+    }
+  })
+} else {
+  msg = {
     age: getUrlArgObject('age'),
     sex: getUrlArgObject('sex') == '男'?1:(getUrlArgObject('sex') == '女'?2:(getUrlArgObject('sex') == '通用'?3:getUrlArgObject('sex'))),
     symptom: getUrlArgObject('symptomJson'),
@@ -17,15 +30,35 @@ var msg = {
     lis: getUrlArgObject('lisJson')? JSON.parse(getUrlArgObject('lisJson')) : [],
     pacs: getUrlArgObject('pacsJson'),
     diag: getUrlArgObject('diagJson'),
-    diseaseName: getUrlArgObject('diagJson'),
+    diseaseName: getUrlArgObject('diseaseName'),
     other: getUrlArgObject('otherJson') + getUrlArgObject('pastJson'),
-    hosCode:getUrlArgObject('hospitalCode') || ''
-}//推送相关信息
-//   http://localhost:8082/indexVert.html?age=28&diseaseId=280&lisJson=&diagJson=%E6%80%A5%E6%80%A7%E8%83%B0%E8%85%BA%E7%82%8E&pastJson=%E6%97%A0%E5%BF%83%E8%84%8F%E7%97%85&otherJson=%E6%97%A0%E9%AB%98%E8%A1%80%E5%8E%8B&pacsJson=%E8%85%B9%E9%83%A8B%E8%B6%85:%E6%97%A0%E5%BC%82%E5%B8%B8,%20%E6%8A%A5%E5%91%8A%E6%97%A5%E6%9C%9F:2019-05-07&sex=%E7%94%B7&symptomJson=%E6%81%B6%E5%BF%83%E5%91%95%E5%90%90%E8%85%B0%E7%97%9B&vitalJson=%E8%A1%80%E5%8E%8B%E5%B7%A6%E4%B8%8A%E8%82%A213/12mmHg
-window.msg = msg
-window.pushMessage = {}
+    hosCode:getUrlArgObject('hospitalCode') || '',
+    plan:getUrlArgObject('plan') || '0',
+  }
+  window.msg = msg
+  window.pushMessage = {} 
+  getPageInfo();
+}
+
+
+// var msg = {
+//     age: getUrlArgObject('age'),
+//     sex: getUrlArgObject('sex') == '男'?1:(getUrlArgObject('sex') == '女'?2:(getUrlArgObject('sex') == '通用'?3:getUrlArgObject('sex'))),
+//     symptom: getUrlArgObject('symptomJson'),
+//     vital: getUrlArgObject('vitalJson'),
+//     lis: getUrlArgObject('lisJson')? JSON.parse(getUrlArgObject('lisJson')) : [],
+//     pacs: getUrlArgObject('pacsJson'),
+//     diag: getUrlArgObject('diagJson'),
+//     diseaseName: getUrlArgObject('diseaseName'),
+//     other: getUrlArgObject('otherJson') + getUrlArgObject('pastJson'),
+//     hosCode:getUrlArgObject('hospitalCode') || '',
+//     plan:getUrlArgObject('plan') || '0',
+// }//推送相关信息
+// //   http://localhost:8082/indexVert.html?age=28&diseaseId=280&lisJson=&diagJson=%E6%80%A5%E6%80%A7%E8%83%B0%E8%85%BA%E7%82%8E&pastJson=%E6%97%A0%E5%BF%83%E8%84%8F%E7%97%85&otherJson=%E6%97%A0%E9%AB%98%E8%A1%80%E5%8E%8B&pacsJson=%E8%85%B9%E9%83%A8B%E8%B6%85:%E6%97%A0%E5%BC%82%E5%B8%B8,%20%E6%8A%A5%E5%91%8A%E6%97%A5%E6%9C%9F:2019-05-07&sex=%E7%94%B7&symptomJson=%E6%81%B6%E5%BF%83%E5%91%95%E5%90%90%E8%85%B0%E7%97%9B&vitalJson=%E8%A1%80%E5%8E%8B%E5%B7%A6%E4%B8%8A%E8%82%A213/12mmHg
+// window.msg = msg
+// window.pushMessage = {}
 function getConf() {
-  return post(config.getSysSetInfoDatas,{hospitalCode: msg.hosCode}).then((res)=>{
+  return post(config.getSysSetInfoDatas,{hospitalCode: msg.hosCode,plan:msg.plan}).then((res)=>{
         const data = res.data
         if(data.code == 0){
             let confArr = transConf(data.data)
@@ -37,8 +70,8 @@ function getConf() {
 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){
+              window.pushInfo = data
               var result = data.data;
               // if(result.medicalIndications && result.medicalIndications.length>0){//病情提示
               //   window.pushMessage = result.medicalIndications;//计算的需要的相关数据
@@ -66,35 +99,9 @@ function getPushInfo() {
                           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)
               }
+          }else {
+            window.pushInfo = {}
           }
   })
   
@@ -103,106 +110,129 @@ function getPushInfo() {
 function getTreatment() {
   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','治疗方案',{})
-          // }
-
+          if(data.code == 0){
+            window.treatInfo = data
+          } else {
+            window.treatInfo = {}
+          }
   })
   
 }
 
+function getTipsInfo() {
+  post(config.information,{name:getUrlArgObject('tipsName'),type:getUrlArgObject('tipsType'), position: 1}).then((res)=>{
+    var data = res.data
+    if(data.code == 0) {
+        window.tipsInfo = data
+    } else {
+      window.tipsInfo = {}
+    }
+    
+  }).catch(function (err) {
+    console.log(err);
+  })
+}
+
+
 // 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++) {
+function getPageInfo() {
 
-    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
-    } 
-  }
+  Promise.all([getConf(),getPushInfo(),getTreatment(),getTipsInfo()]).then(([res1, res2, res3, res4]) =>{
+    if(pushInfo&&pushInfo.code == 0) {
+      pushResult = pushInfo.data;
+    } else {
+      pushResult = {};
+    }
+    if(treatInfo&&treatInfo.code == 0) {
+      treatResult = treatInfo.data
+    } else {
+      treatResult = {}
+    }
+    if(tipsInfo&&tipsInfo.code == 0) {
+      tipsResult = tipsInfo.data
+    } else {
+      tipsResult = {}
+    }
+    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;//计算的需要的相关数据
 
-  // 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 || [])
+    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;
+        case "tip_show": //提示信息
+          renderTipsInfo('tipsInfo','提示信息',tipsResult)
+          moreInfo()
+          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 || [])
+    
+  }).catch(function (err) {
+    console.log(err);
+  })
+
+
+}
+function moreInfo() {
+  $('.moreInfo').click(function(){
+    const name = $(this).attr('data-name')
+    const type = getUrlArgObject('tipsType')
+    openNewWin(`information.html?type=${type}&position=0&name=${name}`)
+  })
+}
 
 
 $(".disclaimerInfo").on("click", function(){

+ 195 - 148
src/js/indexHorizontal.js

@@ -11,12 +11,10 @@ let labAndPacsImg = require('./../images/inspect.png')
 let conditTipsImg = require('./../images/tips.png')
 let treatImg = require('./../images/zhiliao.png')
 
-
-
 const $ = require("jquery");
 const { post,config,getUrlArgObject,openNewWin, isIe8 } = require('./promise.js');
 const { transConf } = require('./util.js');
-const { renderRecommendInfo, renderMultRecommendInfo, renderTreat, renderRecommendConditTips } = require('./indexHorizontalDom.js');
+const { renderRecommendInfo, renderMultRecommendInfo, renderTreat, renderRecommendConditTips, renderTipsInfo } = require('./indexHorizontalDom.js');
 const is8Ie = isIe8() //判断是否为IE8
 if(is8Ie) {
   let reg = /undefined/g
@@ -29,7 +27,21 @@ if(is8Ie) {
   treatImg = treatImg.replace(reg, '')
 }
 
-var msg = {
+let mrId = getUrlArgObject('mrId') 
+let showTab = getUrlArgObject('showTab') || '0';
+let msg;
+if(mrId) {
+ post(config.getMr,{mrId:mrId}).then((res) => {
+    const data = res.data
+    if(data.code == 0) {
+      msg = Object.assign(data.data, {hosCode:getUrlArgObject('hospitalCode') || '',plan:getUrlArgObject('plan') || '0',})
+      window.msg = msg
+      window.pushMessage = {} 
+      getPageInfo();
+    }
+  })
+} else {
+  msg = {
     age: getUrlArgObject('age'),
     sex: getUrlArgObject('sex') == '男'?1:(getUrlArgObject('sex') == '女'?2:(getUrlArgObject('sex') == '通用'?3:getUrlArgObject('sex'))),
     symptom: getUrlArgObject('symptomJson'),
@@ -37,96 +49,69 @@ var msg = {
     lis: getUrlArgObject('lisJson')? JSON.parse(getUrlArgObject('lisJson')) : [],
     pacs: getUrlArgObject('pacsJson'),
     diag: getUrlArgObject('diagJson'),
-    diseaseName: getUrlArgObject('diagJson'),
+    diseaseName: getUrlArgObject('diseaseName'),
     other: getUrlArgObject('otherJson') + getUrlArgObject('pastJson'),
-    hosCode:getUrlArgObject('hospitalCode') || ''
-}//推送相关信息
-//   http://localhost:8082/indexVert.html?age=28&diseaseId=280&lisJson=&diagJson=%E6%80%A5%E6%80%A7%E8%83%B0%E8%85%BA%E7%82%8E&pastJson=%E6%97%A0%E5%BF%83%E8%84%8F%E7%97%85&otherJson=%E6%97%A0%E9%AB%98%E8%A1%80%E5%8E%8B&pacsJson=%E8%85%B9%E9%83%A8B%E8%B6%85:%E6%97%A0%E5%BC%82%E5%B8%B8,%20%E6%8A%A5%E5%91%8A%E6%97%A5%E6%9C%9F:2019-05-07&sex=%E7%94%B7&symptomJson=%E6%81%B6%E5%BF%83%E5%91%95%E5%90%90%E8%85%B0%E7%97%9B&vitalJson=%E8%A1%80%E5%8E%8B%E5%B7%A6%E4%B8%8A%E8%82%A213/12mmHg
-window.msg = msg
-window.pushMessage = {}
+    hosCode:getUrlArgObject('hospitalCode') || '',
+    plan:getUrlArgObject('plan') || '0',
+  }
+  window.msg = msg
+  window.pushMessage = {} 
+  getPageInfo();
+}
+
+
+// var msg = {
+//     age: getUrlArgObject('age'),
+//     sex: getUrlArgObject('sex') == '男'?1:(getUrlArgObject('sex') == '女'?2:(getUrlArgObject('sex') == '通用'?3:getUrlArgObject('sex'))),
+//     symptom: getUrlArgObject('symptomJson'),
+//     vital: getUrlArgObject('vitalJson'),
+//     lis: getUrlArgObject('lisJson')? JSON.parse(getUrlArgObject('lisJson')) : [],
+//     pacs: getUrlArgObject('pacsJson'),
+//     diag: getUrlArgObject('diagJson'),
+//     diseaseName: getUrlArgObject('diagJson'),
+//     other: getUrlArgObject('otherJson') + getUrlArgObject('pastJson'),
+//     hosCode:getUrlArgObject('hospitalCode') || '',
+//     plan:getUrlArgObject('plan') || '0',
+// }//推送相关信息
+// //   http://localhost:8082/indexVert.html?age=28&diseaseId=280&lisJson=&diagJson=%E6%80%A5%E6%80%A7%E8%83%B0%E8%85%BA%E7%82%8E&pastJson=%E6%97%A0%E5%BF%83%E8%84%8F%E7%97%85&otherJson=%E6%97%A0%E9%AB%98%E8%A1%80%E5%8E%8B&pacsJson=%E8%85%B9%E9%83%A8B%E8%B6%85:%E6%97%A0%E5%BC%82%E5%B8%B8,%20%E6%8A%A5%E5%91%8A%E6%97%A5%E6%9C%9F:2019-05-07&sex=%E7%94%B7&symptomJson=%E6%81%B6%E5%BF%83%E5%91%95%E5%90%90%E8%85%B0%E7%97%9B&vitalJson=%E8%A1%80%E5%8E%8B%E5%B7%A6%E4%B8%8A%E8%82%A213/12mmHg
+// window.msg = msg
+// window.pushMessage = {}
 function getConf() {
-  return post(config.getSysSetInfoDatas,{hospitalCode: msg.hosCode}).then((res)=>{
+  return post(config.getSysSetInfoDatas,{hospitalCode: msg.hosCode,plan:msg.plan}).then((res)=>{
       const data = res.data
       if(data.code == 0){
           let confArr = transConf(data.data)
           window.confArr = confArr;
       }
+  }).catch(function (err) {
+    console.log(err);
   })
 }
 
 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;
-    //     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)
-    //     }
+    if(data.code == 0){
+      window.pushInfo = data
+    } else {
+      window.pushInfo = {}
+    }
       
     
       
-    // }
+  }).catch(function (err) {
+    console.log(err);
   })
 }
 
 function getTreatment() {
   post(config.pushTreatment,Object.assign({featureType: '8'},msg)).then((res)=>{
     var data = res.data
-    window.treatInfo = data
+    if(data.code == 0){
+      window.treatInfo = data
+      } else {
+        window.treatInfo = {}
+      }
     // if(data.code == 0){
     //   var result = data.data;
     //   renderTreat(treatImg, 'treatRecommend','治疗方案',result)
@@ -145,87 +130,149 @@ function getTreatment() {
     // } else {
     //   renderTreat(treatImg,'treatRecommend','治疗方案',{})
     // }
+  }).catch(function (err) {
+    console.log(err);
   })
 }
-// 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
+
+
+function getTipsInfo() {
+  post(config.information,{name:getUrlArgObject('tipsName'),type:getUrlArgObject('tipsType'), position: 1}).then((res)=>{
+    var data = res.data
+    if(data.code == 0) {
+      window.tipsInfo = data
+    }else {
+      window.tipsInfo = {}
     }
-  ]
-  window.pushMessage = medicalIndications;//计算的需要的相关数据
-  for(let i = 0; i < confArr.length; i++) {
+  }).catch(function (err) {
+    console.log(err);
+  })
+}
 
-    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
-    } 
-  }
-  const pushHei = $('.push').height()
-  if(pushHei == 0) {
-    $('.treat').css({"width":"90%"})
-  }
-  // 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 || [])
+function getPageInfo() {
+  Promise.all([getConf(),getPushInfo(),getTreatment(),getTipsInfo()]).then(([res1, res2, res3,res4]) =>{
+    if(pushInfo&&pushInfo.code == 0) {
+      pushResult = pushInfo.data;
+    } else {
+      pushResult = {};
+    }
+    if(treatInfo&&treatInfo.code == 0) {
+      treatResult = treatInfo.data
+    } else {
+      treatResult = {}
+    }
+    if(tipsInfo&&tipsInfo.code == 0) {
+      tipsResult = tipsInfo.data
+    } else {
+      tipsResult = {}
+    }
+    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;//计算的需要的相关数据
+    let tipsNum = 0;
+    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": //治疗方案
+          tipsNum++;
+          renderTreat(treatImg, 'treatRecommend','治疗方案',treatResult)
+          break;
+        case "diagnose_show": //推荐诊断
+          renderRecommendInfo(diagImg, 'diagRecommend', '推荐诊断', diagRecommend, true,7,2)
+          break;
+        case "tip_show": //提示信息
+          tipsNum++;
+          renderTipsInfo('', 'tipsInfo','提示信息',tipsResult)
+          moreInfo()
+          break;
+        default:
+           return
+      } 
+    }
+    
+    function bindTab() {
+      if(showTab == '1') {
+          $('.infoTabBox .tipsTab').addClass('activeTab')
+          $('.infomationBox .treatRecommend').css("display","none")
+      } else {
+        $('.infoTabBox .treatTab').addClass('activeTab')
+        $('.infomationBox .tipsInfo').css("display","none")
+      }
+
+      $('.infomationBox .infoTab').click(function() {
+        $(this).addClass('activeTab').siblings().removeClass('activeTab')
+        $('.informationBox').css("display","none")
+        const boxNode = $(this).attr('data-box')
+        $('.'+boxNode).css("display","block")
+      })
+    
+    }
+    // bindTab();
+    if(tipsNum === 2) {
+      bindTab();
+    }
+    function moreInfo() {
+      $('.moreInfo').click(function(){
+        const name = $(this).attr('data-name')
+        const type = getUrlArgObject('tipsType')
+        openNewWin(`information.html?type=${type}&position=0&name=${name}`)
+      })
+    }
+    
+    const pushHei = $('.push').height()
+    if(pushHei == 0) {
+      $('.infomationBox').css({"width":"90%"})
+    }
+    // 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 || [])
+    
+  }).catch(function (err) {
+    console.log(err);
+  })
+
+}
+
 
 
 $(".disclaimerInfo").on("click", function(){

+ 96 - 20
src/js/indexHorizontalDom.js

@@ -1,9 +1,10 @@
 const $ = require("jquery");
-const { openNewWin, isIe8 } = require('./promise.js');
+const { openNewWin, imageUrlPrefix, isIe8 } = require('./promise.js');
 const { bindTipsEvent } = require('./popupEdit.js');
 let showImg = require('./../images/show.png')
 let collapseImg = require('./../images/collapse.png')
 
+
 const is8Ie = isIe8() //判断是否为IE8
 if(is8Ie) {
   let reg = /undefined/g
@@ -99,11 +100,12 @@ function renderMultRecommendInfo(icon, className,title,data, hasInfo, type, posi
 }
 
 function renderTreat(icon, className,title, data) {
-    const str = `<div class="recommendInfoWrapper ${className} clearfix">
-                    <h4><img src=${icon} title="${title}" class="icon">${title}:<span class="diagName">${msg.diag}</span></h4>
+    $('.infoTabBox').append(`<span class="infoTab treatTab"  data-box="${className}">${title}</span>`)
+    const str = `<div class="informationBox recommendInfoWrapper ${className} clearfix">
+                    <span class="diagName">${msg.diseaseName?msg.diseaseName:''}</span>
                     <div class="recommendInfoBox clearfix ${className + 'box'}"></div>
                 </div>`
-    $('.treat').append(str)
+    $('.infomationBox').append(str)
     const commonTreatmentInfo = data.commonTreatment&&data.commonTreatment.content || ""
     const treatmentList = data.treatment || []
     renderTreatText('commonTreatment', '一般治疗', commonTreatmentInfo, className+'box')
@@ -128,8 +130,8 @@ function renderTreatText(className,title,data, parentNode) {
     if(commonTreatHeight > 75){
         $(".treatTextBox").append('<span class="more">更多</span>')
     }
-    $(".treat .treatTextBox").on('click',".more",function(){
-        openNewWin(`treatplan.html?age=${msg.age}&sex=${msg.sex}&symptomJson=${msg.symptom}&vitalJson=${msg.vital}&lisJson=${msg.lis}&pacsJson=${msg.pacs}&diagJson=${msg.diag}&otherJson=${msg.other}&hospitalCode=${msg.hosCode}`)
+    $(".infomationBox .treatTextBox").on('click',".more",function(){
+        openNewWin(`treatplan.html?msg=${encodeURIComponent(JSON.stringify(msg))}`)
       })
     
 }
@@ -148,7 +150,7 @@ function renderTreatDrug(className,title,data, parentNode) {
     }
     for(let i = 0; i < data.length; i++) {
         let childrenNodeStr = `<p class="drugTreatmentInfoItemBox">
-            ${i+1}.${data[i].bigdrugsName}(${data[i].subdrugsName}):`
+            ${i+1}.${data[i].bigdrugsName}${data[i].subdrugsName&&"("+data[i].subdrugsName+")"}:`
         for (let j = 0; j < data[i].medicitionsList.length; j++) {
             childrenNodeStr += `<span class="durgNameBox">${data[i].medicitionsList[j].medicitionName}`
             if(data[i].medicitionsList[j].drugsForbidden == '1') {
@@ -178,8 +180,9 @@ function renderTreatDrug(className,title,data, parentNode) {
     } else if(drugTreatmentHeight > 30) {
         $(".drugTreatmentInfo").append('<span class="more">更多</span>')
     }
-    $(".treat .drugTreatmentbox").on('click',".more",function(){
-        openNewWin(`treatplan.html?age=${msg.age}&sex=${msg.sex}&symptomJson=${msg.symptom}&vitalJson=${msg.vital}&lisJson=${msg.lis}&pacsJson=${msg.pacs}&diagJson=${msg.diag}&otherJson=${msg.other}&hospitalCode=${msg.hosCode}`)
+    $(".infomationBox .drugTreatmentbox").on('click',".more",function(){
+        openNewWin(`treatplan.html?msg=${encodeURIComponent(JSON.stringify(msg))}`)
+        // openNewWin(`treatplan.html?age=${msg.age}&sex=${msg.sex}&symptomJson=${msg.symptom}&vitalJson=${msg.vital}&lisJson=${msg.lis}&pacsJson=${msg.pacs}&diseaseName=${msg.diseaseName}&diagJson=${msg.diag}&otherJson=${msg.other}&hospitalCode=${msg.hosCode}`)
       })
     var treatList = $(".drugTreatmentInfo").find(".drugTreatmentInfoItemBox")
     // for(var h = 0;h < treatList.length;h++){ 
@@ -197,6 +200,49 @@ function renderTreatDrug(className,title,data, parentNode) {
     // }
 }
 
+function renderTipsInfo(icon, className,title,data) {
+  
+    $('.infoTabBox').append(`<span class="infoTab tipsTab" data-box="${className}">${title}</span>`)
+    let str
+    if(!data.name) {
+        str = `<div class="informationBox tipsInfoWrapper ${className} clearfix">
+            <p class="diagName recommendNull">暂无数据</p>
+            <div class="tipsInfoBox clearfix ${className + 'box'}"></div>
+        </div>`
+    } else {
+        str = `<div class="informationBox tipsInfoWrapper ${className} clearfix">
+                    <p class="diagName">${data.name} <span class="moreInfo" data-name="${data.name}">详情</span></p>
+                    <p class="tipsTitle">诊断依据:</p>
+                    <div class="tipsInfoBox clearfix ${className + 'box'}"></div>
+                </div>`
+    }
+    
+    $('.infomationBox').append(str)
+    if(data.name) {
+        renderTipsInfoText('','诊断依据',data.details,className + 'box')
+    }
+}
+
+
+function renderTipsInfoText(className,title,data, parentNode) {
+    let childrenNodeBoxStr = ``
+    if(data.length === 0) {
+        childrenNodeBoxStr += `<p class="recommendNull">暂无数据</p>
+                                
+                            `
+    } else {
+        for(let i = 0; i < data.length; i++) {
+            childrenNodeBoxStr += `<p>${data[i].title}</p>
+                                    ${data[i].content.replace(/{imageUrlPrefix}/g, imageUrlPrefix)}
+                                `
+        }
+    }
+   
+    $('.' + parentNode).append(childrenNodeBoxStr)
+  
+    
+}
+
 function renderRecommendConditTips(icon, className,title,data) {
     const str = `<div class="recommendInfoWrapper ${className} clearfix">
                     <h4><img src=${icon} title="${title}" class="icon">${title}:</h4>
@@ -206,24 +252,51 @@ function renderRecommendConditTips(icon, className,title,data) {
     if(data.length == 0) {
         $("."+className+"box").append('<span class="recommendNull">暂无推荐</span>')
     }
+    /*let names = [];*/
     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>'
-        var tmpBqStr = `<p class="mayIllness">
-                            患者可能有 <span class="diagNameBox">${tmpBq.name}:
+        var tmpBq = data[k];
+        let hasSritical = false
+        let tmpBqStr;
+        if(tmpBq.details) {
+            for(let i = 0; i < tmpBq.details.length; i++) {
+                if(tmpBq.details[i].type == 4) {
+                    hasSritical= true
+                }
+            }
+        }
+        if(hasSritical) {
+          /*if(names.includes(tmpBq.name)){    //name相同去重
+            tmpBqStr='';
+          }else{
+            names.push(tmpBq.name);*/
+            tmpBqStr = `<p class="mayIllness">
+                <span class="sriticalNameBox"><span class="sriticalName">${tmpBq.name}</span>
+                </span>
+            </span></p>`
+         // }
+        } else {
+            tmpBqStr = `<p class="mayIllness">
+                            患者可能有 <span class="diagNameBox"><span class="diagName">${tmpBq.name}:</span>
                                 <span title="点击该名称可看详细说明" class="infoMsg" data-name=${tmpBq.name}></span>
-                            </span> 
-                        </p>`
+                            </span>
+                        </span></p>`
+        }
+        
         var tmpBqDetailStr = ''
         for(var m = 0;m < tmpBq.details.length;m++){
           var tmpBqDetail = tmpBq.details[m]
           if(tmpBqDetail.type == 1){
-            tmpBqDetailStr+=`<span data-url=scale.html?featureType=21&sex=${msg.sex}&lis=${JSON.stringify(msg.lis)}&diag=${msg.diag}&scaleName=${tmpBqDetail.content.name}&symptom=${msg.symptom}&other=${msg.other}&pacs=${msg.pacs}&vital=${msg.vital}&age=${msg.age}&scaleId=${tmpBqDetail.content.id} class="illnessTable">【${tmpBqDetail.content.name}】</span>`
+            tmpBqDetailStr+=`<span data-url=scale.html?featureType=21&sex=${msg.sex}&lis=${JSON.stringify(msg.lis)}&diag=${msg.diag}&diseaseName=${msg.diseaseName}&scaleName=${tmpBqDetail.content.name}&symptom=${msg.symptom}&other=${msg.other}&pacs=${msg.pacs}&vital=${msg.vital}&age=${msg.age}&scaleId=${tmpBqDetail.content.id} class="illnessTable">【${tmpBqDetail.content.name}】</span>`
+          }
+          if(tmpBqDetail.type == 4){
+            // tmpBqDetailStr+=`<span class="sriticalinfo">&nbsp;${tmpBqDetail.content.name}(诊断要点)</span>`
           }
         
         }
-        
-        $("."+className+"box").append('<div class="conditionMain ellipse clearfix">'+tmpBqStr+'<div class="alertModal">'+tmpBqDetailStr+'</div><span class="more">更多</span></div>')
+        /*if(tmpBqStr){*/
+          $("."+className+"box").append('<div class="conditionMain ellipse clearfix">'+tmpBqStr+'<div class="alertModal">'+tmpBqDetailStr+'</div><span class="more">更多</span></div>')
+        //}
+        //$("."+className+"box").append('<div class="conditionMain ellipse clearfix">'+tmpBqStr+'<div class="alertModal">'+tmpBqDetailStr+'</div><span class="more">更多</span></div>')
       }
       $('.mayIllness .infoMsg').on('click', function(){
         const infoMsgName = $(this).attr('data-name')
@@ -234,7 +307,9 @@ function renderRecommendConditTips(icon, className,title,data) {
         openNewWin(infoMsgUrl)
       })
       $(".conditTipsbox").on('click',".more",function(){
-        openNewWin(`illness.html?age=${msg.age}&sex=${msg.sex}&symptomJson=${msg.symptom}&vitalJson=${msg.vital}&lisJson=${msg.lis}&pacsJson=${msg.pacs}&diagJson=${msg.diag}&otherJson=${msg.other}&hospitalCode=${msg.hosCode}`)
+        // openNewWin(`illness.html?age=${msg.age}&sex=${msg.sex}&symptomJson=${msg.symptom}&vitalJson=${msg.vital}&lisJson=${JSON.stringify(msg.lis)}&pacsJson=${msg.pacs}&diagJson=${msg.diag}&diseaseName=${msg.diseaseName}&otherJson=${msg.other}&hospitalCode=${msg.hosCode}&msg=${JSON.stringify(msg)}`)
+        openNewWin(`illness.html?msg=${encodeURIComponent(JSON.stringify(msg))}`)
+
       })
       bindTipsEvent()
 }
@@ -262,5 +337,6 @@ module.exports = {
     renderRecommendInfo,
     renderMultRecommendInfo,
     renderTreat,
-    renderRecommendConditTips
+    renderRecommendConditTips,
+    renderTipsInfo
 }

+ 84 - 14
src/js/indexVertDom.js

@@ -1,5 +1,5 @@
 const $ = require("jquery");
-const { openNewWin } = require('./promise.js');
+const { openNewWin,imageUrlPrefix } = require('./promise.js');
 const { bindTipsEvent } = require('./popupEdit.js');
 
 function renderRecommendInfo(className,title,data, hasInfo, type, position) {
@@ -39,6 +39,7 @@ function renderRecommendInfo(className,title,data, hasInfo, type, position) {
 }
 
 function renderMultRecommendInfo(className,title,data, hasInfo, type, position) {
+    console.log('data', data)
     const str = `<div class="recommendInfoWrapper ${className}">
                     <h4><i></i>${title}</h4>
                     <div class="recommendInfoBox ${className + 'box'}"></div>
@@ -60,9 +61,46 @@ function renderMultRecommendInfo(className,title,data, hasInfo, type, position)
 
 }
 
+function renderTipsInfo(className,title, data) {
+    const str = `<div class="recommendInfoWrapper ${className}">
+                    <h4><i></i>${title}</h4>
+                    <div class="recommendInfoBox clearfix ${className + 'box'}"></div>
+                </div>`
+    $('.recommendWrap').append(str)
+    if(data.name) {
+        renderTipsInfoMsg('tipsInfo', data.name, data.details, className+'box')
+    } else {
+        // renderTipsInfoMsg('tipsInfo', data.name, data.details, className+'box')
+        $('.' + className+'box').append('<p class="TipsInfoNull">暂无数据</p>')
+    }
+}
+
+function renderTipsInfoMsg(className,title,data, parentNode) {
+    const childrenNodeBoxStr = `
+        <div class = "treatItemBox ${className + 'box'}">
+            <p class="treatItemTitle">${title} <span class="moreInfo" data-name="${title}">详情</span></p>
+            <p class="${className + 'Info'} clearfix"></p>
+        </div>
+    `
+    $('.' + parentNode).append(childrenNodeBoxStr)
+    let dataStr = ``
+    if(data.length === 0) {
+        dataStr += `<p class="TipsInfoNull">暂无数据</p>
+                            `
+    } else {
+        for(let i = 0; i < data.length; i++) {
+            dataStr += `<p>${data[i].title}</p>
+                                    ${data[i].content.replace(/{imageUrlPrefix}/g, imageUrlPrefix)}
+                        `
+        }
+    }
+    
+    $('.' + className+'Info').html(dataStr)
+}
+
 function renderTreat(className,title, data) {
     const str = `<div class="recommendInfoWrapper ${className}">
-                    <h4><i></i>${title}${msg.diag?'('+msg.diag+')':''}</h4>
+                    <h4><i></i>${title}${msg.diseaseName?'('+msg.diseaseName+')':''}</h4>
                     <div class="recommendInfoBox clearfix ${className + 'box'}"></div>
                 </div>`
     $('.recommendWrap').append(str)
@@ -110,7 +148,7 @@ function renderTreatDrug(className,title,data, parentNode) {
     }
     for(let i = 0; i < data.length; i++) {
         let childrenNodeStr = `<p class="drugTreatmentInfoItemBox">
-            ${i+1}.${data[i].bigdrugsName}(${data[i].subdrugsName}):`
+            ${i+1}.${data[i].bigdrugsName}${data[i].subdrugsName&&"("+data[i].subdrugsName+")"}:`
         for (let j = 0; j < data[i].medicitionsList.length; j++) {
             childrenNodeStr += `<span class="durgNameBox"><span class="durgName">${data[i].medicitionsList[j].medicitionName}</span>`
             if(data[i].medicitionsList[j].drugsForbidden == '1') {
@@ -157,20 +195,42 @@ function renderRecommendConditTips(className,title,data) {
     $('.recommendWrap').append(str)
     if(data.length == 0) {
         $("."+className+"box").append('<span class="recommendNull">暂无推荐</span>')
-    }
+    };
+    //let names = [];
     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>'
-        var tmpBqStr = `<p class="mayIllness">
+        let tmpBq = data[k];
+        let hasSritical = false
+        let tmpBqStr;
+        if(tmpBq.details) {
+            for(let i = 0; i < tmpBq.details.length; i++) {
+                if(tmpBq.details[i].type == 4) {
+                    hasSritical= true
+                }
+            }
+        }
+        if(hasSritical) {
+            /*if(names.includes(tmpBq.name)){    //name相同去重
+              tmpBqStr='';
+            }else{
+              names.push(tmpBq.name);*/
+              tmpBqStr = `<p class="mayIllness">
+              <span class="sriticalNameBox"><span class="sriticalName">${tmpBq.name}</span>
+                </span>
+            </span></p>`
+            //}
+        } else {
+            tmpBqStr = `<p class="mayIllness">
                             患者可能有 <span class="diagNameBox"><span class="diagName">${tmpBq.name}:</span>
                                 <span title="点击该名称可看详细说明" class="infoMsg" data-name=${tmpBq.name}></span>
                             </span>
-                        </span>`
+                        </span></p>`
+        }
+         
         var tmpBqDetailStr = ''
         for(var m = 0;m < tmpBq.details.length;m++){
           var tmpBqDetail = tmpBq.details[m]
           if(tmpBqDetail.type == 1){
-            tmpBqDetailStr+=`<span data-url=scale.html?featureType=21&sex=${msg.sex}&lis=${JSON.stringify(msg.lis)}&diag=${msg.diag}&scaleName=${tmpBqDetail.content.name}&symptom=${msg.symptom}&other=${msg.other}&pacs=${msg.pacs}&vital=${msg.vital}&age=${msg.age}&scaleId=${tmpBqDetail.content.id} class="illnessTable">${tmpBqDetail.content.name}</span>`
+            tmpBqDetailStr+=`<span data-url=scale.html?featureType=21&sex=${msg.sex}&lis=${JSON.stringify(msg.lis)}&diag=${msg.diag}&diseaseName=${msg.diseaseName}&scaleName=${tmpBqDetail.content.name}&symptom=${msg.symptom}&other=${msg.other}&pacs=${msg.pacs}&vital=${msg.vital}&age=${msg.age}&scaleId=${tmpBqDetail.content.id} class="illnessTable">${tmpBqDetail.content.name}</span>`
           }
           if(tmpBqDetail.type == 2){
             var deepDetailName = `<div class="modalTitle">${tmpBqDetail.content.name}<i class="closeModal"></i></div>`
@@ -179,14 +239,20 @@ function renderRecommendConditTips(className,title,data) {
             for(var n = 0;n < tmpBqDetail.content.details.length;n++){
               var deepDetail = tmpBqDetail.content.details[n]
               if(deepDetail.controlType == 2){//0-radio,1-checkbox,2-text,3-dropdownlist
-                deepDetailStr+=`<li class="radioCheck"><span class="modalMaintltle">请输入${deepDetail.name}: </span><input type="text" placeholder="请输入" value=${deepDetail.value}><i class="uint">${deepDetail.uint}</i></li>`
+                if(deepDetail.isShow == 0) {
+                    deepDetailStr+=`<li class="radioCheck"><span class="modalMaintltle">${deepDetail.name}: </span>${deepDetail.value} ${deepDetail.uint}</li>`
+                } else {
+                    deepDetailStr+=`<li class="radioCheck"><span class="modalMaintltle">请输入${deepDetail.name}: </span><input type="text" class="${tmpBqDetail.content.name+deepDetail.name}" ${deepDetail.isShow=='0' ? 'readonly':''} placeholder="请输入" value=${deepDetail.value}><i class="uint">${deepDetail.uint}</i></li>`
+                }
               }
               if(deepDetail.controlType == 0){
                 let tooDeepDetailStr = ''
                 for(var f = 0;f<deepDetail.details.length;f++){
                   var tooDeepDetail = deepDetail.details[f]
-                  if(deepDetail.name == '性别'){
-                    tooDeepDetailStr+='<li class="radioChecks '+(tooDeepDetail.state == 1?"radioCheckSec":"")+'" data-select="'+(tooDeepDetail.state == 1?"select":"")+'"><i></i><span>'+tooDeepDetail.detailName+'</span></li>'
+                  if(deepDetail.isShow == '0'){
+                    if(tooDeepDetail.state == 1) {
+                      tooDeepDetailStr+='<li class="radioChecks" data-select="'+(tooDeepDetail.state == 1?"select":"")+'"><span>'+tooDeepDetail.detailName+'</span></li>'
+                    }
                   }else{
                     tooDeepDetailStr+='<li class="radioChecks"><i></i><span>'+tooDeepDetail.detailName+'</span>'+(tooDeepDetail.state == 1?"<a>(智能推荐)</a>":"")+'</li>'
                   }
@@ -194,7 +260,7 @@ function renderRecommendConditTips(className,title,data) {
                 
                 
                 deepDetailStr+=`<li class="radioCheck"><span class="modalMaintltle">${deepDetail.name}: </span>
-                                <ul class="clearfix caculateLis">
+                                <ul class="clearfix caculateLis" data-isShow = ${deepDetail.isShow}>
                                     ${tooDeepDetailStr}
                                 </ul>
                             </li>`
@@ -257,6 +323,9 @@ function renderRecommendConditTips(className,title,data) {
                 </span>
             </div>`
           }
+          if(tmpBqDetail.type == 4){
+            // tmpBqDetailStr+=`<div class="sriticalinfo">诊断要点:${tmpBqDetail.content.name}</div>`
+          }
         }
         if(tmpBqStr != '' || tmpBqDetailStr != ''){
           $(".conditionHintTipsNull").css("display","none")
@@ -292,5 +361,6 @@ module.exports = {
     renderRecommendInfo,
     renderMultRecommendInfo,
     renderTreat,
-    renderRecommendConditTips
+    renderRecommendConditTips,
+    renderTipsInfo
 }

+ 6 - 3
src/js/popup.js

@@ -3,6 +3,10 @@ const $ = require("jquery");
 
 $(".conditionHintTips").on('click',".radioChecks",function(e){
   e.stopPropagation()
+  const isShow = $(this).parent().attr("data-isShow")
+  if(isShow == '0') {
+    return
+  }
   $(this).attr("data-select","select").children("i").css({
     "background":"url('../images/sex2.png') center center no-repeat"
   })
@@ -100,9 +104,8 @@ $(".conditionHintTips").on('click','.calculate',function(e){
             }
           }
         }
-        if(tmpPushMsgDetailContentVal.controlType == 2){
-          var domLis = that.parent(".modalMainTwo").children().find("input[type=text]").eq(m)
-          tmpPushMsgDetailContentVal.value = $(domLis).val()
+        if(tmpPushMsgDetailContentVal.controlType == 2&&tmpPushMsgDetailContentVal.isShow !='0'){
+          tmpPushMsgDetailContentVal.value = $('.'+paramsJson.content.name+tmpPushMsgDetailContentVal.name).val()
         }
         tmpDetailArr.push(tmpPushMsgDetailContentVal)
       }

+ 7 - 3
src/js/popupEdit.js

@@ -4,6 +4,10 @@ const $ = require("jquery");
 function bindTipsEvent() {
 
     $(".conditTips").on('click',".radioChecks",function(e){
+        const isShow =  $(this).parent().attr("data-isShow")
+        if(isShow == '0') {
+          return;
+        }
         e.stopPropagation()
         $(this).attr("data-select","select").children("i").css({
           "background":"url('../images/sex2.png') center center no-repeat"
@@ -103,9 +107,8 @@ function bindTipsEvent() {
                   }
                 }
               }
-              if(tmpPushMsgDetailContentVal.controlType == 2){
-                var domLis = that.parent(".modalMainTwo").children().find("input[type=text]").eq(m)
-                tmpPushMsgDetailContentVal.value = $(domLis).val()
+              if(tmpPushMsgDetailContentVal.controlType == 2&&tmpPushMsgDetailContentVal.isShow !='0'){
+                tmpPushMsgDetailContentVal.value = $('.'+paramsJson.content.name+tmpPushMsgDetailContentVal.name).val()
               }
               tmpDetailArr.push(tmpPushMsgDetailContentVal)
             }
@@ -122,6 +125,7 @@ function bindTipsEvent() {
               }
             }
           }
+        
           if(paramsJson.content.details[s].controlType == 2 && paramsJson.content.details[s].value == ''|| paramsJson.content.details[s].controlType == 0 && !hasSelect){
             that.parent().find(".calculateError").css("display","block");
             that.parent().find(".calculateResult").html('');

+ 30 - 7
src/js/promise.js

@@ -30,14 +30,37 @@ const config = {
   information: '/api/data/conceptDetail/getConceptDetail',
   pushScale: '/api/data/push/pushScale',
   pushTreatment: '/api/data/push/pushTreatment',
-  getSysSetInfoDatas: '/api/data/sysSet/getSysSetInfoDatas'
+  getSysSetInfoDatas: '/api/data/sysSet/getSysSetInfoDatas',
+  getMr: '/api/data/mr/getMr'
 }
-const imageUrlPrefix = 'http://192.168.2.122:82';
-const getUrlArgObject = function(parm) {  
-  var query = window.location.search;
-  var args = qs.parse(query.substr(1));
-  return args[parm];//返回对象  
-} 
+const imageUrlPrefix = 'http://192.168.2.121:82';
+// const getUrlArgObject = function(parm) {  
+//   var query = decodeURI(window.location.search);
+//   var args = qs.parse(qs.parse(query.substr(1)));
+//   return args[parm];//返回对象  
+// } 
+
+
+const getUrlArgObject = function getQueryString(name) {
+  var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+  var reg_rewrite = new RegExp("(^|/)" + name + "/([^/]*)(/|$)", "i");
+  var r = window.location.search.substr(1).match(reg);
+  var q = window.location.pathname.substr(1).match(reg_rewrite);
+  if(r != null){
+  return decodeURIComponent(r[2]);
+  }else if(q != null){
+  return decodeURIComponent(q[2]);
+  }else{
+  return null;
+  }
+
+
+
+
+  
+
+  }
+
 const post = function(url,data){
   return new Promise((resolve,reject)=>{
     $.ajax({

+ 19 - 15
src/js/treatplan.js

@@ -5,19 +5,19 @@ require('../js/popup');
 const $ = require("jquery");
 const { post,config,getUrlArgObject,openNewWin } = require('../js/promise.js');
 
-var msg = {
-  age: getUrlArgObject('age'),
-  sex: getUrlArgObject('sex') == '男'?1:(getUrlArgObject('sex') == '女'?2:(getUrlArgObject('sex') == '通用'?3:getUrlArgObject('sex'))),
-  symptom: getUrlArgObject('symptomJson'),
-  vital: getUrlArgObject('vitalJson'),
-  lis: getUrlArgObject('lisJson')? JSON.parse(getUrlArgObject('lisJson')) : [],
-  pacs: getUrlArgObject('pacsJson'),
-  diag: getUrlArgObject('diagJson'),
-  diseaseName: getUrlArgObject('diagJson'),
-  other: getUrlArgObject('otherJson') + getUrlArgObject('pastJson'),
-  hosCode:getUrlArgObject('hospitalCode') || ''
-}//推送相关信息
-
+// var msg = {
+//   age: getUrlArgObject('age'),
+//   sex: getUrlArgObject('sex') == '男'?1:(getUrlArgObject('sex') == '女'?2:(getUrlArgObject('sex') == '通用'?3:getUrlArgObject('sex'))),
+//   symptom: getUrlArgObject('symptomJson'),
+//   vital: getUrlArgObject('vitalJson'),
+//   lis: getUrlArgObject('lisJson')? JSON.parse(getUrlArgObject('lisJson')) : [],
+//   pacs: getUrlArgObject('pacsJson'),
+//   diag: getUrlArgObject('diagJson'),
+//   diseaseName: getUrlArgObject('diseaseName'),
+//   other: getUrlArgObject('otherJson') + getUrlArgObject('pastJson'),
+//   hosCode:getUrlArgObject('hospitalCode') || ''
+// }//推送相关信息
+var msg = JSON.parse(getUrlArgObject('msg'))
 window.msg = msg
 window.pushMessage = {}
 post(config.pushTreatment,Object.assign({featureType: '8'},msg)).then((res)=>{
@@ -44,12 +44,16 @@ post(config.pushTreatment,Object.assign({featureType: '8'},msg)).then((res)=>{
 
 function ybzlFun(data){//一般治疗
   $(".conditionHintZhiliaoAp").prepend('<div class="treatPlanWrap clearfix"><p class="treatPlan">一般治疗</p><p class="commonTreat clearfix">'+data+'</p></div>')
-  $(".diseaseName").html(' ( '+msg.diag+' )')
+  $(".diseaseName").html(' ( '+msg.diseaseName+' )')
 }
 function cyywFun(data){//常用药物
   for(var i = 0;i < data.length;i++){
     var tmpVal = data[i];
-    var str = '<div class="drugType">'+(i+1)+'. '+tmpVal.bigdrugsName+'<p>('+tmpVal.subdrugsName+')</p></div>';
+    var str = '<div class="drugType">'+(i+1)+'. '+tmpVal.bigdrugsName
+    if(tmpVal.subdrugsName) {
+      str += '<p>('+tmpVal.subdrugsName+')</p>';
+    }
+    str +='</div>'
     var strPart = '';
     for(var j = 0;j < tmpVal.medicitionsList.length;j++){
       var tmpPart = tmpVal.medicitionsList[j]

+ 20 - 14
src/page.js

@@ -1,18 +1,24 @@
 require('./css/page.css');
 const $ = require("jquery");
 
+// var lis = [
+//   {
+//     detailName: "HGB*3/HCT",
+//     maxValue: "",
+//     minValue: "",
+//     name: "血常规",
+//     otherValue: "",
+//     source: "0",
+//     time: "2019-05-07 17:11",
+//     uniqueName: "血常规-HGB*3/HCT",
+//     units: "",
+//     value: "4"
+//   }
+// ];
 var lis = [
-  {
-    detailName: "HGB*3/HCT",
-    maxValue: "",
-    minValue: "",
-    name: "血常规",
-    otherValue: "",
-    source: "0",
-    time: "2019-05-07 17:11",
-    uniqueName: "血常规-HGB*3/HCT",
-    units: "",
-    value: "4"
-  }
-];
-$(".iframeContainer").attr("src",'index.html?age=22&lisJson='+JSON.stringify(lis)+'&diagJson=糖尿病&pastJson=无心脏病&otherJson=无高血压&pacsJson=腹部B超:无异常, 报告日期:2019-05-07&sex=男&symptomJson=恶心呕吐腰痛&vitalJson=血压左上肢13/12mmHg')
+  {name:"血电解质3项",detailName:"钾(K)",uniqueName:"血电解质3项--钾(K)",source:"0",maxValue:5.5,minValue:3.5,time:"2019-08-30 15:31:49",units:"mmol/L",value:"3","otherValue":""},
+  // {name:"血电解质3项",detailName:"钠(Na)",uniqueName:"血电解质3项--钠(Na)",source:"0",maxValue:145,minValue:"",time:"2019-08-30 15:31:49",units:"mmol/L",value:"120",otherValue:""},
+  // {name:"尿常规11联",detailName:"尿蛋白(PRO-U)",uniqueName:"尿常规11联--尿蛋白(PRO)",source:"0",maxValue:1,minValue:"",time:"2019-08-30 15:31:49",units:"",value:"300",otherValue:""}
+]
+
+$(".iframeContainer").attr("src",'indexHorizontal.html?age=22&lisJson='+JSON.stringify(lis)+'&diagJson=糖尿病&pastJson=无心脏病&otherJson=无高血压&pacsJson=腹部B超:无异常, 报告日期:2019-05-07&sex=男&symptomJson=恶心呕吐腰痛&vitalJson=血压左上肢13/12mmHg')

+ 2 - 2
webpack.config.js

@@ -4,7 +4,7 @@ const CleanWebpackPlugin = require('clean-webpack-plugin') // 清空打包目录
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
 const webpack = require('webpack');
-const proxyHost = "http://192.168.2.236:5050";
+const proxyHost = "http://192.168.2.241:5050";
 module.exports = {
   entry: {
     index: path.resolve(__dirname, 'src/js', 'index.js'),
@@ -245,6 +245,6 @@ module.exports = {
       '/api': proxyHost
     },
     hot: true,
-    openPage:'index.html?age=28&diseaseId=280&lisJson=&diagJson=急性胰腺炎&pastJson=无心脏病&otherJson=无高血压&pacsJson=腹部B超:无异常,%20报告日期:2019-05-07&sex=男&symptomJson=恶心呕吐腰痛&vitalJson=血压左上肢13/12mmHg&hospitalCode=A001'
+    openPage:'index.html?age=28&plan=2&showTab=1&diseaseId=280&tipsName=血常规&tipsType=12&lisJson=&diagJson=急性胰腺炎&pastJson=无心脏病&otherJson=无高血压&pacsJson=腹部B超:无异常,%20报告日期:2019-05-07&sex=男&symptomJson=恶心呕吐腰痛&vitalJson=血压左上肢13/12mmHg&hospitalCode=A001'
   }
 }