经典病历

src/js/cdss.js

@@ -25,13 +25,10 @@ require('./../images/t2.png')
 require('./../images/t3.png')
 require('./../images/go.png')
 require('./../images/g1.png')
-<<<<<<< HEAD
 require('./../images/xhg1.png')
 require('./../images/xhg2.png')
 require('./../images/xhg3.png')
 require('./../images/xhg4.png')
-=======
->>>>>>> 27c9bd60 (修改)
 // require('./popupEdit.js');
 
 let infoImg = require('./../images/icon_info.png')
@@ -41,14 +38,10 @@ let iconArrowDown = require('./../images/icon_arrow_down.png')
 let iconMark = require('./../images/icon_mark.png')
 let warnImg = require('./../images/icon_warning.png')
 let warnImgWhite = require('./../images/icon_waring_white.png')
-<<<<<<< HEAD
 let xhg1img = require('./../images/xhg1.png')
 let xhg2img = require('./../images/xhg2.png')
 let xhg3img = require('./../images/xhg3.png')
 let xhg4img = require('./../images/xhg4.png')
-=======
-
->>>>>>> 27c9bd60 (修改)
 
 const $ = require("jquery");
 const { post, config, getUrlArgObject, openNewWin, titleConfig } = require('./promise.js');
@@ -132,7 +125,7 @@ function getConf() {
 
 function getPushInfo() {
   return post(config.pushInner, Object.assign({}, msg, {
-    featureType: '1,4,5,6,7,8,9,10,12,13',
+    featureType: '1,4,5,6,7,8,9,10,12,13,14',
     hospitalId: hospitalIdUrl || msg.hospitalId,
     ruleType: config.ruleTypeMap['22']
   }))
@@ -281,7 +274,6 @@ function renderPage(pageSet) {
     return;
   }
   if (hasAuxiliary) {
-    console.log(hasAuxiliary);
     $('.empty-box').hide();
     $(".loading").show();
     renderModuleWrapper(planDetail)
@@ -315,14 +307,9 @@ function renderPushData() {
       let pacsPush = result.pacs || []
       let symptomPush = result.symptom || []
       let checkupPush = result.vital || []
-<<<<<<< HEAD
       let medicinesPush = result.medicine || []
-      console.log(medicinesPush);
-=======
-      let medicinesPush = result.medicines || []
-      //let casesPush = result.cases || [] //经典病历
-      let casesPush = ['111', '222', '333']
->>>>>>> 27c9bd60 (修改)
+      let casesPush = result.classicCase || []
+      //let casesPush = ['111', '222', '333'] || []//经典病历
       let operationsPush = result.operations || []
       let treatPush = result.treat && result.treat[0] || {}
       let nursePush = result.nurse || []
@@ -334,13 +321,9 @@ function renderPushData() {
       let checkupNum = $(".moduleItem.vital").attr("data-num") || 5
       let symptomNum = $(".moduleItem.symptom").attr("data-num") || 5
       let medicinesNum = $(".moduleItem.medicine").attr("data-num") || 5
-      let casesNum = $(".moduleItem.classiccase").attr("data-num") || 5
       let operationsNum = $(".moduleItem.operation").attr("data-num") || 5
       let nurseNum = $(".moduleItem.nurse").attr("data-num") || 5
-<<<<<<< HEAD
-=======
-
->>>>>>> 27c9bd60 (修改)
+      let casesNum = $(".moduleItem.classiccase").attr("data-num") || 5//经典病历
       renderLis(lisPush, lisNum)
       renderScale(scalePush, scaleNum)
       renderPacs(pacsPush, pacsNum)
@@ -348,10 +331,10 @@ function renderPushData() {
       renderSymptomPush(symptomPush, symptomNum)
       renderDiag(diagPush)
       renderMedicinesPush(medicinesPush, medicinesNum)
-      renderCasesPush(casesPush, casesNum)//经典病历
       renderOperationPush(operationsPush, operationsNum)
       rendergeneraTreatPush(generaTreatPush)
       renderNurse(nursePush, nurseNum)
+      renderCasesPush(casesPush, casesNum)//经典病历
       bindOpenInfo()
       moreInfo()
       bindSlide();
@@ -367,7 +350,7 @@ function adjustHei() {
 //这段代码通过遍历给定的 list 数组，并根据预定义的 pushCode 数组以及项目的 status 属性，判断是否存在需要推送的项目。它返回一个布尔值，用于表示是否需要执行推送操作
 function isNeedPush(list) {
   let pass = false;
-  let pushCode = ['critical', "diag", "lis", "pacs", "symptom", "vital", "treat", "medicines", 'evaluation', 'general', 'medicine', 'operation', 'nurse', 'classiccase']//修改
+  let pushCode = ['critical', "diag", "lis", "pacs", "symptom", "vital", "treat", "medicines", 'evaluation', 'general', 'medicine', 'operation', 'nurse', 'classiccase']
   for (let i = 0; i < list.length; i++) {
     if (pushCode.indexOf(list[i].code) > -1) {
       if (list[i].status == "1") {
@@ -375,7 +358,6 @@ function isNeedPush(list) {
       }
     }
   }
-  console.log(pass);
   return pass;
 }
 function isNeedwriteStandardPush(list) {
@@ -527,7 +509,7 @@ function renderDiagItem(list, name, number) {
   }
   moduleNum++
   let titleStr = titleStr2(name)
-  let { shortStr, longStr } = renderItemWrapper(list, number,name)
+  let { shortStr, longStr } = renderItemWrapper(list, number, name)
   let boxStr = `<div class="moduleBox">
         ${titleStr}
         ${shortStr}
@@ -535,9 +517,9 @@ function renderDiagItem(list, name, number) {
       </div>`
   $(".diag").append(boxStr)
   $('.moduleItem.diag').css("display", "block")
- 
+
 }
-function renderWarningDiag(list, name,number) {
+function renderWarningDiag(list, name, number) {
   if (list.length > 0 && $(".moduleItem.warning").length > 0) {
     moduleNum++
     $('.moduleItem.warning').append()
@@ -626,37 +608,48 @@ function rendergeneraTreatPush(list) {
 }
 function renderMedicinesPush(obj, showNum) {
   $(".moduleItem.medicine").append(titleStr('drugPush'))
-<<<<<<< HEAD
   let showNum1 = showNum || 5
   let keys = Object.keys(obj);
-  let str1 ="";
+  let str1 = "";
   let cateNames = Array.from(keys);
   if (cateNames.length > 0 && $(".moduleItem.medicine").length > 0) {
-=======
-  console.log($(".moduleItem.medicine").length);
-
-  if (list.length > 0 && $(".moduleItem.medicine").length > 0) {
->>>>>>> 27c9bd60 (修改)
     moduleNum++
-    for(let i=0;i<cateNames.length;i++){
+    for (let i = 0; i < cateNames.length; i++) {
       let drugs = obj[cateNames[i]]
-      console.log("这是drugs",drugs);
+      console.log("这是drugs", drugs);
       //把药类名直接显示到页面上
-      str1 += `<span class="casenameBox "data-name="${cateNames[i]}">&nbsp;&nbsp;${i+1}.${cateNames[i]}<br></span>`
-      // $(".moduleItem.medicine").append(str1);
+      str1 = `<span class="casenameBox "data-name="${cateNames[i]}">&nbsp;&nbsp;${i + 1}.${cateNames[i]}<br></span>`
+      $(".moduleItem.medicine").append(str1);
       let { shortStr, longStr } = renderItemWrapper(drugs, showNum)
-      // $(".moduleItem.medicine").append(shortStr).append(longStr)
-     str1 += shortStr;
-      str1 += longStr;
+      $(".moduleItem.medicine").append(shortStr).append(longStr)
     }
-    $(".moduleItem.medicine").append(str1);
     $(".moduleItem.medicine").css("display", "block")
-    console.log(shortStr);
   }
 }
+function changeMedicine() {
+  $(".showMoreMedicine").on("click", function () {
+    // 显示所有文本
+    $(this).prev().css("max-height", "none");
+
+    // 隐藏下拉按钮
+    $(this).hide();
+
+    // 显示收起按钮
+    $(this).next().show();
+  });
+
+  $(".showLessMedicine").on("click", function () {
+    // 收起文本
+    $(this).prev().css("max-height", "5em");
+
+    // 隐藏收起按钮
+    $(this).hide();
+
+    // 显示下拉按钮
+    $(this).next().show();
+  });
+}
 
-<<<<<<< HEAD
-=======
 function renderCasesPush(list, showNum) {
   $(".moduleItem.classiccase").append(titleStr('classicPush'))
   console.log($(".moduleItem.classiccase").length);
@@ -668,9 +661,10 @@ function renderCasesPush(list, showNum) {
   }
 
 }
->>>>>>> 27c9bd60 (修改)
+
 function renderOperationPush(list, showNum) {
   $(".moduleItem.operation").append(titleStr('operationPush'))
+  console.log($(".moduleItem.operation").length);
   if (list.length > 0 && $(".moduleItem.operation").length > 0) {
     moduleNum++
     let { shortStr, longStr } = renderItemWrapper(list, showNum)
@@ -681,17 +675,15 @@ function renderOperationPush(list, showNum) {
 }
 
 
-function renderItemWrapper(list, showNum,name) {
+function renderItemWrapper(list, showNum, name) {
   let showNum1 = showNum || 5
   let shortStr = '', longStr = ''
   for (let i = 0; i < list.length; i++) {
     if (i <= showNum1 - 1) {
-      shortStr += renderPushItem(list[i],name,i,list.length)
+      shortStr += renderPushItem(list[i], name, i, list.length)
     }
-    longStr += renderPushItem(list[i],name,i,list.length)
+    longStr += renderPushItem(list[i], name, i, list.length)
   }
-  console.log(shortStr);
-
   if (showNum1 >= list.length) {
     return {
       shortStr: `<div class="shortBox">${shortStr}</div>`,
@@ -707,7 +699,7 @@ function renderItemWrapper(list, showNum,name) {
   }
 }
 
-function renderPushItem(item,name,index,totalItems) {
+function renderPushItem(item, name, index, totalItems) {
   const infoIcon = `${item.hasInfo == "1" ? `<img class="infoImg" src="${infoImg}">` : ""}`;
   let signalStr = "";
   const percentage = (index / totalItems) * 100;

webpack.config.js

@@ -4,12 +4,12 @@ const CleanWebpackPlugin = require('clean-webpack-plugin') // 清空打包目录
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
 const webpack = require('webpack');
-<<<<<<< HEAD
-const proxyHost = "http://173.18.12.192:6060";
-=======
+
+
+
 //const proxyHost = "http://173.18.12.192:6060";
 const proxyHost = 'http://172.16.8.60:6060';
->>>>>>> bcc6bf9d (修改)
+
 module.exports = {
   entry: {
     //index: path.resolve(__dirname, 'src/js', 'index.js'),
@@ -32,7 +32,7 @@ module.exports = {
     //staticInfoOut:path.resolve(__dirname, 'src/js', 'informationOut.js'),
     vendor: 'lodash'// 多个页面所需的公共库文件，防止重复打包带入
   },
-  output: { 
+  output: {
     publicPath: '/', //这里要放的是静态资源CDN的地址
     path: path.resolve(__dirname, 'dist'),
     filename: 'js/[name].js'