Revert "患者信息从接口获取"

This reverts commit 57064bae7d7b30d2d75c19e0a950f00a669b5982.

src/js/index.js

@@ -9,20 +9,7 @@ const { post,config,getUrlArgObject,openNewWin } = require('./promise.js');
 const { transConf } = require('./util.js');
 const { renderRecommendInfo, renderMultRecommendInfo, renderTreat, renderRecommendConditTips } = require('./indexVertDom.js');
 
-let mrId = getUrlArgObject('mrId') 
-let msg;
-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',})
-      window.msg = msg
-      window.pushMessage = {} 
-      getPageInfo();
-    }
-  })
-} else {
-  msg = {
+var msg = {
     age: getUrlArgObject('age'),
     sex: getUrlArgObject('sex') == '男'?1:(getUrlArgObject('sex') == '女'?2:(getUrlArgObject('sex') == '通用'?3:getUrlArgObject('sex'))),
     symptom: getUrlArgObject('symptomJson'),
@@ -34,29 +21,10 @@ if(mrId) {
     other: getUrlArgObject('otherJson') + getUrlArgObject('pastJson'),
     hosCode:getUrlArgObject('hospitalCode') || '',
     plan:getUrlArgObject('plan') || '0',
-  }
-  window.msg = msg
-  window.pushMessage = {} 
-  getPageInfo();
-}
-
-
-// var msg = {
-//     age: getUrlArgObject('age'),
-//     sex: getUrlArgObject('sex') == '男'?1:(getUrlArgObject('sex') == '女'?2:(getUrlArgObject('sex') == '通用'?3:getUrlArgObject('sex'))),
-//     symptom: getUrlArgObject('symptomJson'),
-//     vital: getUrlArgObject('vitalJson'),
-//     lis: getUrlArgObject('lisJson')? JSON.parse(getUrlArgObject('lisJson')) : [],
-//     pacs: getUrlArgObject('pacsJson'),
-//     diag: getUrlArgObject('diagJson'),
-//     diseaseName: getUrlArgObject('diagJson'),
-//     other: getUrlArgObject('otherJson') + getUrlArgObject('pastJson'),
-//     hosCode:getUrlArgObject('hospitalCode') || '',
-//     plan:getUrlArgObject('plan') || '0',
-// }//推送相关信息
-// //   http://localhost:8082/indexVert.html?age=28&diseaseId=280&lisJson=&diagJson=%E6%80%A5%E6%80%A7%E8%83%B0%E8%85%BA%E7%82%8E&pastJson=%E6%97%A0%E5%BF%83%E8%84%8F%E7%97%85&otherJson=%E6%97%A0%E9%AB%98%E8%A1%80%E5%8E%8B&pacsJson=%E8%85%B9%E9%83%A8B%E8%B6%85:%E6%97%A0%E5%BC%82%E5%B8%B8,%20%E6%8A%A5%E5%91%8A%E6%97%A5%E6%9C%9F:2019-05-07&sex=%E7%94%B7&symptomJson=%E6%81%B6%E5%BF%83%E5%91%95%E5%90%90%E8%85%B0%E7%97%9B&vitalJson=%E8%A1%80%E5%8E%8B%E5%B7%A6%E4%B8%8A%E8%82%A213/12mmHg
-// window.msg = msg
-// window.pushMessage = {}
+}//推送相关信息
+//   http://localhost:8082/indexVert.html?age=28&diseaseId=280&lisJson=&diagJson=%E6%80%A5%E6%80%A7%E8%83%B0%E8%85%BA%E7%82%8E&pastJson=%E6%97%A0%E5%BF%83%E8%84%8F%E7%97%85&otherJson=%E6%97%A0%E9%AB%98%E8%A1%80%E5%8E%8B&pacsJson=%E8%85%B9%E9%83%A8B%E8%B6%85:%E6%97%A0%E5%BC%82%E5%B8%B8,%20%E6%8A%A5%E5%91%8A%E6%97%A5%E6%9C%9F:2019-05-07&sex=%E7%94%B7&symptomJson=%E6%81%B6%E5%BF%83%E5%91%95%E5%90%90%E8%85%B0%E7%97%9B&vitalJson=%E8%A1%80%E5%8E%8B%E5%B7%A6%E4%B8%8A%E8%82%A213/12mmHg
+window.msg = msg
+window.pushMessage = {}
 function getConf() {
   return post(config.getSysSetInfoDatas,{hospitalCode: msg.hosCode,plan:msg.plan}).then((res)=>{
         const data = res.data
@@ -163,85 +131,79 @@ function getTreatment() {
 // getConf()
 // pushInfo()
 // getTreatment();
-function getPageInfo() {
-
-  Promise.all([getConf(),getPushInfo(),getTreatment()]).then(([res1, res2, res3]) =>{
-    if(pushInfo.code == 0) {
-      pushResult = pushInfo.data;
-    } else {
-      pushResult = {};
-    }
-    if(treatInfo.code == 0) {
-      treatResult = treatInfo.data
-    } else {
-      treatResult = {}
-    }
-    const diagPossible =  pushResult.dis&&pushResult.dis['可能诊断'] || []//可能
-    const diagDoubt = pushResult.dis&&pushResult.dis['疑似诊断'] || [] // 疑似
-    const diagDeter = pushResult.dis&&pushResult.dis['确诊'] || []//确诊
-    const diagWaring = pushResult.dis&&pushResult.dis['警惕'] || [] // 推荐警惕诊断
-    const symptomRecommend = pushResult.symptom || []  //推荐问诊症状
-    const physiExamRecommend  = pushResult.vital || [] //推荐体格检查
-    const diagRecommend = diagPossible.concat(diagDoubt, diagDeter) //推荐诊断
-    const labRecommend = pushResult.lab || []
-    const pacsRecommend = pushResult.pacs || []
-    const medicalIndications = pushResult.medicalIndications || []
-    const labAndPacsRecommend = [
-      {
-          title: '化验',
-          className: 'labRecommend',
-          data:  labRecommend
-      },
-      {
-          title: '辅检',
-          className: 'pacsRecommend',
-          data:  pacsRecommend
-      }
-    ]
-    window.pushMessage = medicalIndications;//计算的需要的相关数据
-    for(let i = 0; i < confArr.length; i++) {
-  
-      switch(confArr[i].code) {
-        case "inquiry_show":  //问诊症状
-          renderRecommendInfo('symptomRecommend', '问诊症状', symptomRecommend, false)
-          break; 
-        case "health_show": //体格检查
-          renderRecommendInfo('physiExamRecommend', '体格检查', physiExamRecommend, false)
-          break;
-        case "illness_show": //病情提示
-          renderRecommendConditTips('conditTips','病情提示', medicalIndications || [])
-          break;
-        case "vigilant_show": //警惕诊断
-          renderRecommendInfo('warning', '警惕诊断', diagWaring, true,7,2)
-          break;
-        case "lispacs_show": //检验检查
-          renderMultRecommendInfo('labAndPacsRecommend', '检验检查', labAndPacsRecommend, false)
-          break;
-        case "cure_show": //治疗方案
-          renderTreat('treatRecommend','治疗方案',treatResult)
-          break;
-        case "diagnose_show": //推荐诊断
-          renderRecommendInfo('diagRecommend', '推荐诊断', diagRecommend, true,7,2)
-          break;
-        default:
-           return
-      } 
+Promise.all([getConf(),getPushInfo(),getTreatment()]).then(([res1, res2, res3]) =>{
+  if(pushInfo.code == 0) {
+    pushResult = pushInfo.data;
+  } else {
+    pushResult = {};
+  }
+  if(treatInfo.code == 0) {
+    treatResult = treatInfo.data
+  } else {
+    treatResult = {}
+  }
+  const diagPossible =  pushResult.dis&&pushResult.dis['可能诊断'] || []//可能
+  const diagDoubt = pushResult.dis&&pushResult.dis['疑似诊断'] || [] // 疑似
+  const diagDeter = pushResult.dis&&pushResult.dis['确诊'] || []//确诊
+  const diagWaring = pushResult.dis&&pushResult.dis['警惕'] || [] // 推荐警惕诊断
+  const symptomRecommend = pushResult.symptom || []  //推荐问诊症状
+  const physiExamRecommend  = pushResult.vital || [] //推荐体格检查
+  const diagRecommend = diagPossible.concat(diagDoubt, diagDeter) //推荐诊断
+  const labRecommend = pushResult.lab || []
+  const pacsRecommend = pushResult.pacs || []
+  const medicalIndications = pushResult.medicalIndications || []
+  const labAndPacsRecommend = [
+    {
+        title: '化验',
+        className: 'labRecommend',
+        data:  labRecommend
+    },
+    {
+        title: '辅检',
+        className: 'pacsRecommend',
+        data:  pacsRecommend
     }
-  
-    // renderRecommendInfo('warning', '警惕诊断', diagWaring, true,7,2)
-    // renderRecommendInfo('diagRecommend', '推荐诊断', diagRecommend, true,7,2)
-    // renderRecommendInfo('symptomRecommend', '问诊症状', symptomRecommend, false)
-    // renderRecommendInfo('physiExamRecommend', '体格检查', physiExamRecommend, false)
-    // renderMultRecommendInfo('labAndPacsRecommend', '检验检查', labAndPacsRecommend, false)
-    // renderTreat('treatRecommend','治疗方案',treatResult) 
-    
-    // renderRecommendConditTips('conditTips','病情提示', medicalIndications || [])
-    
-  })
-
+  ]
+  window.pushMessage = medicalIndications;//计算的需要的相关数据
+  for(let i = 0; i < confArr.length; i++) {
 
-}
+    switch(confArr[i].code) {
+      case "inquiry_show":  //问诊症状
+        renderRecommendInfo('symptomRecommend', '问诊症状', symptomRecommend, false)
+        break; 
+      case "health_show": //体格检查
+        renderRecommendInfo('physiExamRecommend', '体格检查', physiExamRecommend, false)
+        break;
+      case "illness_show": //病情提示
+        renderRecommendConditTips('conditTips','病情提示', medicalIndications || [])
+        break;
+      case "vigilant_show": //警惕诊断
+        renderRecommendInfo('warning', '警惕诊断', diagWaring, true,7,2)
+        break;
+      case "lispacs_show": //检验检查
+        renderMultRecommendInfo('labAndPacsRecommend', '检验检查', labAndPacsRecommend, false)
+        break;
+      case "cure_show": //治疗方案
+        renderTreat('treatRecommend','治疗方案',treatResult)
+        break;
+      case "diagnose_show": //推荐诊断
+        renderRecommendInfo('diagRecommend', '推荐诊断', diagRecommend, true,7,2)
+        break;
+      default:
+         return
+    } 
+  }
 
+  // renderRecommendInfo('warning', '警惕诊断', diagWaring, true,7,2)
+  // renderRecommendInfo('diagRecommend', '推荐诊断', diagRecommend, true,7,2)
+  // renderRecommendInfo('symptomRecommend', '问诊症状', symptomRecommend, false)
+  // renderRecommendInfo('physiExamRecommend', '体格检查', physiExamRecommend, false)
+  // renderMultRecommendInfo('labAndPacsRecommend', '检验检查', labAndPacsRecommend, false)
+  // renderTreat('treatRecommend','治疗方案',treatResult) 
+  
+  // renderRecommendConditTips('conditTips','病情提示', medicalIndications || [])
+  
+})
 
 
 $(".disclaimerInfo").on("click", function(){

src/js/indexHorizontal.js

@@ -29,20 +29,7 @@ if(is8Ie) {
   treatImg = treatImg.replace(reg, '')
 }
 
-let mrId = getUrlArgObject('mrId') 
-let msg;
-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',})
-      window.msg = msg
-      window.pushMessage = {} 
-      getPageInfo();
-    }
-  })
-} else {
-  msg = {
+var msg = {
     age: getUrlArgObject('age'),
     sex: getUrlArgObject('sex') == '男'?1:(getUrlArgObject('sex') == '女'?2:(getUrlArgObject('sex') == '通用'?3:getUrlArgObject('sex'))),
     symptom: getUrlArgObject('symptomJson'),
@@ -54,28 +41,10 @@ if(mrId) {
     other: getUrlArgObject('otherJson') + getUrlArgObject('pastJson'),
     hosCode:getUrlArgObject('hospitalCode') || '',
     plan:getUrlArgObject('plan') || '0',
-  }
-  window.msg = msg
-  window.pushMessage = {} 
-  getPageInfo();
-}
-
-// var msg = {
-//     age: getUrlArgObject('age'),
-//     sex: getUrlArgObject('sex') == '男'?1:(getUrlArgObject('sex') == '女'?2:(getUrlArgObject('sex') == '通用'?3:getUrlArgObject('sex'))),
-//     symptom: getUrlArgObject('symptomJson'),
-//     vital: getUrlArgObject('vitalJson'),
-//     lis: getUrlArgObject('lisJson')? JSON.parse(getUrlArgObject('lisJson')) : [],
-//     pacs: getUrlArgObject('pacsJson'),
-//     diag: getUrlArgObject('diagJson'),
-//     diseaseName: getUrlArgObject('diagJson'),
-//     other: getUrlArgObject('otherJson') + getUrlArgObject('pastJson'),
-//     hosCode:getUrlArgObject('hospitalCode') || '',
-//     plan:getUrlArgObject('plan') || '0',
-// }//推送相关信息
-// //   http://localhost:8082/indexVert.html?age=28&diseaseId=280&lisJson=&diagJson=%E6%80%A5%E6%80%A7%E8%83%B0%E8%85%BA%E7%82%8E&pastJson=%E6%97%A0%E5%BF%83%E8%84%8F%E7%97%85&otherJson=%E6%97%A0%E9%AB%98%E8%A1%80%E5%8E%8B&pacsJson=%E8%85%B9%E9%83%A8B%E8%B6%85:%E6%97%A0%E5%BC%82%E5%B8%B8,%20%E6%8A%A5%E5%91%8A%E6%97%A5%E6%9C%9F:2019-05-07&sex=%E7%94%B7&symptomJson=%E6%81%B6%E5%BF%83%E5%91%95%E5%90%90%E8%85%B0%E7%97%9B&vitalJson=%E8%A1%80%E5%8E%8B%E5%B7%A6%E4%B8%8A%E8%82%A213/12mmHg
-// window.msg = msg
-// window.pushMessage = {}
+}//推送相关信息
+//   http://localhost:8082/indexVert.html?age=28&diseaseId=280&lisJson=&diagJson=%E6%80%A5%E6%80%A7%E8%83%B0%E8%85%BA%E7%82%8E&pastJson=%E6%97%A0%E5%BF%83%E8%84%8F%E7%97%85&otherJson=%E6%97%A0%E9%AB%98%E8%A1%80%E5%8E%8B&pacsJson=%E8%85%B9%E9%83%A8B%E8%B6%85:%E6%97%A0%E5%BC%82%E5%B8%B8,%20%E6%8A%A5%E5%91%8A%E6%97%A5%E6%9C%9F:2019-05-07&sex=%E7%94%B7&symptomJson=%E6%81%B6%E5%BF%83%E5%91%95%E5%90%90%E8%85%B0%E7%97%9B&vitalJson=%E8%A1%80%E5%8E%8B%E5%B7%A6%E4%B8%8A%E8%82%A213/12mmHg
+window.msg = msg
+window.pushMessage = {}
 function getConf() {
   return post(config.getSysSetInfoDatas,{hospitalCode: msg.hosCode,plan:msg.plan}).then((res)=>{
       const data = res.data
@@ -182,89 +151,82 @@ function getTreatment() {
 // getConf();
 // pushInfo();
 // getTreatment();
-
-function getPageInfo() {
-
-
-  Promise.all([getConf(),getPushInfo(),getTreatment()]).then(([res1, res2, res3]) =>{
-    if(pushInfo.code == 0) {
-      pushResult = pushInfo.data;
-    } else {
-      pushResult = {};
-    }
-    if(treatInfo.code == 0) {
-      treatResult = treatInfo.data
-    } else {
-      treatResult = {}
+Promise.all([getConf(),getPushInfo(),getTreatment()]).then(([res1, res2, res3]) =>{
+  if(pushInfo.code == 0) {
+    pushResult = pushInfo.data;
+  } else {
+    pushResult = {};
+  }
+  if(treatInfo.code == 0) {
+    treatResult = treatInfo.data
+  } else {
+    treatResult = {}
+  }
+  const diagPossible =  pushResult.dis&&pushResult.dis['可能诊断'] || []//可能
+  const diagDoubt = pushResult.dis&&pushResult.dis['疑似诊断'] || [] // 疑似
+  const diagDeter = pushResult.dis&&pushResult.dis['确诊'] || []//确诊
+  const diagWaring = pushResult.dis&&pushResult.dis['警惕'] || [] // 推荐警惕诊断
+  const symptomRecommend = pushResult.symptom || []  //推荐问诊症状
+  const physiExamRecommend  = pushResult.vital || [] //推荐体格检查
+  const diagRecommend = diagPossible.concat(diagDoubt, diagDeter) //推荐诊断
+  const labRecommend = pushResult.lab || []
+  const pacsRecommend = pushResult.pacs || []
+  const medicalIndications = pushResult.medicalIndications || []
+  const labAndPacsRecommend = [
+    {
+        title: '化验',
+        className: 'labRecommend',
+        data:  labRecommend
+    },
+    {
+        title: '辅检',
+        className: 'pacsRecommend',
+        data:  pacsRecommend
     }
-    const diagPossible =  pushResult.dis&&pushResult.dis['可能诊断'] || []//可能
-    const diagDoubt = pushResult.dis&&pushResult.dis['疑似诊断'] || [] // 疑似
-    const diagDeter = pushResult.dis&&pushResult.dis['确诊'] || []//确诊
-    const diagWaring = pushResult.dis&&pushResult.dis['警惕'] || [] // 推荐警惕诊断
-    const symptomRecommend = pushResult.symptom || []  //推荐问诊症状
-    const physiExamRecommend  = pushResult.vital || [] //推荐体格检查
-    const diagRecommend = diagPossible.concat(diagDoubt, diagDeter) //推荐诊断
-    const labRecommend = pushResult.lab || []
-    const pacsRecommend = pushResult.pacs || []
-    const medicalIndications = pushResult.medicalIndications || []
-    const labAndPacsRecommend = [
-      {
-          title: '化验',
-          className: 'labRecommend',
-          data:  labRecommend
-      },
-      {
-          title: '辅检',
-          className: 'pacsRecommend',
-          data:  pacsRecommend
-      }
-    ]
-    window.pushMessage = medicalIndications;//计算的需要的相关数据
-    for(let i = 0; i < confArr.length; i++) {
+  ]
+  window.pushMessage = medicalIndications;//计算的需要的相关数据
+  for(let i = 0; i < confArr.length; i++) {
+
+    switch(confArr[i].code) {
+      case "inquiry_show":  //问诊症状
+        renderRecommendInfo(symptomImg, 'symptomRecommend', '问诊症状', symptomRecommend, false)
+        break; 
+      case "health_show": //体格检查
+        renderRecommendInfo(physiExamImg, 'physiExamRecommend', '体格检查', physiExamRecommend, false)
+        break;
+      case "illness_show": //病情提示
+        renderRecommendConditTips(conditTipsImg, 'conditTips','病情提示', medicalIndications || [])
+        break;
+      case "vigilant_show": //警惕诊断
+        renderRecommendInfo(warningImg, 'warning', '警惕诊断', diagWaring, true,7,2)
+        break;
+      case "lispacs_show": //检验检查
+        renderMultRecommendInfo(labAndPacsImg, 'labAndPacsRecommend', '检验检查', labAndPacsRecommend, false)
+        break;
+      case "cure_show": //治疗方案
+        renderTreat(treatImg, 'treatRecommend','治疗方案',treatResult)
+        break;
+      case "diagnose_show": //推荐诊断
+        renderRecommendInfo(diagImg, 'diagRecommend', '推荐诊断', diagRecommend, true,7,2)
+        break;
+      default:
+         return
+    } 
+  }
+  const pushHei = $('.push').height()
+  if(pushHei == 0) {
+    $('.treat').css({"width":"90%"})
+  }
+  // renderRecommendInfo(warningImg, 'warning', '警惕诊断', diagWaring, true,7,2)
+  // renderRecommendInfo(diagImg, 'diagRecommend', '推荐诊断', diagRecommend, true,7,2)
+  // renderRecommendInfo(symptomImg, 'symptomRecommend', '问诊症状', symptomRecommend, false)
+  // renderRecommendInfo(physiExamImg, 'physiExamRecommend', '体格检查', physiExamRecommend, false)
+  // renderMultRecommendInfo('labAndPacsRecommend', '检验检查', labAndPacsRecommend, false)
+  // renderTreat(treatImg, 'treatRecommend','治疗方案',treatResult) 
   
-      switch(confArr[i].code) {
-        case "inquiry_show":  //问诊症状
-          renderRecommendInfo(symptomImg, 'symptomRecommend', '问诊症状', symptomRecommend, false)
-          break; 
-        case "health_show": //体格检查
-          renderRecommendInfo(physiExamImg, 'physiExamRecommend', '体格检查', physiExamRecommend, false)
-          break;
-        case "illness_show": //病情提示
-          renderRecommendConditTips(conditTipsImg, 'conditTips','病情提示', medicalIndications || [])
-          break;
-        case "vigilant_show": //警惕诊断
-          renderRecommendInfo(warningImg, 'warning', '警惕诊断', diagWaring, true,7,2)
-          break;
-        case "lispacs_show": //检验检查
-          renderMultRecommendInfo(labAndPacsImg, 'labAndPacsRecommend', '检验检查', labAndPacsRecommend, false)
-          break;
-        case "cure_show": //治疗方案
-          renderTreat(treatImg, 'treatRecommend','治疗方案',treatResult)
-          break;
-        case "diagnose_show": //推荐诊断
-          renderRecommendInfo(diagImg, 'diagRecommend', '推荐诊断', diagRecommend, true,7,2)
-          break;
-        default:
-           return
-      } 
-    }
-    const pushHei = $('.push').height()
-    if(pushHei == 0) {
-      $('.treat').css({"width":"90%"})
-    }
-    // renderRecommendInfo(warningImg, 'warning', '警惕诊断', diagWaring, true,7,2)
-    // renderRecommendInfo(diagImg, 'diagRecommend', '推荐诊断', diagRecommend, true,7,2)
-    // renderRecommendInfo(symptomImg, 'symptomRecommend', '问诊症状', symptomRecommend, false)
-    // renderRecommendInfo(physiExamImg, 'physiExamRecommend', '体格检查', physiExamRecommend, false)
-    // renderMultRecommendInfo('labAndPacsRecommend', '检验检查', labAndPacsRecommend, false)
-    // renderTreat(treatImg, 'treatRecommend','治疗方案',treatResult) 
-    
-    // renderRecommendConditTips(conditTipsImg, 'conditTips','病情提示', medicalIndications || [])
-    
-  })
-
-}
-
+  // renderRecommendConditTips(conditTipsImg, 'conditTips','病情提示', medicalIndications || [])
+  
+})
 
 
 $(".disclaimerInfo").on("click", function(){

src/js/promise.js

@@ -30,8 +30,7 @@ const config = {
   information: '/api/data/conceptDetail/getConceptDetail',
   pushScale: '/api/data/push/pushScale',
   pushTreatment: '/api/data/push/pushTreatment',
-  getSysSetInfoDatas: '/api/data/sysSet/getSysSetInfoDatas',
-  getMr: '/api/data/mr/getMr'
+  getSysSetInfoDatas: '/api/data/sysSet/getSysSetInfoDatas'
 }
 const imageUrlPrefix = 'http://192.168.2.241:82';
 const getUrlArgObject = function(parm) {  

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'),