Merge branch 'dev5.4.1' into dev/new1

src/components/TemplateItems/index.jsx

@@ -26,7 +26,7 @@ class TemplateItems extends React.Component {
     }  
     componentDidMount(){
         const height = getWindowInnerHeight()-195;
-        this.$cont.current.style.height = height+"px";
+        this.$cont.current.style.height = height/2+"px";
         windowEventHandler('resize', ()=>{
             if(this.$cont.current){
                 const height = getWindowInnerHeight()-195;

src/containers/CheckBody.js

@@ -23,6 +23,7 @@ function mapStateToProps(state){
     span:checkBody.span,
     searchInEnd:checkBody.searchInEnd,      //是否在搜索末尾插入结果
     importLabel:checkBody.importLabel,    //需高亮的标签id
+    typeConfig: state.typeConfig,  //bug2764
   }
 }
 

src/modules/HomePage/index.jsx

@@ -90,6 +90,7 @@ class HomePage extends Component {
             <BodyContainer></BodyContainer>
           <ConfirmModal visible={showPre} okText='是' cancelText='否' confirm={referRecord}  cancel={noReferRecord} close={noReferRecord}>
               <div className={style['confirm-info']}>是否引用预问诊信息？</div>
+              <p className={style.tip}>(引用数据会清除当前内容)</p>
           </ConfirmModal>
           {flag?<div className={style['mask']}>
                 <img src={loading} className={style['load']}/>

src/modules/HomePage/index.less

@@ -23,5 +23,9 @@
     text-align: center;
     font-size: 16px;
     padding-top: 10px;
-    padding-bottom: 50px;
+    padding-bottom: 10px;
+}
+.tip {
+    text-align: center;
+    padding-bottom: 30px;
 }

src/utils/tools.js

@@ -230,6 +230,49 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
           data:reData.checkBody,
           isText:true,    //查体只显示文本
       });
+      store.dispatch({type:SETREADDITEMS});     //清空已存的血压加号项
+        store.dispatch(clearAssistData([],'',[]));
+        store.dispatch(clearAllLabel([],[],''));
+        store.dispatch({
+            type: SET_TIPS,
+            tips: {}
+        })
+        store.dispatch({
+            type: CLEAR_ALL_DIAG,
+            data:[],
+            saveText:'',
+            mainSuitStr: '',
+            chronicMagItem:null
+        });
+        store.dispatch({
+            type: CLEAR_ALL_PUSH_MESSAGE,
+            data:{},
+            saveText:'',
+        });
+        store.dispatch({
+          type:CLEAR_FIRST_MAIN_DIAG,
+          flag:true
+        });
+        store.dispatch({
+          type: CLEAR_ALL_TREAT,
+        });
+        //清空已选的指标推送数据及填的值
+        store.dispatch({
+          type: CLEAR_ASSESS_RESULT_VALUE,
+        });
+        store.dispatch({//推送重置
+          type: BILLING_ADVICE,
+          determine:[],
+          doubt:[],
+          possible:[],
+          vigilant: [],
+          likely:[],
+          lab: [],
+          pacs:[],
+          setPushEmergency:{},
+          setPushEmergencyIdx:''
+        });
+        storageLocal.remove('emrParam');
     }else{
         let dataJson = JSON.parse(reData.dataJson);
         const docConfig = dataJson.docConfigs;