Merge remote-tracking branch 'origin/ChronicMag' into dev/new1

src/components/ChronicInfo/index.jsx

@@ -475,7 +475,7 @@ class ChronicInfo extends React.Component{
               <div className={`${style["tips-title"]} ${style["chronic"]}`}>
                 <div className={style["tips-name"]}>
                   <img src={chronicPic} />
-                  <h2>{chronicMagItem&&chronicMagItem.name||chronicDesease&&chronicDesease.name||'推荐信息'}</h2>
+                  <h2>{chronicMagItem&&chronicMagItem.name||chronicDesease&&chronicDesease.name||'病情提示'}</h2>
                   <span className={style["redTips"]}>(页面信息有更新可能影响评估结果)</span>
                 </div>
                 <div className={style["tips-btn"]} style={{display:chronicMagItem&&chronicMagItem.name||chronicDesease&&chronicDesease.name?'block':'none'}}>

src/components/ChronicInfo/index.less

@@ -61,6 +61,7 @@
         .infoPic{
           vertical-align: middle;
           margin: 0 5px;
+          cursor: pointer;
         }
         >p{
           margin-top: 10px;

src/components/MainSuit/index.jsx

@@ -259,7 +259,7 @@ class MainSuit extends Component{
       let jsonData = getAllDataList(baseList);
       let jsonStr = getAllDataStringList(baseList);
       let flg = ifOtherClear(jsonData,jsonStr,baseList);//除主诉外 其他是否为空
-      if(data.trim()=='糖尿病复诊' && !flg){
+      if((data.trim()=='糖尿病复诊'||data.trim()=='糖尿病(复诊)'||data.trim()=='糖尿病（复诊）') && !flg){
         saveChronic && saveChronic({name:'糖尿病',id:21773});
       }
     }else{

src/components/PushItems/PushDiag/index.less

@@ -6,6 +6,7 @@
     width: 100%;
     height: 36px;
     line-height: 36px;
+    font-weight: bold;
 }
 .push-diag-icon {
     position: relative;

src/components/ScaleTable/index.jsx

@@ -186,15 +186,20 @@ class ScaleTable extends React.Component{
     const {tableId,getResult,parentId,parentIndex,scaleInfo} = this.props; 
     const {valueData,scaleResult1} = this.state; 
     // 替换表格内容
-    let allDatas = JSON.parse(JSON.stringify(scaleInfo[tableId])) ;
-     allDatas[1].content = JSON.stringify(valueData);
-    const params = {
-      type:1,
-      data:scaleResult1,
-      id:tableId,
-      pIndex:parentIndex
+    let allDatas = scaleInfo[tableId]?JSON.parse(JSON.stringify(scaleInfo[tableId])):'' ;
+    if(allDatas){
+      allDatas[1].content = JSON.stringify(valueData);
     }
-    getResult&&getResult({params,allDatas});
+     
+     if(scaleResult1){
+      const params = {
+        type:1,
+        data:scaleResult1,
+        id:tableId,
+        pIndex:parentIndex
+      }
+      getResult&&getResult({params,allDatas});
+     }  
   }
   getContent(){ 
     let {selecteds,valueData,start,scaleResult1} = this.state;
@@ -274,7 +279,7 @@ class ScaleTable extends React.Component{
               {this.getContent()}
               {datas&&datas.noCalc==0?<div className={style['total']}>
                     <span>总分：</span>
-                    <span>{scaleResult&&scaleResult.calcalculate.result&&scaleResult.calcalculate.result.value +' '+ scaleResult.calcalculate.result.text||''}</span>
+                    <span>{scaleResult&&scaleResult.calcalculate&&scaleResult.calcalculate.result&&scaleResult.calcalculate.result.value +' '+ scaleResult.calcalculate.result.text||''}</span>
                     <span className={style['totalBtn']} onClick={this.handleFormula.bind(this)}>得分</span>
                   </div>:''}
             </div>

src/containers/AssessResult.js

@@ -87,10 +87,10 @@ function parseChartData(indexData){
   }
   indexData.itemIndexData.map((it)=>{
     temp=indexData.indexConfigData.find((i)=>{return it.itemName==i.indexUnique});
-    arr=obj[temp.orderNo]||[];
-    nameArr=nameObj[temp.orderNo]||[];
-    obj[temp.orderNo]=[...arr,it];
-    nameObj[temp.orderNo]=[...nameArr,it.itemName];
+    arr=obj[temp.indexDesc]||[];
+    nameArr=nameObj[temp.indexDesc]||[];
+    obj[temp.indexDesc]=[...arr,it];
+    nameObj[temp.indexDesc]=[...nameArr,it.itemName];
   });
   //nameObj,obj;
   return obj;

src/utils/ajax.js

@@ -6,7 +6,7 @@ const axios=require('axios');
 const qs=require('querystring');
 const isLocal = window.location.hostname.indexOf('localhost')!=-1;
 // const qhost = isLocal?host+prefix:prefix;
-const qhost = isLocal?host+prefix:host+prefix;
+const qhost = isLocal?host+prefix:prefix;
 axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded';
 //axios.defaults.baseURL = host;       //默认地址
 // axios.defaults.timeout = 60000;       //请求超时