警示1拆4，护理

src/css/cdssHorizontal.less

@@ -291,7 +291,8 @@
     position: relative;
     top: -5px;
 }
-.medicine .titleIcon, .operation .titleIcon, .general .titleIcon{
+
+.medicine .titleIcon, .operation .titleIcon, .general .titleIcon, .nurse .titleIcon {
     width: 13px;
     position: relative;
     top: 2px;

src/js/cdss.js

@@ -48,7 +48,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') || ''
@@ -97,7 +98,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(){
@@ -312,7 +314,7 @@ function isNeedwriteStandardPush(list){
   return false
 }
 function isNeedPushWarning(list){
-  let pushCode = ["tips"]
+    let pushCode = ["crivalue", "rationali", "highrisk", "otherremind"]
   for(let i = 0; i < list.length; i++){
     if(pushCode.indexOf(list[i].code)>-1){
       if(list[i].status == "1"){
@@ -334,7 +336,7 @@ function renderPushWarning(){
       let noteList = result.noteList || []  //检查内容注意事项
       let dubugStr = result.dubugStr || []  //注意调试信息
       let otherList = result.otherList || []  //其他提醒
-      $('.moduleItem.tips').append(titleStr('warning'))
+        $('.moduleItem.crivalue').append(titleStr('warning'))
       renderBillingPush(billMsgList,'开单合理性提醒')
       renderBillingPush(highRiskList,'高风险提示')
       renderBillingPush(criticalValList,'危急值提醒')
@@ -412,8 +414,8 @@ function renderBillingPush(list,name){
         ${titleStr}
         ${str}
       </div>`
-  $(".tips").append(boxStr)
-  $('.moduleItem.tips').css("display","block")
+    $(".crivalue").append(boxStr)
+    $('.moduleItem.crivalue').css("display", "block")
 }
 
 
@@ -563,7 +565,7 @@ function renderOperationPush(list,showNum,type,hasInfo){
 
 
 function renderItemWrapper(list, showNum, type, hasInfo) {
-    console.log(33, type)
+    //console.log(33, type)
   let showNum1 = showNum || 5
   let shortStr = '', longStr = ''
 

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') || ''
@@ -61,7 +62,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}))
@@ -159,7 +161,7 @@ function renderModuleWrapper(moduleList){
   let moduleStr = '',treatStr=""
   for(let i = 0; i < moduleList.length; i++){
     if(moduleList[i].status !='0'){
-      if(moduleList[i].code == 'general' || moduleList[i].code == 'medicine' || moduleList[i].code == 'operation'){
+        if (moduleList[i].code == 'general' || moduleList[i].code == 'medicine' || moduleList[i].code == 'operation' || moduleList[i].code == 'nurse') {
         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 == 'critical'){
         moduleStr += `<div class="moduleItem warning"  data-num="${moduleList[i].number}" style="display:none"><span class="moduleItemTitBox"></span></div>`
@@ -283,9 +285,8 @@ function renderPushData(){
       renderCheckup(checkupPush,checkupNum,null,true)
       renderSymptomPush(symptomPush,symptomNum,null,true)
       renderDiag(diagPush)
-        renderNurse(nursePush, nurseNum, 9, true)
 
-      if(medicinesPush.length > 0 || operationsPush.length > 0||generaTreatPush){
+        if (medicinesPush.length > 0 || operationsPush.length > 0 || generaTreatPush || nursePush) {
         let str = `<img class="treatIcon" src = ${titleConfigH["treat"].icon} /><span>${titleConfigH["treat"].name}</span>`
         $(".rightBoxTitle").append(str)
         renderDisName()
@@ -304,10 +305,11 @@ function renderPushData(){
           width: "100%"
         })
       }
-    
+
       rendergeneraTreatPush(generaTreatPush)
       renderMedicinesPush(medicinesPush,medicinesNum,2,true)
       renderOperationPush(operationsPush,operationsNum,6,true)
+        renderNurse(nursePush, nurseNum, 9, true)
       // if(hasCompleteTnterface === allInterface){
       //   $('.loading').css("display","none")
       //   if(moduleNum === 0){ 
@@ -347,9 +349,9 @@ function renderNurse(list, showNum, type, hasInfo) {
         moduleNum++
         $('.moduleItem.nurse .moduleItemTitBox').append(titleStr("nursePush"))
         let {shortStr, longStr} = renderItemWrapper(list, showNum, type, hasInfo)
-        $('.moduleItem.nurse').append(shortStr)
-        $('.moduleItem.nurse').append(renderLongStr(titleConfigH["nursePush"].name, longStr, titleConfigH["nursePush"].location))
-        $('.moduleItem.nurse').css("display", "block")
+        $(".moduleItem.nurse").append(shortStr)
+        $(".moduleItem.nurse").append(renderLongStr(titleConfigH["nursePush"].name, longStr, titleConfigH["nursePush"].location))
+        $(".moduleItem.nurse").css("display", "block")
     }
 }
 function renderPacs(list,showNum,type,hasInfo){

src/js/promise.js

@@ -8,6 +8,8 @@ let iconSymptomPush = require('./../images/icon_symptom_push.png').replace(/^und
 let iconLisPush = require('./../images/icon_lis_push.png').replace(/^undefined/g, '')
 let iconPacsPush = require('./../images/icon_pacs_push.png').replace(/^undefined/g, '')
 let iconScalePush = require('./../images/icon_scale_push.png').replace(/^undefined/g, '')
+let iconNursePush = require('./../images/icon_nurse_push.png').replace(/^undefined/g, '')
+
 let iconOperationPush = require('./../images/icon_operation_push.png').replace(/^undefined/g, '')
 let iconDrugPush = require('./../images/icon_drug_push.png').replace(/^undefined/g, '')
 let iconDiagPush = require('./../images/icon_diag_push.png').replace(/^undefined/g, '')
@@ -51,6 +53,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: '/kl/conceptInfo/getStaticKnowledge',
@@ -210,7 +213,7 @@ const titleConfig = {
   },
     nursePush: {
         background: "#EEF5FD",
-        icon: iconTreat,
+        icon: iconNursePush,
         name: "推荐护理"
     },
   operationPush:{