修改推送结果内容

src/js/cdss.js

@@ -31,8 +31,9 @@ require('./../images/xhg2.png')
 require('./../images/xhg3.png')
 require('./../images/xhg4.png')
 
-// require('./popupEdit.js');
 
+// require('./popupEdit.js');
+const queryIcon = require('./../images/query_icon.png')
 let infoImg = require('./../images/icon_info.png')
 let infoImgOn = require('./../images/icon_info_on.png')
 let iconArrowUp = require('./../images/icon_arrow_up.png')
@@ -48,7 +49,7 @@ let xhg4img = require('./../images/xhg4.png')
 
 
 const $ = require("jquery");
-const { post, config, getUrlArgObject, openNewWin, titleConfig } = require('./promise.js');
+const { post, config, getUrlArgObject, openNewWin, titleConfig, get } = require('./promise.js');
 const { renderFollowUp, followEmpty } = require('./followUp.js');
 const { getTcmMr } = require('./tcmiss.js');
 
@@ -129,6 +130,10 @@ function getConf() {
 }
 
 function getPushInfo() {
+  // console.log("@@@@@@@@", msg)
+
+
+  $(".mask").css("display", 'block')
   return post(config.pushInner, Object.assign({}, msg, {
     featureType: '1,4,5,6,7,8,9,10,12,13,14',
     hospitalId: hospitalIdUrl || msg.hospitalId,
@@ -280,7 +285,7 @@ function renderPage(pageSet) {
     return;
   }
   if (hasAuxiliary) {
-    console.log(hasAuxiliary);
+    // console.log(hasAuxiliary);
     $('.empty-box').hide();
     $(".loading").show();
     renderModuleWrapper(planDetail)
@@ -302,14 +307,38 @@ function renderPage(pageSet) {
   }
 }
 
+
+
 function renderPushData() {
   return getPushInfo().then(res => {
     $(".loading").hide();
+    // $(".loading").show();
     hasCompleteTnterface++
     if (res.data.code == "0") {
       const result = res.data.data
       let diagPush = result.dis || {}
       let lisPush = result.lis || []
+      // console.log("lisPush", lisPush, diagPush)
+      if (msg.chief) {
+        // $(".loading").show();
+
+        get(`/graph/nodes/recommend?chief=${msg.chief}`).then((res) => {
+          const { success, records, error_code } = res.data
+          // console.log(" records", res.data)
+          if (error_code === 0) {
+            console.log(" records", records)
+            diagPush["可能诊断"] = records["可能诊断"]
+            lisPush = records["推荐检验"]
+            let lisNum = $(".moduleItem.lis").attr("data-num") || 5
+            renderLis(lisPush, lisNum)
+            renderDiag(diagPush)
+          }
+
+          $(".mask").css("display", 'none')
+        }).catch(err => {
+          $(".mask").css("display", 'none')
+        })
+      }
       let scalePush = result.scale || []
       let pacsPush = result.pacs || []
       let symptomPush = result.symptom || []
@@ -322,7 +351,7 @@ function renderPushData() {
       let nursePush = result.nurse || []
       treatDisName = treatPush && treatPush["name"]
       let generaTreatPush = treatPush && treatPush["generaTreat"]
-      let lisNum = $(".moduleItem.lis").attr("data-num") || 5
+      // let lisNum = $(".moduleItem.lis").attr("data-num") || 5
       let scaleNum = $(".moduleItem.evaluation").attr("data-num") || 5
       let pacsNum = $(".moduleItem.pacs").attr("data-num") || 5
       let checkupNum = $(".moduleItem.vital").attr("data-num") || 5
@@ -331,12 +360,13 @@ function renderPushData() {
       let casesNum = $(".moduleItem.classiccase").attr("data-num") || 5
       let operationsNum = $(".moduleItem.operation").attr("data-num") || 5
       let nurseNum = $(".moduleItem.nurse").attr("data-num") || 5
-      renderLis(lisPush, lisNum)
+      // renderLis(lisPush, lisNum)
+      // renderDiag(diagPush)
       renderScale(scalePush, scaleNum)
       renderPacs(pacsPush, pacsNum)
       renderCheckup(checkupPush, checkupNum)
       renderSymptomPush(symptomPush, symptomNum)
-      renderDiag(diagPush)
+
       renderMedicinesPush(medicinesPush, medicinesNum)
       renderCasesPush(casesPush, casesNum)
       renderOperationPush(operationsPush, operationsNum)
@@ -367,7 +397,7 @@ function isNeedPush(list) {
       }
     }
   }
-  console.log(pass);
+  // console.log(pass);
   return pass;
 }
 function isNeedwriteStandardPush(list) {
@@ -627,7 +657,7 @@ function renderMedicinesPush(obj, showNum) {
     for (let i = 0; i < cateNames.length; i++) {
       let drugs = obj[cateNames[i]];
       let { shortStr, longStr } = renderItemWrapper(drugs, showNum);
-      console.log("long", shortStr);
+      // console.log("long", shortStr);
 
       if (i < showNum1) {
         mshortStr1 += `&nbsp;&nbsp;${i + 1}.${cateNames[i]}<br>`;
@@ -681,7 +711,7 @@ function renderMedicinesPush(obj, showNum) {
 
 function renderCasesPush(list, showNum) {
   $(".moduleItem.classiccase").append(titleStr('classicPush'))
-  console.log($(".moduleItem.classiccase").length);
+  // console.log($(".moduleItem.classiccase").length);
   if (list.length > 0 && $(".moduleItem.classiccase").length > 0) {
     moduleNum++
     let { shortStr, longStr } = renderItemWrapper(list, showNum, "经典病例")
@@ -711,7 +741,7 @@ function renderItemWrapper(list, showNum, name) {
     }
     longStr += renderPushItem(list[i], name, i, list.length)
   }
-  console.log(shortStr);
+  // console.log(shortStr);
 
   if (showNum1 >= list.length) {
     return {
@@ -732,7 +762,9 @@ function renderPushItem(item, name, index, totalItems) {
 
   const infoIcon = `${item.hasInfo == "1" ? `<img class="infoImg" src="${infoImg}">` : ""}`;
   let signalStr = "";
-  const percentage = (index / totalItems) * 100;
+  // const percentage = (index / totalItems) * 100;
+  const percentage = item.count * 100;
+  const queryImg = `<a href="http://172.16.8.57:4500/#/kgrt/entry?keyword=${item.name}" target="_blank"><img class="queryImg" src="${queryIcon}"></a>`
 
   // 根据百分比添加不同的信号格图片
   if (name === "可能诊断") {
@@ -750,9 +782,9 @@ function renderPushItem(item, name, index, totalItems) {
   str = `<span class="pushItemBox" data-name="${item.name}" data-type="${item.type}">`
 
   if (name === "经典病例") {
-    str += `<span class="pushItemName  ${item.hasInfo == "1" ? 'evaluationtitle' : ''} ${item.hasInfo == "1" ? '' : 'noInfo'}">${item.type == 8 ? ('【' + item.name + '】') : item.name} ${signalStr}${infoIcon}<i class="hidden-i"></i></span>`
+    str += `<span class="pushItemName  ${item.hasInfo == "1" ? 'evaluationtitle' : ''} ${item.hasInfo == "1" ? '' : 'noInfo'}">${item.type == 8 ? ('【' + item.name + '】') : item.name} ${signalStr}${infoIcon}${queryImg}<i class="hidden-i"></i></span>`
   } else {
-    str += `<span class="pushItemName  ${item.hasScale == "1" ? 'evaluationtitle' : ''} ${item.hasInfo == "1" ? '' : 'noInfo'}">${item.type == 8 ? ('【' + item.name + '】') : item.name} ${signalStr}${infoIcon}<i class="hidden-i"></i></span>`
+    str += `<span class="pushItemName  ${item.hasScale == "1" ? 'evaluationtitle' : ''} ${item.hasInfo == "1" ? '' : 'noInfo'}">${item.type == 8 ? ('【' + item.name + '】') : item.name} ${signalStr}${infoIcon}${queryImg}<i class="hidden-i"></i></span>`
   }
 
   str += `</span>`;

webpack.config.js

@@ -6,8 +6,8 @@ const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
 const webpack = require('webpack');
 
 //const proxyHost = "http://172.16.8.60:6060";
-const proxyHost = "http://192.168.65.95:6060";      //沙雅后端地址
-// const proxyHost = "http://173.18.12.195:6060";
+// const proxyHost = "http://192.168.65.95:6060";      //沙雅后端地址
+const proxyHost = "http://173.18.12.195:6060";
 module.exports = {
   entry: {
     //index: path.resolve(__dirname, 'src/js', 'index.js'),
@@ -339,10 +339,12 @@ module.exports = {
   mode: 'development',
   devServer: {
     contentBase: "./dist", //静态文件根目录
+    // host: "172.16.8.57",
     proxy: {
       '/sys': proxyHost,
       '/lantone': "http://114.55.109.16:81",
       '/kl': proxyHost,
+      "/graph": "http://173.18.12.205:8001/"
     },
     hot: true,
     // openPage:'index.html?age=28&tipsName=血常规&tipsType=12&diseaseId=280&lisJson=&diagJson=急性胰腺炎&diseaseName=糖尿病&pastJson=无心脏病&otherJson=无高血压&pacsJson=腹部B超:无异常,%20报告日期:2019-05-07&sex=男&symptomJson=恶心呕吐腰痛&vitalJson=血压左上肢13/12mmHg&hospitalCode=A001',