Squashed commit of the following:

commit bf091afd13dc29e7d123357f81dd23adfb141d97
Author: liucf <liucf@zjlantone.com>
Date:   Sun Apr 28 13:37:18 2019 +0800

    合并chronicMag分支

commit ad43cd7703c9abd9218d39bc5ca2ecbc55c83565
Author: liucf <liucf@zjlantone.com>
Date:   Sun Apr 28 13:19:13 2019 +0800

    合并远程分支

commit 1a61bc8860afd4be87a796593aa98daf25f38021
Author: liucf <liucf@zjlantone.com>
Date:   Fri Apr 26 15:34:04 2019 +0800

    右侧推送量表根据id展示结果，去掉index

commit e9bb69c1eb062e1c8a3d7d75db2552ddd62fba3d
Author: liucf <liucf@zjlantone.com>
Date:   Fri Apr 26 14:21:35 2019 +0800

    合并远程分支

commit 2b2d2395be20378bd90ece24d9364985a8ae4444
Author: liucf <liucf@zjlantone.com>
Date:   Fri Apr 26 14:06:36 2019 +0800

    量表容错处理

commit ac70fb283eec5b0601898a419eea43e07053be3d
Author: liucf <liucf@zjlantone.com>
Date:   Fri Apr 26 13:25:44 2019 +0800

    合并远程分支

commit f7c7a75edba7282049d51d0f9dae1ff3aeba9f7b
Author: liucf <liucf@zjlantone.com>
Date:   Fri Apr 26 11:42:05 2019 +0800

    解决量表计算时页面更新问题

commit 269d9cfbed90b980935e3f949a2e75246308519e
Author: liucf <liucf@zjlantone.com>
Date:   Fri Apr 26 09:57:50 2019 +0800

    合并远程分支

commit b0d8e931c7d945c53c5454e30e4a0f59e278f48b
Author: liucf <liucf@zjlantone.com>
Date:   Thu Apr 25 20:19:19 2019 +0800

    慢病诊断入口

commit a5cb935038e2e63699d1f2f250322b759635eb82
Author: liucf <liucf@zjlantone.com>
Date:   Thu Apr 25 16:50:03 2019 +0800

    分组小计结果处理

# Conflicts:
#	src/components/ScaleTable/index.jsx
#	src/containers/AssessResult.js

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>