Squashed commit of the following:

commit f3c8426e8061f7f24420c3f7053cd60d2e2a9a57
Author: liucf <liucf@zjlantone.com>
Date:   Wed May 15 17:31:22 2019 +0800

    主诉通用特征描述打标处理

commit 58f43657547bbc2845b68d5e5968c491f9d4db9c
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed May 15 14:07:55 2019 +0800

    计算公式等小弹窗样式修改1382

commit 7c86e4edc12ee58ed31bf7d11c20aa5351ce6ee6
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed May 15 13:53:10 2019 +0800

    可能结果关闭选项与结果一致

commit 5cecd2227caba34839470247d67bbcb16beee90c
Author: liucf <liucf@zjlantone.com>
Date:   Tue May 14 19:12:17 2019 +0800

    量表选中项保存

commit 317b2725f592ced18cc2cfef61528482fa182263
Author: liucf <liucf@zjlantone.com>
Date:   Tue May 14 17:19:07 2019 +0800

    主诉现病史数字键盘双击编辑action修改

src/common/components/MiniToast/index.less

@@ -5,7 +5,8 @@
   background: #fff;
   z-index: 40;
   border: 1px solid #EAEDF1;
-  box-shadow: 0 5px 10px 0 rgba(0,0,0,0.10);
+  /*box-shadow: 0 5px 10px 0 rgba(0,0,0,0.10);*/
+  box-shadow: 0 10px 20px 0 #989DA3;
   .infoTitle{
     height: 40px;
     line-height: 40px;

src/components/AssessResult/ScaleItem/index.jsx

@@ -43,9 +43,13 @@ class ScaleItem extends Component {
     })
   }
   closeOption(){
+    const {result} = this.props;
+    const possible=result&&result.possible;
+    let {radioVal} = this.state;
     this.setState({
-      optionId:null
-    })
+      radioVal:Object.assign({},radioVal,possible),
+      optionId:null,
+    });
   }
   confirmOption(){
     const {handleRes} = this.props;
@@ -54,7 +58,9 @@ class ScaleItem extends Component {
       possible:Object.assign({},radioVal),
       radioVal:Object.assign({},radioVal),//不设置radioVal只有最近一次选中的值
     });
-    this.closeOption();
+    this.setState({
+      optionId:null,
+    });
   }
   handleShowScale(item,parentId,pIndex){
     const {showScaleFn,closeAssess,showListScale} = this.props;

src/store/actions/currentIll.js

@@ -159,7 +159,9 @@ export const setData = (state,action) =>{
       let firstT = 0;
       mainData.map((v,i)=>{
         // 主诉通用症状描述
-        if(v.id==config.tongYId && v.value && !v.pos){tongYong = v.value;}
+        // if(v.id==config.tongYId && v.value && !v.pos){tongYong = v.value;}
+        // id会改变，故通过打标来获取flag=5
+        if(v.flag==5 && v.value && !v.pos){tongYong = v.value;}
         if(v.exist){v.exist==1?main.push(v):withs.push(v)}
         // 时间单位
         if(v.controlType==5&&v.value){