Merge remote-tracking branch 'origin/dev5.3.1' into dev/new1

src/components/ChronicInfo/index.jsx

@@ -242,10 +242,10 @@ class ChronicInfo extends React.Component{
     let obj = deepClone(calcuValues);
     let values = (obj&&obj[id])||deepClone(calcuContent);
     const txt = e.target.value;
-    values[i].value = txt.replace(/[\u4e00-\u9fa5]|[^\d|.\/%*~]/g,'');       //处理中文输入法的情况
+    values[i].value = txt.replace(/[\u4e00-\u9fa5]|[^\d.]/g,'');       //处理中文输入法的情况
     obj[id] = values;
-    if(/[\u4e00-\u9fa5]|[^\d|.\/%*~]/g.test(txt)){
-      e.target.value = txt.replace(/[\u4e00-\u9fa5]|[^\d|.\/%*~]/g,'');
+    if(/[\u4e00-\u9fa5]|[^\d.]/g.test(txt)){
+      e.target.value = txt.replace(/[\u4e00-\u9fa5]|[^\d.]/g,'');
     }
     this.setState({
       isCalculated:false,

src/components/CommonSymptom/index.jsx

@@ -91,7 +91,7 @@ class CommonSymptom extends Component{
       let listBox = $('#listBox')[0];
       let hisBox = $('#his')[0];
       let operBox = $('#oper')[0];
-      if(e.target != itemBox && e.target.parentNode != divBox && e.target.parentNode != listBox && e.target.parentNode != hisBox && e.target.parentNode != operBox && e.target != divBox && e.target.parentNode && e.target.parentNode.parentNode && e.target.parentNode.parentNode != hisBox){
+      if(e.target != itemBox && e.target.parentNode != divBox && e.target.parentNode != listBox && e.target.parentNode != hisBox && e.target.parentNode != operBox && e.target != divBox ){
         this.setState({
           hide:true,
           select:[],