Merge branch 'modeTree' into icss6.0

src/js/icssIndex.js

@@ -114,8 +114,8 @@ function getAnalyseParam() {
       lisStr += `${lisList[i].name},${lisList[i].detailName},${lisList[i].value}${lisList[i].detailName};`
    }
    for(let i = 0; i < pasList.length; i++){
-      pacStr += `${lisList[i].uniqueName}:${lisList[i].result},报告日期：${lisList[i].dateValue};`
-  }
+      pacStr += `${pasList[i].uniqueName}:${pasList[i].result},报告日期：${pasList[i].dateValue};`
+    }
     
     let str = `姓名: ${msg.patientName || ""}
               性别：${msg.sex == '1' ? '男':'女'}
@@ -154,6 +154,7 @@ function getAnalyseParam() {
 
 function getPageInfo(configArr) {
   let {confArr, showLabsNum, showPacsNum, labsAndPacMode} = transConf(configArr),
+ 
     diagWaring = [{clientNames: null, conceptId: 531694,libType: 18,name: "糖尿病肾病",type: 7},{clientNames: null, conceptId: 531694,libType: 18,name: "糖尿病肾病",type: 7},{clientNames: null, conceptId: 531694,libType: 18,name: "糖尿病肾病",type: 7},{clientNames: null, conceptId: 531694,libType: 18,name: "糖尿病肾病",type: 7},{clientNames: null, conceptId: 531694,libType: 18,name: "糖尿病肾病",type: 7}]
     // diagWaring = [],
     diagFirst = [],
@@ -170,13 +171,14 @@ function getPageInfo(configArr) {
     disName=""
     const hasCaseStandard = confArr.findIndex(item => item.code == 'specification_show') > -1
     const hasCommon = confArr.findIndex(item => item.code == 'comsympto_show') > -1
-   
     if(hasCommon){
       if(hasCaseStandard){
         Promise.all([getHosptDeptUsal(),getPushInfo(),getAnalyse()]).then(([res1, res2, res3]) =>{
           diagCommon = res1&&res.data&&res.data.data&&res.data.data || []
           diagWaring = res2&&res2.data&&res2.data.data&&res2.data.data.dis&&res2.data.data.dis['警惕'] || []
           diagFirst = res2&&res2.data&&res2.data.data&&res2.data.data.dis&&res2.data.data.dis['拟诊'] || []
+          diagDetermine = res2&&res2.data&&res2.data.data&&res2.data.data.dis&&res2.data.data.dis['确诊'] || []
+          diagFirst = diagDetermine.concat (diagFirst)
           diagPossible = res2&&res2.data&&res2.data.data&&res2.data.data.dis&&res2.data.data.dis['可能诊断'] || []
           diagIdentify = res2&&res2.data&&res2.data.data&&res2.data.data.dis&&res2.data.data.dis['鉴别诊断'] || []
           labRecommend = res2&&res2.data&&res2.data.data&&res2.data.data.lab || []
@@ -210,6 +212,8 @@ function getPageInfo(configArr) {
           diagCommon = res1&&res1.data&&res1.data.data&&res1.data.data || []
           // diagWaring = res2&&res2.data&&res2.data.data&&res2.data.data.dis&&res2.data.data.dis['警惕'] || []
           diagFirst = res2&&res2.data&&res2.data.data&&res2.data.data.dis&&res2.data.data.dis['拟诊'] || []
+          diagDetermine = res2&&res2.data&&res2.data.data&&res2.data.data.dis&&res2.data.data.dis['确诊'] || []
+          diagFirst = diagDetermine.concat (diagFirst)
           diagPossible = res2&&res2.data&&res2.data.data&&res2.data.data.dis&&res2.data.data.dis['可能诊断'] || []
           diagIdentify = res2&&res2.data&&res2.data.data&&res2.data.data.dis&&res2.data.data.dis['鉴别诊断'] || []
           labRecommend = res2&&res2.data&&res2.data.data&&res2.data.data.lab || []
@@ -240,10 +244,12 @@ function getPageInfo(configArr) {
       }
     }else{
       if(hasCaseStandard){
-        Promise.all([getAnalyse(),getPushInfo()]).then(([res1, res2]) =>{
+        Promise.all([getAnalyse(), getPushInfo()]).then(([res1, res2]) =>{
           getPushData(res2)
           diagWaring = res2&&res2.data&&res2.data.data&&res2.data.data.dis&&res2.data.data.dis['警惕'] || []
           diagFirst = res2&&res2.data&&res2.data.data&&res2.data.data.dis&&res2.data.data.dis['拟诊'] || []
+          diagDetermine = res2&&res2.data&&res2.data.data&&res2.data.data.dis&&res2.data.data.dis['确诊'] || []
+          diagFirst = diagDetermine.concat (diagFirst)
           diagPossible = res2&&res2.data&&res2.data.data&&res2.data.data.dis&&res2.data.data.dis['可能诊断'] || []
           diagIdentify = res2&&res2.data&&res2.data.data&&res2.data.data.dis&&res2.data.data.dis['鉴别诊断'] || []
           labRecommend = res2&&res2.data&&res2.data.data&&res2.data.data.lab || []
@@ -273,6 +279,7 @@ function getPageInfo(configArr) {
           console.log(err);
         })
       } else{
+     
         getPushInfo().then(res =>{
           diagWaring = res&&res.data&&res.data.data&&res.data.data.dis&&res.data.data.dis['警惕'] || []
           diagFirst = res&&res.data&&res.data.data&&res.data.data.dis&&res.data.data.dis['拟诊'] || []
@@ -400,7 +407,8 @@ $(document).on('click',".allDis .right,.allDis .secDis",function(){
   $(".singleDis").css("display","block")
 })
 function renderPageData(confArr,diagWaring,diagFirst,diagPossible,diagIdentify,labAndPacsRecommend,physiExamRecommend,symptomRecommend,medicalIndications,diagCommon,CaseStandard){
-    let renderNum = 0
+
+  let renderNum = 0
     // renderWarning(5,'warning', '警惕', diagWaring, true,7,2)
     // renderRecommendInfo(5,'diagFirst', '初步诊断', diagFirst, true,7,2);
     // renderRecommendInfo(5,'diagPossible', '可能诊断', diagPossible, true,7,2);
@@ -417,6 +425,7 @@ function renderPageData(confArr,diagWaring,diagFirst,diagPossible,diagIdentify,l
     // $('.diagIdentify h4 img').attr('src',diagIdentifyImg)
 
     for(let i = 0; i < confArr.length; i++) {
+   
       switch(confArr[i].code) {
         case "symptoms_show":  //问诊症状
           symptomRecommend.length > 0 && renderRecommendInfo(confArr[i].showNum,'symptomRecommend', '问诊症状', symptomRecommend, false)

src/js/icssIndexDom.js

@@ -267,7 +267,7 @@ function renderRecommendConditTips(className,title,data) {
 
 function renderCaseStandard(className,title,data){
     const str = `<div class="recommendInfoWrapper ${className}">
-        <h4><img class="titleIcon" src="./images/knzd.png" alt="icon" /> ${title}</h4>
+        <h4><img class="titleIcon" src="./images/knzd.png" alt="icon" />${title}</h4>
         <div class="recommendInfoBox">
             <div class="clearfix recommendInfoItemBox ${className + 'box'}">
             </div>

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