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

# Conflicts:
#	src/components/CurrentIll/index.jsx
#	src/components/MainSuit/index.jsx
#	src/components/OtherHistory/index.jsx

src/components/CurrentIll/index.jsx

@@ -128,7 +128,7 @@ class CurrentIll extends Component{
     const {hasMain,readMode,fuzhen,isChronic,type,fetchPushInfos,handleInput,isRead,saveText,searchData,totalHide,editClear,data} = this.props;
     const {forbidInput,boxLeft,boxTop} = this.state;
     const searchFlag = searchData.length > 0 ? true : false;
-    const mode = !readMode||readMode===-1?type:readMode;
+    const mode = readMode===null||readMode===-1?type:readMode;
     if(+mode===1){      //文本模式
       return <Textarea  title='现病史' boxMark='2'
                         isRead={isRead}

src/components/MainSuit/index.jsx

@@ -259,7 +259,7 @@ class MainSuit extends Component{
     const searchFlag = searchData.length>0 ? true : false;
     const boxTop1 = datas.length>0?boxTop:45;
     const boxLeft1 = datas.length>0?boxLeft:85;
-    const mode = !readMode||readMode===-1?type:readMode;
+    const mode = readMode===null||readMode===-1?type:readMode;
     if(+mode===1){      //文本模式
       return <Textarea title='主诉' boxMark='1' saveChronic={saveChronic} isRead={isRead} value={saveText[0]} handlePush={fetchPushInfos} handleInput={handleInput} />;
     }

src/components/OtherHistory/index.jsx

@@ -58,7 +58,7 @@ class OtherHistory extends Component{
   render(){
     const {readMode,hasMain,totalHide,searchData,isRead,type,fetchPushInfos,handleInput,saveText} = this.props;
     const {boxLeft,boxTop} = this.state;
-    const mode = !readMode||readMode===-1?type:readMode;
+    const mode = readMode===null||readMode===-1?type:readMode;
     //智能模式有数据时不切换文本，文本模式有数据时不切换智能
     if(+mode===1){      //文本模式
       return <Textarea title='其他史' boxMark='3'