推送和治疗方案接口修改

src/js/index.js

@@ -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.data.treat || {}
     let tipsResult = []
     if(tipsInfo.data) {
       if(tipsMode == '2') {

src/js/indexHorizontal.js

@@ -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.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

@@ -169,7 +169,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)

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")
@@ -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++){

webpack.config.js

@@ -4,7 +4,7 @@ const CleanWebpackPlugin = require('clean-webpack-plugin') // 清空打包目录
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
 const webpack = require('webpack');
-const proxyHost = "http://192.168.2.241:5050";
+const proxyHost = "http://192.168.2.236:5050";
 module.exports = {
   entry: {
     index: path.resolve(__dirname, 'src/js', 'index.js'),