Merge branch 'referMasterNew' into his/nhHospital

src/css/cdss.less

@@ -365,10 +365,10 @@ body{
     padding: 10px 40px;
 }
 .warningTitImg{
-    width: 24px;
+    width: 20px;
     position: absolute;
     left: -28px;
-    top: -3px;
+    top: -2px;
 }
 .warningTitle{
     position: relative;

src/js/cdss.js

@@ -27,6 +27,7 @@ let iconArrowUp = require('./../images/icon_arrow_up.png').replace(/^undefined/g
 let iconArrowDown = require('./../images/icon_arrow_down.png').replace(/^undefined/g, '')
 let iconMark = require('./../images/icon_mark.png').replace(/^undefined/g, '')
 let warnImg = require('./../images/icon_warning.png').replace(/^undefined/g, '')
+let warnImgWhite = require('./../images/icon_waring_white.png').replace(/^undefined/g, '')
 
 
 const $ = require("jquery");
@@ -54,7 +55,8 @@ let moduleConfig={
 let allInterface = 0
 let hasCompleteTnterface = 0
 let moduleNum = 0
-let mrId = getUrlArgObject('mrId') 
+let mrId = getUrlArgObject('mrId')
+let pushMrId = getUrlArgObject('pushMrId')
 const tipsMode = getUrlArgObject('tipsMode') || 1
 let planCode = getUrlArgObject('planCode') || 'all'
 let hospitalIdUrl = getUrlArgObject('hospitalId') || ''
@@ -109,7 +111,8 @@ function getPushInfo() {
   
 }
 function getPusgWarning(){
-  return  post(config.indicationPush,Object.assign({},msg,{ruleType: '1,2,3,4',hospitalId:hospitalIdUrl||msg.hospitalId}))
+    const indPush = pushMrId ? config.indicationPushCache : config.indicationPush;
+    return post(indPush, Object.assign({}, msg, {mrId: pushMrId || mrId}))
 }
 
 function getWriteStandardPush(){
@@ -461,7 +464,7 @@ function renderWarningDiag(list,name,number){
   if(list.length > 0 &&  $(".moduleItem.warning").length > 0){
     moduleNum++
     $('.moduleItem.warning').append()
-    let str = `<span class="warningTitle"><img class="warningTitImg" src=${warnImg}>警惕</span>`
+    let str = `<span class="warningTitle"><img class="warningTitImg" src=${warnImgWhite}>警惕</span>`
     for(let i = 0; i < list.length; i++){
       str+= renderPushItem(list[i],1)
     }
@@ -519,7 +522,6 @@ function rendergeneraTreatPush(list){
     $(".moduleItem.general").append(str)
     $(".moduleItem.general").css("display","block")
     let generaTreatHei = $(".moduleItem .generalTreatInfo")[0].scrollHeight
-    console.log(generaTreatHei,78787)
     if(generaTreatHei > 50){
       $(".moduleItem .generalTreatInfo").append(`<span class="showMoreGeneralTreat">更多<img class="iconArrowImg more" src="${iconArrowDown}"></span>`)
       $(".moduleItem .generalTreatInfo").append(`<span class="showLessGeneralTreat">收起<img class="iconArrowImg" src="${iconArrowUp}"></span>`)
@@ -610,15 +612,17 @@ function renderModuleWrapper(moduleList){
   let moduleStr = ''
   for(let i = 0; i < moduleList.length; i++){
     if(moduleList[i].status !='0'){
-     if(moduleList[i].code == 'tips'){
+     if(moduleList[i].code == 'critical'){
         moduleStr += `<div class="moduleItem warning"  data-num="${moduleList[i].number}" style="display:none"></div>`
-        moduleStr += `<div class="moduleItem tips"  data-num="${moduleList[i].number}" style="display:none"></div>`
+        // moduleStr += `<div class="moduleItem tips"  data-num="${moduleList[i].number}" style="display:none"></div>`
       }else{
         moduleStr += `<div class="moduleItem ${moduleList[i].code }"  data-num="${moduleList[i].number}" style="display:none"></div>`
       }
     }
    
   }
+  // console.log(moduleList,moduleStr)
+
   $(".recommendWrap").append(moduleStr)
 }
 

src/js/cdssHorizontal.js

@@ -37,7 +37,8 @@ let moduleConfig={
 let allInterface = 0
 let hasCompleteTnterface = 0
 let moduleNum = 0
-let mrId = getUrlArgObject('mrId') 
+let mrId = getUrlArgObject('mrId')
+let pushMrId = getUrlArgObject('pushMrId')
 const tipsMode = getUrlArgObject('tipsMode') || 1
 let planCode = getUrlArgObject('planCode') || 'all'
 let hospitalIdUrl = getUrlArgObject('hospitalId') || ''
@@ -57,7 +58,8 @@ function getPushInfo() {
   
 }
 function getPusgWarning(){
-  return  post(config.indicationPush,Object.assign({},msg,{ruleType: '1,2,3,4',hospitalId:hospitalIdUrl||msg.hospitalId}))
+    const indPush = pushMrId ? config.indicationPushCache : config.indicationPush;
+    return post(indPush, Object.assign({}, msg, {mrId: pushMrId || mrId}))
 }
 function getWriteStandardPush(){
   return  post(config.caseWritingPrompt,Object.assign({},msg,{hospitalId:2||msg.hospitalId}))
@@ -157,9 +159,9 @@ function renderModuleWrapper(moduleList){
     if(moduleList[i].status !='0'){
       if(moduleList[i].code == 'general' || moduleList[i].code == 'medicine' || moduleList[i].code == 'operation'){
         treatStr += `<div class="moduleItem ${moduleList[i].code }"  data-num="${moduleList[i].number}" style="display:none"><span class="moduleItemTitBox"></span></div>`
-      }else if(moduleList[i].code == 'tips'){
+      }else if(moduleList[i].code == 'critical'){
         moduleStr += `<div class="moduleItem warning"  data-num="${moduleList[i].number}" style="display:none"><span class="moduleItemTitBox"></span></div>`
-        moduleStr += `<div class="moduleItem tips"  data-num="${moduleList[i].number}" style="display:none"><span class="moduleItemTitBox"></span></div>`
+        // moduleStr += `<div class="moduleItem tips"  data-num="${moduleList[i].number}" style="display:none"><span class="moduleItemTitBox"></span></div>`
       }else{
         moduleStr += `<div class="moduleItem ${moduleList[i].code }"  data-num="${moduleList[i].number}" style="display:none"><span class="moduleItemTitBox"></span></div>`
       }

src/js/promise.js

@@ -2,7 +2,8 @@ const qs = require('qs');
 const $ = require("jquery");
 // var Promise = require('./rePromise');
 var Promise = require("bluebird");
-let iconWarning = require('./../images/icon_warning.png').replace(/^undefined/g, '')
+let iconWarning = require('./../images/icon_waring_white.png').replace(/^undefined/g, '')
+let iconWarning1 = require('./../images/icon_warning.png').replace(/^undefined/g, '')
 let iconSymptomPush = require('./../images/icon_symptom_push.png').replace(/^undefined/g, '')
 let iconLisPush = require('./../images/icon_lis_push.png').replace(/^undefined/g, '')
 let iconPacsPush = require('./../images/icon_pacs_push.png').replace(/^undefined/g, '')
@@ -50,6 +51,7 @@ window.console = window.console || (function () {
 const config = {
   pushInner: '/sys/push/push',
   indicationPush:'/sys/push/indicationPush',
+    indicationPushCache: '/sys/mr/getIndicationMr',
   calculate: '/api/data/calc/calculate',
   disclaimer: '/sys/disclaimerInfo/getDisclaimerInfo',
   information: '/graph/conceptInfo/getStaticKnowledge',
@@ -168,7 +170,7 @@ const throttle = function (fn, threshhold) {
 const titleConfig = {
   warning:{
     background: "#FFE8DD",
-    icon: iconWarning,
+    icon: iconWarning1,
     name:"智能警示"
   },
   symptomPush:{
@@ -225,7 +227,7 @@ const titleConfig = {
 const titleConfigH = {
   warning:{
     background: "#FFE8DD",
-    icon: iconWarning,
+    icon: iconWarning1,
     name:"智能警示",
     location:"left"
   },

src/js/staticSearch.js

@@ -112,7 +112,7 @@ function getKnowledgeData(value) {
     }
     $(".searchKnowledge .staticSearchB .searching").css("display","block")
     post(config.getStaticKnowledge,{
-        inputStr: value.replace(/\\/g,'\\\\').replace(/%/g,'\\%').replace(/\_/g,'\\_'),
+        inputStr: value.replace(/\\/g,'\\\\').replace(/%/g,'\\%').replace(/\_/g,'\\_').trim(),
         types:medicalTypes
         }).then((res) => {
             $(".searchKnowledge .staticSearchB .searching").css("display","none")
@@ -124,7 +124,7 @@ function getKnowledgeData(value) {
                 for(var i = 0;i<knowledgeLis.length;i++){
                     var tmpPart = knowledgeLis[i]
                     var tmpLi = `<li data-name='${tmpPart.name}' data-uname='${tmpPart.uniqueName}' data-type='${tmpPart.libTypeId}' data-sign='${tmpPart.type}'>
-                        <p>${tmpPart.name}<i>${tmpPart.typeName?('( '+tmpPart.typeName+' )'):''}</i></p>
+                        <p>${tmpPart.name}<i>${tmpPart.typeName?('( '+tmpPart.typeName+' )'):''}</i> <span>${tmpPart.code}</span></p>
                         ${tmpPart.retrievalName?('<span>• '+tmpPart.retrievalName+'</span>'):''}
                     </li>`
                     lisStr += tmpLi