Merge branch 'dev5.3.2' into dev/new1

src/components/EmergencyProcedure/emergency.js

@@ -157,7 +157,7 @@ let data = [
         checks:'听诊呼吸音是否减弱或消失',
       },
       step2:{//步骤2
-        waring:'进行全血细胞计数+血型鉴定、术前免疫、凝血功能、肺部B超、肺部X线或者肺部CT检查',
+        waring:'进行全血细胞计数+血型鉴定、术前免疫、凝血功能、肺部B超、胸部X线或者胸部CT检查',
         tips:'',
         select:['胸外科会诊'],//按钮
         items:[

src/components/NumberDrop/index.jsx

@@ -184,7 +184,7 @@ class NumberDrop extends Component{
     return className(isSelected,noTag,orgBorder);
   }
   getSpanClass(){       //将被替换的文字选中状态显示
-    const cls = this.props.show?style['blued']:'';
+    const cls = this.props.show?style['blued']:style['nol'];
     return cls;
   }
   stopBubble(e){

src/components/NumberDrop/index.less

@@ -6,6 +6,14 @@
     background: @blue;
     color: #fff;
   }
+  .nol,.blued{
+    min-width:10px;
+    height: 22px;
+    vertical-align: text-bottom;
+    display:inline-block;
+    text-align:center;
+    word-break:break-all;
+  }
 }
 .selected{
   .selected-tag;
@@ -19,4 +27,12 @@
     background: @blue;
     color: #fff;
   }
+  .nol,.blued{
+    min-width:10px;
+    display:inline-block;
+    text-align:center;
+    word-break:break-all;
+    height: 22px;
+    vertical-align: text-bottom;
+  }
 }

src/utils/tools.js

@@ -245,6 +245,7 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
         store.dispatch({type: CLEAR_CURRENT_ILL,data:[],saveText:[],selecteds:[],editClear:true,symptomIds:[],currReadSonM:[]});
         store.dispatch({type: CLEAROTHERHISTORY,data:[block],isEmpty:true,saveText:[],selecteds:[],editClear:true,yjs_1:'',yjs_2:'',yjs_3:'',yjs_4:''});
         store.dispatch({type: CLEARCHECKBODY,data:[block],isEmpty:true,saveText:[],selecteds:[]});
+        store.dispatch({type:SETREADDITEMS});     //清空已存的血压加号项
         store.dispatch(clearAssistData([],'',[]));
         store.dispatch(clearAllLabel([],[],''));
         store.dispatch({