Merge branch 'modeTree' into icss6.0

src/css/icssIndex.less

@@ -125,7 +125,7 @@
 .infoMsg,
 .infoMsgOn {
     position: absolute;
-    top: 5px;
+    top: 4px;
     right: 0;
 }
 
@@ -475,7 +475,7 @@
     position: absolute;
     width: 100%;
     height: 100%;
-    background-color: #000;
+    background-color: #fff;
     opacity: 0.5;
     filter:alpha(opacity=50);
     -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(opacity=50);";

src/js/icssIndex.js

@@ -199,6 +199,7 @@ function getPageInfo(configArr) {
                 showNum: showPacsNum
             }
           ]
+          window.pushMessage = medicalIndications;//计算的需要的相关数据
           renderPageData(confArr,diagWaring,diagFirst,diagPossible,diagIdentify,labAndPacsRecommend,physiExamRecommend,symptomRecommend,medicalIndications,diagCommon,CaseStandard);
 
         }).catch(function (err) {
@@ -230,6 +231,7 @@ function getPageInfo(configArr) {
                 showNum: showPacsNum
             }
           ]
+          window.pushMessage = medicalIndications;//计算的需要的相关数据
           renderPageData(confArr,diagWaring,diagFirst,diagPossible,diagIdentify,labAndPacsRecommend,physiExamRecommend,symptomRecommend,medicalIndications,diagCommon,CaseStandard);
 
         }).catch(function (err) {
@@ -264,6 +266,7 @@ function getPageInfo(configArr) {
                 showNum: showPacsNum
             }
           ]
+          window.pushMessage = medicalIndications;//计算的需要的相关数据
           renderPageData(confArr,diagWaring,diagFirst,diagPossible,diagIdentify,labAndPacsRecommend,physiExamRecommend,symptomRecommend,medicalIndications,diagCommon,CaseStandard);
 
         }).catch(function (err) {
@@ -273,6 +276,8 @@ function getPageInfo(configArr) {
         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['拟诊'] || []
+          diagDetermine = res&&res.data&&res.data.data&&res.data.data.dis&&res.data.data.dis['确诊'] || []
+          diagFirst = diagDetermine.concat (diagFirst)
           diagPossible = res&&res.data&&res.data.data&&res.data.data.dis&&res.data.data.dis['可能诊断'] || []
           diagIdentify = res&&res.data&&res.data.data&&res.data.data.dis&&res.data.data.dis['鉴别诊断'] || []
           labRecommend = res&&res.data&&res.data.data&&res.data.data.lab || []
@@ -294,6 +299,7 @@ function getPageInfo(configArr) {
                 showNum: showPacsNum
             }
           ]
+          window.pushMessage = medicalIndications;//计算的需要的相关数据
           renderPageData(confArr,diagWaring,diagFirst,diagPossible,diagIdentify,labAndPacsRecommend,physiExamRecommend,symptomRecommend,medicalIndications,diagCommon,CaseStandard);
         }).catch(function (err) {
           console.log(err);
@@ -435,7 +441,7 @@ function renderPageData(confArr,diagWaring,diagFirst,diagPossible,diagIdentify,l
           diagCommon.length > 0 && renderNum++;
           break;
         case "specification_show": //病例书写规范
-          CaseStandard.length > 0 &&  renderCaseStandard('CaseStandard', '病例书写规范', CaseStandard);
+          CaseStandard.length > 0 &&  renderCaseStandard('CaseStandard', '病历书写规范提示', CaseStandard);
           CaseStandard.length > 0 && renderNum++;
           break;
         case "Inspush_show": //检验检查

webpack.config.js

@@ -111,7 +111,7 @@ module.exports = {
       }
     }),
     new HtmlWebpackPlugin({
-      title: 'disclaimer',
+      title: '免责声明',
       template: path.resolve(__dirname, 'src/html', 'disclaimer.html'),
       filename: 'disclaimer.html',
       chunks: ['vendor', 'common', 'disclaimer'],