推荐用药分类

src/css/cdss.css

@@ -372,8 +372,10 @@ body {
 .pushItemBox {
   position: relative;
   cursor: pointer;
-  /*display: inline-block;*/
+  /* display: flex */
+/*display: inline-block;*/
 }
+
 .warning .pushItemName .item-name {
   opacity: 0.8;
   filter: alpha(opacity=80);
@@ -384,6 +386,7 @@ body {
   line-height: 21px;
   padding-right: 3px;
   cursor: pointer;
+  display: flex;
 }
 .pushItemName.noInfo {
   margin-right: 12px;
@@ -493,6 +496,7 @@ body {
 .moduleItem .shortBox {
   padding: 4px 14px;
   position: relative;
+  display: flex;
   /****bug8454***/
 }
 .tabList {

src/js/cdss.js

@@ -308,7 +308,6 @@ function renderPushData() {
       let symptomPush = result.symptom || []
       let checkupPush = result.vital || []
       let medicinesPush = result.medicine || []
-      console.log(medicinesPush);
       let operationsPush = result.operations || []
       let treatPush = result.treat && result.treat[0] || {}
       let nursePush = result.nurse || []
@@ -487,7 +486,6 @@ function renderDiag(diagPush) {
   let warningDiagPush = diagPush["警惕"] || []
   let number = $('.moduleItem.diag').attr("data-num") || 5
   let warnNumber = $('.moduleItem.warning').attr("data-num") || 5
-
   $('.moduleItem.diag').append(titleStr("diagPush"))
   // let warningDiagPush = [{name:"血常规",hisNameList:null},{name:"尿常规",hisNameList:null},{name:"尿常规",hisNameList:null},{name:"尿常规",hisNameList:null},{name:"尿常规",hisNameList:null},{name:"尿常规",hisNameList:null}]
   // let firstDiagPush =  [{name:"血常规",hisNameList:null},{name:"尿常规",hisNameList:null},{name:"尿常规",hisNameList:null},{name:"尿常规",hisNameList:null},{name:"尿常规",hisNameList:null},{name:"尿常规",hisNameList:null}]
@@ -604,30 +602,67 @@ function rendergeneraTreatPush(list) {
   }
 }
 function renderMedicinesPush(obj, showNum) {
-  $(".moduleItem.medicine").append(titleStr('drugPush'))
-  let showNum1 = showNum || 5
+  $(".moduleItem.medicine").append(titleStr('drugPush'));
+  let showNum1 = 2;
+  let mshortStr1 = "";
+  let mlongStr1 = "";
   let keys = Object.keys(obj);
-  let str1 ="";
-  let cateNames = Array.from(keys);
+  let cateNames = Array.from(keys); 
   if (cateNames.length > 0 && $(".moduleItem.medicine").length > 0) {
-    moduleNum++
-    for(let i=0;i<cateNames.length;i++){
-      let drugs = obj[cateNames[i]]
-      console.log("这是drugs",drugs);
-      //把药类名直接显示到页面上
-      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;
+    moduleNum++;
+    for (let i = 0; i < cateNames.length; i++) {
+      let drugs = obj[cateNames[i]];
+      let { shortStr, longStr } = renderItemWrapper(drugs, showNum);
+      console.log("long", shortStr);
+      
+      if (i < showNum1) {
+        mshortStr1 += `&nbsp;&nbsp;${i + 1}.${cateNames[i]}<br>`;
+        mshortStr1 += shortStr;
+      }
+      // // 添加药品分类和短内容
+      // mshortStr1 += `&nbsp;&nbsp;${i + 1}.${cateNames[i]}<br>`;
+      // mshortStr1 += shortStr;
+      
+      // 添加药品分类和长内容
+      mlongStr1 += `&nbsp;&nbsp;${i + 1}.${cateNames[i]}<br>`;
+
+      mlongStr1 += longStr;
+    
     }
-    $(".moduleItem.medicine").append(str1);
-    $(".moduleItem.medicine").css("display", "block")
-    console.log(shortStr);
-  }
-}
-
+    // 判断显示逻辑
+    if (showNum1 >cateNames.length) {
+      $(".moduleItem.medicine").append(`<div class="shortBox">${mshortStr1}</div>`);
+    } else {
+      mshortStr1 += `<span class="showMore"><img class="iconArrowImg" src="${iconArrowDown}"></span>`;
+      mlongStr1 += `<span class="showLess"><img class="iconArrowImg"  src="${iconArrowUp}"></span>`;
+      $(".moduleItem.medicine").append(`<div class="shortBox">${mshortStr1}</div>`);
+      $(".moduleItem.medicine").append(`<div class="longBox">${mlongStr1}</div>`);
+    }
+    
+    $(".moduleItem.medicine").css("display", "block");
+  }
+}
+
+
+// function renderMedicinesPush(obj, showNum) {
+//     $(".moduleItem.medicine").append(titleStr('drugPush'))
+//     let showNum1 = showNum || 5
+//     let keys = Object.keys(obj);
+//     let cateNames = Array.from(keys);
+//     if (cateNames.length > 0 && $(".moduleItem.medicine").length > 0) {
+//       moduleNum++
+//       for(let i=0;i<cateNames.length;i++){
+//       let drugs= obj[cateNames[i]]
+//       console.log("这是drugs",drugs);
+//       //把药类名直接显示到页面上
+//       str1 = `<span class="casenameBox" data-id="${cateNames[i]}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)
+//     }
+//     $(".moduleItem.medicine").css("display", "block")
+//     }
+// }
 function renderOperationPush(list, showNum) {
   $(".moduleItem.operation").append(titleStr('operationPush'))
 
@@ -640,7 +675,6 @@ function renderOperationPush(list, showNum) {
 
 }
 
-
 function renderItemWrapper(list, showNum,name) {
   let showNum1 = showNum || 5
   let shortStr = '', longStr = ''
@@ -653,7 +687,7 @@ function renderItemWrapper(list, showNum,name) {
   if (showNum1 >= list.length) {
     return {
       shortStr: `<div class="shortBox">${shortStr}</div>`,
-      longStr: ''
+      longStr: `<div class="longBox">${longStr}</div>`
     }
   } else {
     shortStr += `<span class="showMore"><img class="iconArrowImg" src="${iconArrowDown}"></span>`
@@ -665,6 +699,7 @@ function renderItemWrapper(list, showNum,name) {
   }
 }
 
+
 function renderPushItem(item,name,index,totalItems) {
   const infoIcon = `${item.hasInfo == "1" ? `<img class="infoImg" src="${infoImg}">` : ""}`;
   let signalStr = "";
@@ -684,8 +719,9 @@ function renderPushItem(item,name,index,totalItems) {
     }
   }
   str = `<span class="pushItemBox" data-name="${item.name}" data-type="${item.type}">`
-  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}<i class="hidden-i"></i></span>`
   str += `</span>`;
+  // $(".pushItemBox").css("display", "flex")
   return str;
 }
 function bindOpenInfo() {

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://173.18.12.192:6060";
+const proxyHost = "http://173.18.12.195:6060";
 module.exports = {
   entry: {
     //index: path.resolve(__dirname, 'src/js', 'index.js'),