浏览代码

数据服务模式横向

zhangxc 6 年之前
父节点
当前提交
9716c66451
共有 9 个文件被更改,包括 192 次插入216 次删除
  1. 41 2
      src/css/index.less
  2. 41 7
      src/css/landscape.css
  3. 8 46
      src/html/landscape.html
  4. 13 5
      src/js/illness.js
  5. 1 1
      src/js/information.js
  6. 37 142
      src/js/landscapeDom.js
  7. 13 1
      src/js/promise.js
  8. 8 3
      src/js/treatplan.js
  9. 30 9
      src/landscape.js

+ 41 - 2
src/css/index.less

@@ -57,7 +57,7 @@
       }
       .medicine:hover {
         color: @colorBlue;
-        a {
+        .infoMsg {
           display: inline-block;
           right: -20px;
           background-color: #fff;
@@ -342,16 +342,42 @@
   .conditionHintPub .conditionMain{
     padding: 20px 0;
   }
+  .makesureResult {
+    cursor: pointer;
+    color: #267FD7;
+  }
+  .mayResultSelect  .sanjiao{
+    width: 18px;
+    height: 18px;
+    display: inline-block;
+    position: relative;
+    top: 3px;
+    background: url(/images/select.png) center center no-repeat;
+  }
   .conditionHintTips .mayIllness{
-    padding: 20px 0;
+    margin: 20px 0 0 0;
     border-top:1px #E8EAEC solid;
     span,a,.modalMainOne,.modalMainTwo{
       border-bottom:none;
     }
+    span .infoMsg{
+      float: none;
+      top: 5px;
+    }
     .mayResult{
+      margin: 20px 0 0 0;
       display: inline-block;
     }
   }
+  .mayResult {
+    margin: 20px 0 0 0;
+    color: #838383;
+    position: relative;
+  }
+  .mayIllness span {
+    position: relative;
+  }
+  
 }
 
 /************治疗方案****************/
@@ -407,6 +433,19 @@
           border-radius: 4px;
           vertical-align: middle;
         }
+        
+        .medicine {
+          position: relative;
+          .infoMsg {
+            right: -20px;
+            top: 0;
+          }
+        }
+        .medicine:hover {
+          .infoMsg {
+            display: inline-block;
+          }
+        }
         p{
           color: #7C828E;
           i{

+ 41 - 7
src/css/landscape.css

@@ -9,14 +9,17 @@
     /* margin: 10px auto 50px;
     padding: 20px; */
     min-width: 340px;
+    height: 100%;
   }
   .push {
     width: 60%;
     float: left;
+    padding: 13px 0;
   }
   .treat {
     width: 35%;
     float: left;
+    padding: 13px 0;
   }
   .iframeWrap .conditionHintPub {
     /* border: 1px solid #F2F2F2; */
@@ -36,6 +39,8 @@
     margin: 0 40px 0 100px;
     height: 20px;
     overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
   }
   .iframeWrap .conditionHintPub .alertModal {
     position: relative;
@@ -86,8 +91,9 @@
     height: 20px;
     overflow: hidden;
     line-height: 20px;
-    margin-bottom: 8px;
-    margin-left: 95px;
+    margin: 0 0 8px 95px;
+    white-space: nowrap;
+    text-overflow: ellipsis;
 
   }
   .iframeWrap .conditionHintPub .treatMedicine .medicine {
@@ -97,7 +103,10 @@
   .iframeWrap .conditionHintPub .treatMedicine .medicine:hover {
     color: #267FD7;
   }
-  .iframeWrap .conditionHintPub .treatMedicine .medicine:hover a {
+  .iframeWrap .conditionHintPub .treatMedicine .medicine span {
+    display: none;
+  }
+  .iframeWrap .conditionHintPub .treatMedicine .medicine:hover span {
     display: inline-block;
     right: -20px;
     background-color: #fff;
@@ -212,6 +221,8 @@
     position: relative;
     border-bottom: 0;
     float: right;
+    cursor: pointer;
+    display: none;
   }
   .iframeWrap .conditionHintTips .mayIllness span:hover .infoMsg {
     display: inline-block;
@@ -229,6 +240,14 @@
     color: #267FD7;
     line-height: 20px;
   }
+  .iframeWrap .illnessTable::before {
+    color: #267FD7;
+    content: "【"
+  }
+  .iframeWrap .illnessTable::after {
+    color: #267FD7;
+    content: "】"
+  }
   .iframeWrap h4 {
     color: #000;
     height: 20px;
@@ -331,14 +350,14 @@
     background: url('../images/collapse.png') center center no-repeat;
   }
   .disclaimer {
-    height: 20px;
-    width: 100%;
+    height: 100%;
+    width: 5%;
     line-height: 20px;
     text-align: center;
-    position: fixed;
     bottom: 0;
     background-color: #ececec;
     z-index: 98;
+    float: left;
   }
   .disclaimer a {
     display: block;
@@ -351,6 +370,7 @@
     right: 2px;
     display: none;
     background: url('../images/msg1.png') center center no-repeat;
+    cursor: pointer;
   }
   .infoMsg:hover {
     background: url('../images/msg2.png') center center no-repeat;
@@ -401,4 +421,18 @@
   .iframeWrap .conditionHintPub .treatMedicine .slideDown {
     top: 28px;
   }
-  
+  .disclaimerName {
+    float: left;
+    height: 72px;
+    position: relative;
+    top: 50%;
+    left: 50%;
+    margin: -36px 0 0 -14px;
+    line-height: 18px;
+  }
+  .disclaimerTip {
+    margin-left: 0;
+    line-height: 14px;
+    height: 56px;
+    margin: -28px 0 0 0;
+  }

+ 8 - 46
src/html/landscape.html

@@ -13,14 +13,18 @@
 
 <body>
   <div class="bodyWrap">
-      <div class="iframeWrap">
+      <div class="iframeWrap clearfix">
+        <div class="disclaimer">
+          <div class="disclaimerName disclaimerPush">智<br/>能<br/>推<br/>送</div>
+          <div class="disclaimerName disclaimerTip">仅<br/>供<br/>参<br/>考</div>
+          <!-- <a href="disclaimer.html" target="_blank">免责声明</a> -->
+        </div>
         <ul class="push">
             <li class="conditionHintPub conditionHintRecomDiag">
               <h4 href="javascript:void(0);"><i></i>推荐诊断</h4>
               <div class="conditionMain">
-                <!-- <p class="conditionHintWaringsNull pushEmpty">暂无推荐</p> -->
+                <p class="conditionHintRecomDiagLisNull pushEmpty">暂无推荐</p>
                 <ul class="clearfix conditionHintRecomDiagLis">
-                  
                 </ul>
               </div>
             </li>
@@ -29,7 +33,6 @@
             <div class="conditionMain">
               <p class="conditionHintWzNull pushEmpty">暂无推荐</p>
               <ul class="clearfix conditionHintWzLis">
-                
               </ul>
             </div>
           </li>
@@ -42,46 +45,6 @@
                 </ul>
             </div>
           </li>
-          <!-- <li class="conditionHintPub conditionHintInspect">
-            <h4 href="javascript:void(0);"><i></i>推荐检验检查项1</h4>
-            <div class="conditionMain">
-                <p class="conditionHintInspectNull">化验 <span class="pushEmpty">| 暂无推荐</span></p>
-                <p class="conditionHintAssistNull">辅检 <span class="pushEmpty">| 暂无推荐</span></p>
-                <ul class="clearfix conditionHintInspectLis">
-                  
-                </ul>
-                <ul class="clearfix conditionHintAssistLis">
-                  
-                </ul>
-            </div>
-          </li> -->
-         
-          <!-- <li class="conditionHintPub conditionHintWarings">
-            <h4 href="javascript:void(0);"><i></i>警惕</h4>
-            <div class="conditionMain"> -->
-              <!-- <p class="conditionHintWaringsNull pushEmpty">暂无推荐</p> -->
-              <!-- <ul class="clearfix conditionHintWaringsLis">
-                
-              </ul>
-            </div>
-          </li> -->
-          <!-- <li class="conditionHintPub conditionHintMay">
-            <h4 href="javascript:void(0);"><i></i>疑似诊断</h4>
-            <div class="conditionMain">
-              <p class="pushEmpty conditionHintMayNull">暂无推荐</p>
-              <ul class="clearfix conditionHintMayLis">
-                
-              </ul>
-            </div>
-          </li> -->
-          <!-- <li class="conditionHintPub conditionHintKnzd">
-            <h4 href="javascript:void(0);"><i></i>可能诊断</h4>
-            <div class="conditionMain">
-              <ul class="clearfix conditionHintKnzdLis">
-                
-              </ul>
-            </div>
-          </li> -->
           <li class="conditionHintPub conditionHintTips">
             <h4 href="javascript:void(0);"><i></i>病情提示</h4>
             <div class="conditionMain conditionHintTipsNull">
@@ -101,9 +64,8 @@
                 </div>
               </li>
         </ul>
-        <!-- <p class="responsibility">以上推送为常见诊断及问诊内容,实际以医生临床判断为准</p> -->
       </div>
-      <div class="disclaimer"><a href="disclaimer.html" target="_blank">免责声明</a></div>
+      
   </div>
 </body>
 

+ 13 - 5
src/js/illness.js

@@ -3,7 +3,7 @@ require('../css/reset.css');
 require('../css/popup.css');
 require('./popup');
 const $ = require("jquery");
-const { post,config,getUrlArgObject } = require('./promise.js');
+const { post,config,getUrlArgObject,openNewWin } = require('./promise.js');
 
 var msg = {
   age: getUrlArgObject('age'),
@@ -35,12 +35,12 @@ post(config.pushInner,Object.assign({featureType: '22'},msg)).then((res)=>{
 function bqtsFun(data){//病情提示
   for(var k = 0;k < data.length;k++){
     var tmpBq = data[k]
-    var tmpBqStr = '<div class="mayIllness">患者可能有 <span>'+tmpBq.name+'<a target="_blank" title="点击该名称可看详细说明" class="infoMsg" href="information.html?type=22&position=2&name='+tmpBq.name+'"></a></span> :';
+    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> :';
     var tmpBqDetailStr = ''
     for(var m = 0;m < tmpBq.details.length;m++){
       var tmpBqDetail = tmpBq.details[m]
       if(tmpBqDetail.type == 1){
-        tmpBqDetailStr+=tmpBqStr+ "<a target='_blank' 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+"】</a>"+
+        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>"+
           '</div>';
       }
       if(tmpBqDetail.type == 2){
@@ -72,7 +72,7 @@ function bqtsFun(data){//病情提示
         for(var v = 0;v < tmpBqDetail.content.result.length;v++){
           deepDetailResultStr+='<p class="result"><span class="calculateName">'+tmpBqDetail.content.result[v].name+':</span><span class="calculateResult"></span></p>'
         }
-        tmpBqDetailStr+=tmpBqStr+'<div class="mayResult">结果:<span class="mayResultSelect" data-num="'+k+'">'+
+        tmpBqDetailStr+='<div class="mayResult">计算公式结果:<span class="mayResultSelect" data-num="'+k+'">'+
           '<span class="makesureResult">请选择</span>'+
           '<span class="sanjiao"></span>'+
           '<div class="popupModal">'+
@@ -98,7 +98,7 @@ function bqtsFun(data){//病情提示
           var deepDetail = tmpBqDetail.content.details[n]
           deepDetailStr+='<li class="radioChecks"><i></i><span>'+deepDetail.detailName+'</span>'+(deepDetail.state == 1?"<a>(智能推荐)</a>":"")+'</li>'
         }
-        tmpBqDetailStr+=tmpBqStr+'<div class="mayResult">结果:<span class="mayResultSelect" data-num="'+k+'"><span class="makesureResult">请选择</span><i class="sanjiao"></i>'+
+        tmpBqDetailStr+='<div class="mayResult">可能结果:<span class="mayResultSelect" data-num="'+k+'"><span class="makesureResult">请选择</span><i class="sanjiao"></i>'+
           '<div class="popupModal">'+
           '<div class="modalTitle">结果选择<i class="closeModal"></i></div>'+
           '<div class="modalMainOne">'+
@@ -119,4 +119,12 @@ function bqtsFun(data){//病情提示
     }*/
     $(".conditionHintTipsNull").html('<div class="conditionMain clearfix">'+'<div class="alertModal">'+tmpBqDetailStr+'</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}`)
+  })
 }

+ 1 - 1
src/js/information.js

@@ -25,7 +25,7 @@ function getInfomation() {
       return;
     }
     var list = data.details;
-    $("h1").html(data.tagName);
+    $("h1").html(data.name);
     $("h1").css({
       "color": "#267FD7",
       "borderBottom": "4px solid  #E9E9E9",

文件差异内容过多而无法显示
+ 37 - 142
src/js/landscapeDom.js


+ 13 - 1
src/js/promise.js

@@ -53,6 +53,17 @@ const post = function(url,data){
     });
   });
 }
+const newinConf = {
+  width: '600',   //窗口的文档显示区的宽度。以像素计。
+  height: '600',  //窗口文档显示区的高度。以像素计。
+  left: '300',  //窗口的 x 坐标。以像素计。
+  top: '300'    //窗口的 y 坐标。以像素计。
+}
+
+const newWindowLocation = `width=${newinConf.width}, height=${newinConf.height}, left=${newinConf.left}, top=${newinConf.top} scrollbars=yes`
+const openNewWin = function(url) {
+  window.open(url, "_blank", newWindowLocation)
+}
 
 const throttle =  function(fn, threshhold) {
   var timeout
@@ -81,5 +92,6 @@ module.exports = {
   post,
   getUrlArgObject,
   imageUrlPrefix,
-  throttle
+  throttle,
+  openNewWin
 }

+ 8 - 3
src/js/treatplan.js

@@ -3,7 +3,7 @@ require('../css/reset.css');
 require('../css/popup.css');
 require('../js/popup');
 const $ = require("jquery");
-const { post,config,getUrlArgObject } = require('../js/promise.js');
+const { post,config,getUrlArgObject,openNewWin } = require('../js/promise.js');
 
 var msg = {
   age: getUrlArgObject('age'),
@@ -20,8 +20,9 @@ var msg = {
 
 window.msg = msg
 window.pushMessage = {}
-
+console.log('msg',msg)
 post(config.pushTreatment,Object.assign({featureType: '8'},msg)).then((res)=>{
+  console.log('treat', res)
   var data = res.data
   if(data.code == 0){
     var result = data.data;
@@ -54,10 +55,14 @@ function cyywFun(data){//常用药物
     var strPart = '';
     for(var j = 0;j < tmpVal.medicitionsList.length;j++){
       var tmpPart = tmpVal.medicitionsList[j]
-      strPart += '<div class="drug"><span class="'+(tmpPart.forbidden == 2?'medicine medicineDis':'medicine')+'">'+tmpPart.medicitionName+'<a class="infoMsg" target="_blank" href="drugInfo.html?type=8&position=5&name='+tmpPart.medicitionName+'" title="点击该名称可看详细说明"></a></span> ' +
+      strPart += '<div class="drug"><span  class="'+(tmpPart.forbidden == 2?'medicine medicineDis':'medicine')+'" data-name='+tmpPart.medicitionName+'>'+tmpPart.medicitionName+'<span class="infoMsg" target="_blank" href="drugInfo.html?type=8&position=5&name='+tmpPart.medicitionName+'" title="点击该名称可看详细说明"></span></span> ' +
         (tmpPart.forbidden==0?'':'<span class="medicineWaring">'+(tmpPart.forbidden == 1?'慎用':tmpPart.forbidden == 2?'禁用':'')+'</span>') +
         '<p class="'+(tmpPart.forbidden == 2?"medicineWaringDisMsg":"")+'"><i>'+tmpPart.rate+'</i> 使用率</p></div>'
     }
     $(".drugWarp").append('<div class="medicinePart clearfix">'+str+'<div class="drugCont">'+strPart+'</div></div>')
   }
+  $(".medicine .infoMsg").on("click",function(){
+    const infoMsgName = $(this).parent().attr('data-name')
+    openNewWin(`information.html?type=8&position=5&name=${infoMsgName}`)
+  })
 }

+ 30 - 9
src/landscape.js

@@ -3,9 +3,9 @@ require('./css/reset.css');
 require('./css/popup.css');
 require('./js/popup');
 const $ = require("jquery");
-const { post,config,getUrlArgObject } = require('./js/promise.js');
+const { post,config,getUrlArgObject, openNewWin } = require('./js/promise.js');
 
-const {bqtsFun,ybzlFun,cyywFun,knzdFun,jtFun,tjwzFun,tjtgFun,tjhyFun,tjfjFun,yszdFun, tjzdFun, slideToggle} = require('./js/landscapeDom.js');
+const {bqtsFun,ybzlFun,cyywFun,tjwzFun,tjtgFun,tjhyFun,tjfjFun, tjzdFun, slideToggle} = require('./js/landscapeDom.js');
 //   symptom: "恶心呕吐腰痛", //胸痛,背痛,恶心,呕吐     //恶心呕吐腰痛   //牙周袋形成
 
 var msg = {
@@ -39,14 +39,16 @@ post(config.pushInner,Object.assign({featureType: '1,4,5,6,7,22'},msg)).then((re
       tjzdFun(proWaring, 'warning')
       tjzdFun(proY)
       tjzdFun(proB)
-      yszdFun(proY)//疑似
-      knzdFun(proB)//可能
-      jtFun(proWaring)//警惕
+      
       slideToggle($(".conditionHintRecomDiagLis")) 
-      if(proY.length == 0){
-        $(".conditionHintMay").css("display","none")
+      $(".infoMsgParent .infoMsg").on("click",function(){
+        const infoMsgName = $(this).parent().attr('data-name')
+        openNewWin(`information.html?type=7&position=2&name=${infoMsgName}`)
+      })
+      if(proY.length == 0 && proB.length == 0 && proWaring.length == 0){
+        $(".conditionHintRecomDiagLis").css("display","none")
       }else{
-        $(".conditionHintMayNull").css("display","none")
+        $(".conditionHintRecomDiagLisNull").css("display","none")
       }
     }
     if(result.symptom && result.symptom.length > 0){//推荐问诊症状
@@ -74,7 +76,21 @@ post(config.pushInner,Object.assign({featureType: '1,4,5,6,7,22'},msg)).then((re
     }
   }
 })
-
+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') || ''
+}//推送相关信息
+$(".disclaimer").on("click",function() {
+  openNewWin("disclaimer.html")
+})
 post(config.pushTreatment,Object.assign({featureType: '8'},msg)).then((res)=>{
   var data = res.data
   if(data.code == 0){
@@ -83,11 +99,15 @@ post(config.pushTreatment,Object.assign({featureType: '8'},msg)).then((res)=>{
     if(result.commonTreatment && result.commonTreatment.content){
       ++num
       ybzlFun(result.commonTreatment.content)//一般治疗
+      
     }
     if(result.treatment && result.treatment.length>0){
       ++num
       cyywFun(result.treatment)//常用药物
     }
+    $(".conditionHintZhiliaoAp ").on('click',".slideDown",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}`)
+    })
     if(num == 0){
       $(".conditionHintZhiliaoNull").css("display","block")
     }
@@ -97,3 +117,4 @@ post(config.pushTreatment,Object.assign({featureType: '8'},msg)).then((res)=>{
   }
 })
 
+