Merge remote-tracking branch 'origin/optimize' into optimize

src/components/AssessResult/ScaleItem/index.jsx

@@ -75,12 +75,22 @@ class ScaleItem extends Component {
       radioVal:Object.assign({},radioVal,{[parent.conceptId]:item.detailName})
     })
   }
+  handleReg(e){   //只能输入数字和特殊符号
+    const key = e.key;
+    if(key!='Backspace'&&((/[^\d|.\/%*~]/.test(key)))){
+      e.preventDefault();
+    }
+  }
   handleInputformula(id,calcuContent,i,e) {
     const {calcuValues} = this.state;
     let obj = deepClone(calcuValues);
     let values = (obj&&obj[id])||deepClone(calcuContent);
-    values[i].value = e.target.value;
+    const txt = e.target.value;
+    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,'');
+    }
     this.setState({
       isCalculated:false,
       calcuValues:obj
@@ -218,7 +228,7 @@ class ScaleItem extends Component {
                                 <span>{'请输入'+item1.name+'：'}</span>
                               </td>
                               <td>
-                                {disabled?item1.value:<input type="text" placeholder="请输入"  value={item1.value} onInput={(e)=>this.handleInputformula(item.conceptId,details,idd,e)}/>}
+                                {disabled?item1.value:<input type="text" placeholder="请输入"  value={item1.value} onKeyDown={this.handleReg.bind(this)} onInput={(e)=>this.handleInputformula(item.conceptId,details,idd,e)}/>}
                               </td>
                               <td>
                                 <span>{item1.uint}</span>

src/components/AssistCheck/index.jsx

@@ -35,7 +35,7 @@ import { host, prefix } from '@utils/config.js';
 // };
 // let numFlg = 0;
 class AssistCheck extends React.Component {
-    constructor(props){
+  constructor(props){
         super(props);
         this.state={
           val: '',

src/components/CheckBody/index.jsx

@@ -113,13 +113,11 @@ class CheckBody extends Component{
   render(){
     const {searchData,totalHide,data,boxLeft,boxTop,saveText} = this.props;
 
-    return  <div className={style['container']}>
-      <ItemBox title='查体' handleClick={this.handleClick}>
+    return <ItemBox title='查体' handleClick={this.handleClick}>
         {this.getLabels()}
         {/*{showMoreBtn?more:''}*/}
         {searchData && searchData.length>0?<SearchDrop data={searchData} show={!totalHide} left={boxLeft} top={boxTop} onSelect={this.handleSearchSelect}></SearchDrop>:''}
       </ItemBox>
-    </div>
   }
 }
 

src/components/ChronicInfo/index.jsx

@@ -221,7 +221,7 @@ class ChronicInfo extends React.Component{
     this.closeFormula(it);
     chronicMagItem&&this.handleAddAssessItem(v,pIndex,i);
   }
-  handleReg(e){   //只能输入数字
+  handleReg(e){   //只能输入数字和特殊符号
     //const hasDot = e.target.value.indexOf('.')!=-1;
     const key = e.key;
     if(key!='Backspace'&&((/[^\d|.\/%*~]/.test(key)))){

src/components/Diagnosis/index.jsx

@@ -42,8 +42,6 @@ class Diagnosis extends Component {
   }
 
   render() {
-
-
     return (<div id="diagnosisResult">
       <ItemBox id="diagnosis" title='诊断' boxHeight='auto' titleTop='22px' marginTop='9px' backgroundColor='#EAF7FD'>
         <DiagnosticList></DiagnosticList>

src/components/EMRContainer/index.jsx

@@ -41,7 +41,9 @@ class EMRContainer extends Component {
                 <MainSuit></MainSuit>
                 <CurrentIll></CurrentIll>
                 <OtherHistory></OtherHistory>
-                <CheckBody></CheckBody>
+                <div>
+                  <CheckBody></CheckBody>
+                </div>
                 <Inspect></Inspect>
                 <AssistCheck></AssistCheck>
                 <Diagnosis></Diagnosis>

src/components/PreviewBody/index.jsx

@@ -125,7 +125,7 @@ class PreviewBody extends Component {
               }
               {dataJson.advice.commontreatment && dataJson.advice.commontreatment.length > 0 && <p  className={style.pushMessageTitle}><span>一般治疗</span></p>}
               {
-                dataJson.advice.commontreatment && <div className={style.pushMessageDes}>{dataJson.advice.commontreatment}</div>
+                dataJson.advice.commontreatment && <div dangerouslySetInnerHTML={{__html: dataJson.advice.commontreatment}} className={style.pushMessageDes}></div>
               }
               {dataJson.advice.followUp && dataJson.advice.followUp.length > 0 && <p className={style.pushMessageTitle}><span>回访时间：<span className={style['bbtm']}>{dataJson.advice.followUp}</span> 后回访，不适随诊</span></p>}
               {dataJson.advice.scheme && dataJson.advice.scheme.length > 0 && <p className={style.pushMessageTitle}><span>治疗方案</span></p>}

src/utils/tools.js

@@ -241,7 +241,7 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
         store.dispatch({
             type: SET_TIPS,
             tips: {}
-          })
+        })
         store.dispatch({
             type: CLEAR_ALL_DIAG,
             data:[],