Merge branch 'CDSS6.0' into CDSS6.0.0

src/css/cdss.less

@@ -24,12 +24,13 @@ body{
     text-align: center;
     font-size: 12px;
     color: #979797;
-    padding-top: 15px;
+    padding-bottom: 5px;
     position: fixed;
     left: 0;
     width: 100%;
-    bottom: 28px;
+    bottom: 23px;
     background-color: #fff;
+    z-index: 1;
 }
 .disclaimer {
     height: 24px;

src/css/followUpV.less

@@ -0,0 +1,11 @@
+.operaNameBox{
+    background: #EFF1F6;
+    line-height: 22px;
+    padding: 0px 14px;
+    font-size: 12px;
+    color: #777777;
+}
+.operaNameBold{
+    color: #1e1e1e;
+    font-weight: 600;
+}

src/js/cdss.js

@@ -9,6 +9,7 @@ if(!Promise){
 require('./../css/reset.css');
 require('./../css/cdss.less');
 require('./../css/popup.css');
+require('./../css/followUpV.less');
 require('./../css/staticSearch.css')
 require('./../js/staticSearch.js')
 require('./../images/empty.png').replace(/^undefined/g, '')
@@ -30,6 +31,8 @@ let warnImg = require('./../images/icon_warning.png').replace(/^undefined/g, '')
 
 const $ = require("jquery");
 const { post,config,getUrlArgObject,openNewWin,titleConfig } = require('./promise.js');
+const { renderFollowUp } = require('./followUp.js');
+
 const { transConf } = require('./util.js');
 
 
@@ -45,7 +48,8 @@ const { transConf } = require('./util.js');
 let moduleConfig={
   auxiliary:"recommendWrap",
   qc:"qcWrap",
-  medical:"medicalKonwledgeWrap"
+  medical:"medicalKonwledgeWrap",
+  followup:"followUpWrap"
 }
 let allInterface = 0
 let hasCompleteTnterface = 0
@@ -210,9 +214,10 @@ function renderPage(pageSet){
   renderTab(pageSet.sysSetInfo)
   const iframeHei = $(".bodyWrap").height()
   const tabHei = $(".tabList").height()
-  $(".contentWrapper").css("height",iframeHei-tabHei-20-30+3+'px')
+  $(".contentWrapper").css("height",iframeHei-tabHei-20-30+3+19+'px')
   const hasAuxiliary = hasTab("辅助信息",pageSet.sysSetInfo)
   const hasMedical = hasTab("医学知识",pageSet.sysSetInfo)
+  const hasFollowUp = hasTab("随访计划",pageSet.sysSetInfo)
   if(!mrId){
     empty()
     return
@@ -235,6 +240,9 @@ function renderPage(pageSet){
       allInterface++
     }
   }
+  if(hasFollowUp){
+    renderFollowUp(msg)
+  }
 }
 
 function renderPushData(){
@@ -509,7 +517,6 @@ function rendergeneraTreatPush(list){
     $(".moduleItem.general").append(str)
     $(".moduleItem.general").css("display","block")
     let generaTreatHei = $(".moduleItem .generalTreatInfo")[0].scrollHeight
-    console.log("generaTreatHei",generaTreatHei)
     if(generaTreatHei > 65){
       $(".moduleItem .generalTreatInfo").append(`<span class="showMoreGeneralTreat">更多<img class="iconArrowImg" src="${iconArrowDown}"></span>`)
       $(".moduleItem .generalTreatInfo").append(`<span class="showLessGeneralTreat">收起<img class="iconArrowImg" src="${iconArrowUp}"></span>`)
@@ -730,7 +737,6 @@ $(function(){
             }else{  
                 _this.onmousewheel = function(e){   
                     e = e || window.event;    
-                    console.log( _this.scrollTop,e.wheelDelta)
                     _this.scrollTop += e.wheelDelta > 0 ? -60 : 60;     
                     return false;  
                 };  

src/js/followUp.js

@@ -0,0 +1,52 @@
+var $ = require("jquery");
+var { post,config,getUrlArgObject,openNewWin,isIe8 } = require('./promise.js');
+
+function getFollowUp(msg){
+    return post(config.followUp, msg)
+}
+function renderFollowUp(msg){
+    getFollowUp(msg).then(res =>{
+        if(res.data.code === "0"){
+            const result = res.data.data&&res.data.data.pushPlans || []
+            renderPage(result)
+          
+        }
+    })
+}
+function renderPage(data){
+    const operaItem = data[0] || {}
+    const operaItemName = operaItem.item || {}
+    const operaItemDetail = operaItem.pushPlanDetails || []
+    renderName(operaItemName) 
+    renderBtn(operaItemDetail)
+    renderDetail(operaItemDetail)
+   
+}
+function renderName(data){
+      const operationTime = data.dateValue&&getTime(data.dateValue)
+      const  operationName = data.name || ""
+      const str = `<div class="operaNameWrap"><div class="operaNameBox">患者于${operationTime}进行${operationName}。根据临床路径要求，特制订检验检查计划如下。</div></div>`
+      $(".followUpWrap").append(str)
+}
+function renderDetail(data){
+    const hasBtn = data[0]&&data[0].history&&data[0].history !== 0
+    if(!hasBtn){
+        return
+    }
+    const str = `<div class="btnBox"><span></span></div>`
+}
+function renderBtn(data){
+
+}
+function getTime(date){
+    if(!date){
+        return ``
+    }
+    const year = new Date(date).getFullYear()
+    const month = new Date(date).getMonth()+1
+    const day = new Date(date).getDate()
+    return `${year}年${month}月${day}日`
+}
+module.exports ={
+    renderFollowUp
+}

src/js/promise.js

@@ -66,6 +66,7 @@ const config = {
   analyse:'/api/data/mrqc/analyse',
   getHosptDeptUsal:'/api/data/concept/getHosptDeptUsal', //获取科室常用标签
   caseWritingPrompt:'/sys/mrqc/caseWritingPrompt',//病历书写规范提示
+  followUp:'/sys/push/pushPlan', //随访计划
   ruleTypeMap:{     //大数据推送参数featureType对应
     '22':'1,2',
     '11':'3',

src/js/staticSearch.js

@@ -147,7 +147,7 @@ function adjustHeight() {
     var ht = window.innerHeight;
     var containerHt = $(".medicalKonwledgeWrap .container").height()
     var ht2 = $(".searchTypeBox").outerHeight(true)
-    $(".staticSearchB ul").height(ht - 120-10-40 - ht2 + "px");
+    $(".staticSearchB ul").height(ht - 120-10-40 +20- ht2 + "px");
 }
 $(window).on('resize', function(){
     adjustHeight()