Merge remote-tracking branch 'origin/testMerged'

src/js/illness.js

@@ -162,7 +162,7 @@ function bqtsFun(data){//病情提示
 
   $(".mayIllness .infoMsg").on("click",function(){
     const infoMsgName = $(this).parent().attr('data-name')
-    openNewWin(`information.html?type=22&position=2&name=${infoMsgName}`)
+    openNewWin(`information.html?type=22&position=2&name=${encodeURIComponent(infoMsgName)}`)
   })
   $(".illnessTable").on('click',function(){
     const msg1 = JSON.parse(JSON.stringify(msg))

src/js/index.js

@@ -21,7 +21,7 @@ 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',})
+      msg = Object.assign(data.data, {plan:getUrlArgObject('plan') || '0',})
       window.msg = msg
       window.pushMessage = {} 
       getPageInfo();
@@ -74,7 +74,7 @@ function getPushInfo() {
 }
 
 function getTreatment() {
-  return  post(config.pushTreatment,Object.assign({featureType: '8',ruleType:config.ruleTypeMap['8']},msg))
+  return  post(config.pushInner,Object.assign({featureType: '8',ruleType:config.ruleTypeMap['8']},msg))
 }
 
 function getTipsInfo() {
@@ -93,11 +93,11 @@ function getPageInfo() {
     // console.log({res1, res2, res3, res4})
     const configArr = res1&&res1.data&&res1.data.data || []
     const pushInfo = res2&&res2.data || {}
-    const treatInfo = res3&&res3.data || {}
+    const treatInfo = res3&&res3.data &&res3.data || {}
     const tipsInfo = res4&&res4.data || {}
     const {confArr, showLabsNum, showPacsNum, labsAndPacMode} = transConf(configArr)
     const pushResult = pushInfo.data || {};
-    const treatResult = treatInfo.data || {}
+    const treatResult = treatInfo&&treatInfo.data&&treatInfo.data.treat || {}
     let tipsResult = []
     if(tipsInfo.data) {
       if(tipsMode == '2') {

src/js/indexHorizontal.js

@@ -36,7 +36,7 @@ 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',})
+      msg = Object.assign(data.data, {plan:getUrlArgObject('plan') || '0',})
       window.msg = msg
       getPageInfo();
     }
@@ -69,7 +69,7 @@ function getPushInfo() {
 }
 
 function getTreatment() {
-  return post(config.pushTreatment,Object.assign({featureType: '8',ruleType:config.ruleTypeMap['8']},msg))
+  return post(config.pushInner,Object.assign({featureType: '8',ruleType:config.ruleTypeMap['8']},msg))
 }
 
 
@@ -91,7 +91,7 @@ function getPageInfo() {
     const {confArr, showLabsNum, showPacsNum, labsAndPacMode} = transConf(configArr)
     const tipsInfo = res4.data || {}
     const pushResult = pushInfo.data || {};
-    const treatResult = treatInfo.data || {}
+    const treatResult = treatInfo&&treatInfo.data&&treatInfo.data.treat || {}
     let tipsResult = []
     if(tipsInfo.data) {
       if(tipsMode == '2') {

src/js/indexHorizontalDom.js

@@ -139,7 +139,7 @@ function renderMultRecommendInfo(labsAndPacMode,icon, className,title,data, hasI
 function renderTreat(icon, className,title, data) {
     $('.infoTabBox').append(`<span class="infoTab treatTab boldFont"  data-box="${className}">${title}</span>`)
     const str = `<div class="informationBox recommendInfoWrapper ${className} clearfix">
-                    <p class="diagName boldFont">${msg.diseaseName?msg.diseaseName:''}</p>
+                    <p class="diagName boldFont">${msg.diseaseName.uniqueName?msg.diseaseName.uniqueName:''}</p>
                     <div class="recommendInfoBox clearfix ${className + 'box'}"></div>
                 </div>`
     $('.infomationBox').append(str)

src/js/indexVertDom.js

@@ -172,7 +172,7 @@ function renderTipsInfoMsg(className,item,data, parentNode) {
 
 function renderTreat(className,title, data) {
     const str = `<div class="recommendInfoWrapper ${className}">
-                    <h4><i></i>${title}${msg.diseaseName?'('+msg.diseaseName+')':''}</h4>
+                    <h4><i></i>${title}${msg.diseaseName?'('+msg.diseaseName.uniqueName+')':''}</h4>
                     <div class="recommendInfoBox clearfix ${className + 'box'}"></div>
                 </div>`
     $('.recommendWrap').append(str)
@@ -425,7 +425,7 @@ function renderRecommendConditTips(className,title,data) {
       }
       $('.mayIllness .infoMsg').on('click', function(){
         const infoMsgName = $(this).attr('data-name')
-        openNewWin(`information.html?type=22&position=2&name=${infoMsgName}`)
+        openNewWin(`information.html?type=22&position=2&name=${encodeURIComponent(infoMsgName)}`)
       })
       $('.alertModal .illnessTable').on('click', function(){
         const msg1 = JSON.parse(JSON.stringify(msg))

src/js/promise.js

@@ -37,7 +37,6 @@ const config = {
   information: '/api/data/conceptDetail/getConceptDetail',
   informationMore: '/api/data/conceptDetail/getConceptDetails',
   pushScale: '/api/data/push/pushScale',
-  pushTreatment: '/api/data/push/pushTreatment',
   getSysSetInfoDatas: '/api/data/sysSet/getSysSetInfoDatas',
   getMr: '/api/data/mr/getMr',
   getVersion: '/api/data/versionInfo/getVersionInfoAlls',

src/js/treatplan.js

@@ -32,10 +32,10 @@ if(is8Ie) {
 var msg = JSON.parse(getUrlArgObject('msg'))
 window.msg = msg
 window.pushMessage = {}
-post(config.pushTreatment,Object.assign({featureType: '8',ruleType:config.ruleTypeMap['8']},msg)).then((res)=>{
+post(config.pushInner,Object.assign({featureType: '8',ruleType:config.ruleTypeMap['8']},msg)).then((res)=>{
   var data = res.data
   if(data.code == 0){
-    var result = data.data;
+    var result = data.data.treat;
     var num = 0;
     if(result.commonTreatment && result.commonTreatment.content){
       $(".treatPlanNullWrap").css("display","none")
@@ -56,7 +56,7 @@ post(config.pushTreatment,Object.assign({featureType: '8',ruleType:config.ruleTy
 
 function ybzlFun(data){//一般治疗
   $(".conditionHintZhiliaoAp").prepend(`<div class="treatPlanWrap clearfix"><div class="treatPlan"><p class="treatPlanBg"></p><p class="treatPlanTitle"><img src=${generalImg} title="一般治疗" class="icon">一般治疗</p></div><div class="commonTreat clearfix">${data}</div></div>`)
-  $(".diseaseName").html(' ( '+msg.diseaseName+' )')
+  $(".diseaseName").html(' ( '+msg.diseaseName.uniqueName+' )')
 }
 function cyywFun(data){//常用药物
   for(let i = 0; i < data.length; i++) {
@@ -94,7 +94,6 @@ function cyywFun(data){//常用药物
  
   $(".infoMsg").on("click",function(){
     const infoMsgName = $(this).parent().attr('data-name')
-    console.log('infoMsgName',  $(this).parent())
     openNewWin(`information.html?type=8&position=5&name=${encodeURIComponent(infoMsgName)}`)
   })
   // for(var i = 0;i < data.length;i++){