Merge branch 'dev5.4.1' of http://192.168.2.236:10080/zhouna/newICSS into dev5.4.1

src/common/components/Textarea/index.jsx

@@ -112,11 +112,11 @@ class Textarea extends Component {
     return flg;
   }
   handleBlur(e){
-    const {saveChronic} = this.props;
-    const text = e.target.innerText || e.target.innerHTML;
+    //const {saveChronic} = this.props;
+    //const text = e.target.innerText || e.target.innerHTML;
     //解除绑定事件
     $(this.$dom.current).off("paste");
-    getFeature(text).then((res)=>{
+    /*getFeature(text).then((res)=>{
       if(res.data.code==0){
         const result = res.data.data;
         // 慢病
@@ -127,7 +127,7 @@ class Textarea extends Component {
           }
         }
       }
-    })
+    })*/
   }
   handleKeydown(e){
     const {boxMark} = this.props;

src/components/DiagnosticList/index.jsx

@@ -315,7 +315,7 @@ class DiagnosticList extends Component {
                                           onClick={() =>{this.showTreat(item, index)}}>
                                           治疗方案
                                     </span>
-                                    {isChronic&&index===0?<span className={style['assess']}
+                                    {isChronic&&index===0&&item.conceptId===chronicMagItem.conceptId?<span className={style['assess']}
                                           onClick={this.showAssessFn.bind(this,item)}>
                                         管理评估
                                     </span>:''}

src/components/MainSuit/index.jsx

@@ -272,7 +272,7 @@ class MainSuit extends Component{
       }
   }*/
   render(){
-    const {saveChronic,readMode,type,CommonSymptoms,searchData,fetchPushInfos,isRead,totalHide,handleInput,fuzhen,saveText,editClear,datas,commSymHide} = this.props;
+    const {readMode,type,CommonSymptoms,searchData,fetchPushInfos,isRead,totalHide,handleInput,fuzhen,saveText,editClear,datas,commSymHide} = this.props;
     const {symptom,boxLeft,boxTop} = this.state;
     const symptomFlag = CommonSymptoms.length>0 ? true : false;
     const searchFlag = searchData.length>0 ? true : false;
@@ -280,7 +280,7 @@ class MainSuit extends Component{
     const boxLeft1 = datas.length>0?boxLeft:85;
     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} />;
+      return <Textarea title='主诉' boxMark='1' isRead={isRead} value={saveText[0]} handlePush={fetchPushInfos} handleInput={handleInput} />;
     }
     return  <div className={style['main-suit']}>
       <ItemBox

src/components/MedicalInfo/Filters/index.jsx

@@ -19,7 +19,7 @@ class Filters extends Component {
     })
   }
   render() {
-    return <div className={style["filters"]}>
+    return <div className={style["filters"]} id='medicalInfoFilter'>
               {this.drawItem()}
             </div>
 

src/components/MedicalInfo/index.jsx

@@ -142,7 +142,7 @@ class MedicalInfo extends Component {
               <div className={style['search-box']}>
                 <p className={style['cont']}>
                   <input placeholder="医学知识搜索" type="text" className={style['input']} ref={this.$inp} onInput={this.handleChange} onKeyUp={this.handleEnter}/>
-                  {val?<img src={delIcon} alt="清空" onClick={this.clear}/>:''}
+                  {val?<img src={delIcon} id='clearMedicalInfoSearch' alt="清空" onClick={this.clear}/>:''}
                   <button onClick={this.search}>搜索</button>
                 </p>
                 <Filters data ={filterList} checkeds={typeChecks} handleCheck={this.handleTypeCheck}></Filters>

src/components/Operation/index.jsx

@@ -96,7 +96,9 @@ class Operation extends Component {
     let jsonData = getAllDataList(baseList);
     let jsonStr = getAllDataStringList(baseList);
     let flg = isAllPartClear(jsonData,jsonStr,baseList);
-    if(flg){
+    const tpVal = $("#clearTemplateSearch").prev().val();   //模板是否有搜索条件未清空
+    const mdVal = $("#clearMedicalInfoSearch").prev().val();    //知识是否有搜索条件未清空
+    if(flg||tpVal||mdVal){
       this.setState({
         type: type,
         okText: '清除',

src/components/TemplateItems/index.jsx

@@ -125,7 +125,7 @@ class TemplateItems extends React.Component {
                         <div className={style.wrapperTop}>
                             <div className={style.templateSearch}>
                                 <input placeholder="模板搜索" maxLength="30" ref={this.$search} type="text" onInput={this.handleChange} onPropertyChange={this.handleChange} onKeyUp={this.handleEnter}/>
-                                {this.state.val?<img src={delIcon} alt="清空" onClick={this.clear}/>:''}
+                                {this.state.val?<img src={delIcon} id='clearTemplateSearch' alt="清空" onClick={this.clear}/>:''}
                                 <div className={style.search} onClick={this.templateSearch}>搜索</div>
                             </div>
                             {

src/containers/CheckBody.js

@@ -9,6 +9,7 @@ import {didPushParamChange,filterDataArr} from '@utils/tools.js';
 function mapStateToProps(state){ 
   const {homePage,mainSuit,checkBody,diagnosticList} = state;
   const hasMain = filterDataArr(mainSuit.saveText);//||mainSuit.data.length;
+  let diagnC = diagnosticList.chronicMagItem;
   return {
     data:checkBody.data,
     defaultShowAll:checkBody.showAll,
@@ -24,7 +25,7 @@ function mapStateToProps(state){
     searchInEnd:checkBody.searchInEnd,      //是否在搜索末尾插入结果
     importLabel:checkBody.importLabel,    //需高亮的标签id
     typeConfig: state.typeConfig,  //bug2764
-    isChronic:!!diagnosticList.chronicMagItem,
+    isChronic:diagnC?diagnC:state.mainSuit.chronicDesease,
   }
 }
 

src/utils/tools.js

@@ -165,6 +165,10 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
         store.dispatch({type:SETREADDITEMS});     //清空已存的血压加号项
         store.dispatch(clearAssistData([],'',[]));
         store.dispatch(clearAllLabel([],[],''));
+        //右侧搜索条件清空
+        $("#clearTemplateSearch,#clearMedicalInfoSearch,#medicalInfoFilter:first-child").click();
+        //tab跳回辅助信息
+        store.dispatch(tabChange('0'));
         store.dispatch({
             type: SET_TIPS,
             tips: {}
@@ -285,6 +289,10 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
           if(type == 'template'){        //结构化模板回读
               let dataJsonStr = JSON.parse(reData.preview);
                 // console.log(dataJson,dataJsonStr,'结构化模板引用')
+                //清空已选的指标推送数据及填的值
+                store.dispatch({
+                  type: CLEAR_ASSESS_RESULT_VALUE,
+                });
                 store.dispatch({
                     type: CLEAR_MAIN_SUIT,
                     data:dataJson.chief,
@@ -347,6 +355,10 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
               store.dispatch(tabChange('0'));
             }else{    //结构化历史病历回读
                 let dataJsonStr = reData.detailList;
+                //清空已选的指标推送数据及填的值
+                store.dispatch({
+                  type: CLEAR_ASSESS_RESULT_VALUE,
+                });
                 store.dispatch({
                     type: CLEAR_MAIN_SUIT,
                     data:dataJson.chief,