6576

src/components/PatInfo/index.jsx

@@ -10,7 +10,6 @@ class PatInfo extends Component {
     super(props)
     this.state = {
       show:false,
-      cover:true,
       name:'',
       sex:'',
       age:'',
@@ -35,12 +34,6 @@ class PatInfo extends Component {
       }
     });
   }
-  componentWillReceiveProps(nextProps){
-    const {patientName,sex,patientAge} = nextProps.patInfo.message;
-    if(!patientName&&!sex&&!patientAge){
-      this.setState({cover:true})
-    }
-  }
   handleName(e){
     let value = e.target.value
     const { setParams } = this.props;
@@ -66,8 +59,6 @@ class PatInfo extends Component {
     this.checkValue(value.trim())
     const { setParams } = this.props;
     setParams({patientAge:value.trim()})
-
-
     this.setState({
       age:value.trim()
     },()=>{
@@ -78,7 +69,8 @@ class PatInfo extends Component {
     const { setParams } = this.props;
     setParams({sex:value,patientSex:value==1?'男':value==2?'女':''})
     this.setState({
-      show:false,sex:value
+      show:false,
+      sex:value
     },()=>{
       this.watchData()
     })
@@ -88,10 +80,10 @@ class PatInfo extends Component {
     this.setState({show:!show})
   }
   watchData(){
-    const {name,age,sex} = this.state
-    const {handlePush,getInitModule} = this.props
-    let allow = this.checkValue(age)
-    if(name&&sex&&age&&allow){
+    const {handlePush,getInitModule,changeCover,patInfo} = this.props
+    const {patientName,sex,patientAge} = patInfo.message
+    let allow = this.checkValue(patientAge)
+    if(patientName&&sex&&patientAge&&allow){
       let stimer = this.state.timer
       clearTimeout(stimer);
       let timer = setTimeout(function(){
@@ -101,10 +93,10 @@ class PatInfo extends Component {
       this.setState({
         timer
       });
-      this.setState({cover:false})
+      changeCover(false)
       getInitModule()
     }else{
-      this.setState({cover:true})
+      changeCover(true)
     }
   }
   checkMsg(){
@@ -123,8 +115,8 @@ class PatInfo extends Component {
     }
   }
   render(){
-    const {message} = this.props.patInfo;
-    const {show,cover,reg} = this.state;
+    const {message,cover} = this.props.patInfo;
+    const {show,reg} = this.state;
      return <table className={style["table"]}>
       {/* <tr>
         <td key='1' className={`${style.tdBorderB} ${style.tdBorderR}`} title={'卡号:' + (message.patientIdNo||'')}>卡号：{message.patientIdNo}</td>
@@ -141,11 +133,11 @@ class PatInfo extends Component {
       <tr>
         <td key='1' className={`${style.tdBorderB} ${style.tdBorderR} ${style.tdBorderOne}`}>
           <span className={style['title']}>姓名：</span>
-          <input type="text" placeholder="请输入" className={style['name']} onChange={(e)=>this.handleName(e)} value={message.patientName}/>
+          <input type="text" placeholder="请输入" className={style['name']} onInput={(e)=>this.handleName(e)} value={message.patientName}/>
         </td>
         <td key='3' className={`${style.tdBorderB} ${style.tdBorderR} ${style.tdBorderTwo}`}>
           <span className={style['title']}>年龄：</span>
-          <input type="text" className={style['age']} style={{"borderColor":reg?'#FF545B':'#E6E6E6'}} placeholder="请输入" onChange={(e)=>this.handleAge(e)} value={message.patientAge}/>
+          <input type="text" className={style['age']} style={{"borderColor":reg?'#FF545B':'#E6E6E6'}} placeholder="请输入" onInput={(e)=>this.handleAge(e)} value={message.patientAge}/>
           <i style={{color:reg?'#FF545B':'#999999',display:reg?'block':'none'}}>* 请输入1-150以内的整数</i>
         </td>
         <td key='2' className={`${style.tdBorderB} ${style.tdBorderR} ${style.tdBorderThree}`}>

src/containers/PatInfoContainer.js

@@ -2,7 +2,7 @@ import React from 'react';
 import {connect} from 'react-redux';
 import {getInitModules} from '@store/async-actions/homePage.js';
 import {initPersonInfo} from '../store/async-actions/patInfo';
-import {SET_PARAMS} from '@store/types/patInfo.js';
+import {SET_PARAMS,CHANGECOVER} from '@store/types/patInfo.js';
 import PatInfo from '../components/PatInfo';
 import {billing} from '@store/async-actions/pushMessage';
 
@@ -26,6 +26,12 @@ function mapDispatchToProps(dispatch) {
         },
         getInitModule:()=>{
             dispatch(getInitModules)
+        },
+        changeCover:(flg)=>{
+            dispatch({
+                type:CHANGECOVER,
+                flg
+            })
         }
 
     }

src/store/actions/patInfo.js

@@ -71,4 +71,9 @@ export const clearMsg=(state,action)=>{
   res.message = tmpObj;
   return res;
 
+}
+export const changeCover=(state,action)=>{
+  const res=Object.assign({},state);
+  res.cover = action.flg;
+  return res;
 }

src/store/reducers/patInfo.js

@@ -1,5 +1,5 @@
-import {GET_PATIENT_MESSAGE,GET_HOSPITAL_MESSAGE,SET_PARAMS,CLEARMSG} from '../types/patInfo';
-import {updatePatientMessage,updateHospitalMessage,setParams,clearMsg} from '../actions/patInfo';
+import {GET_PATIENT_MESSAGE,GET_HOSPITAL_MESSAGE,SET_PARAMS,CLEARMSG,CHANGECOVER} from '../types/patInfo';
+import {updatePatientMessage,updateHospitalMessage,setParams,clearMsg,changeCover} from '../actions/patInfo';
 // age: 28
 // mouduleType: 1
 // relationId: 420671
@@ -32,7 +32,8 @@ const initState = {
       recordId: "",
       systemTime: "",
     },
-    hospitalMsg:{}
+    hospitalMsg:{},
+    cover:true
 };
 export default function(state = initState,action){
   switch(action.type){
@@ -44,6 +45,8 @@ export default function(state = initState,action){
       return setParams(state,action);
     case CLEARMSG:
       return clearMsg(state,action);
+    case CHANGECOVER:
+      return changeCover(state,action);
     default:
       return state;
   }

src/store/types/patInfo.js

@@ -1,4 +1,5 @@
 export const GET_PATIENT_MESSAGE = 'GET_PATIENT_MESSAGE'
 export const GET_HOSPITAL_MESSAGE = 'GET_HOSPITAL_MESSAGE'
 export const SET_PARAMS = 'SET_PARAMS'
-export const CLEARMSG = 'CLEARMSG'
+export const CLEARMSG = 'CLEARMSG'
+export const CHANGECOVER = 'CHANGECOVER'

src/utils/tools.js

@@ -11,7 +11,7 @@ import {ISREAD, SETREADDITEMS,SET_SELECTED_AREA,SET_CURRENT_MODULE} from "../sto
 import {CLEAR_FIRST_MAIN_DIAG, CLEAR_ALL_TREAT} from "../store/types/treat";
 import {tabChange} from '@store/actions/tabTemplate';
 import {CLEAR_ASSESS_RESULT_VALUE} from '@types/assessResult';
-import {CLEARMSG} from '@types/patInfo';
+import {CLEARMSG,CHANGECOVER} from '@types/patInfo';
 import { SET_READ_MODE } from "@store/types/typeConfig";
 import config from '@config/index';
 import up from '@images/up.png';
@@ -225,6 +225,10 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
           type: SET_MR_ANALYSE,
           MRAnalyseResult: []
         })
+        store.dispatch({
+            type:CHANGECOVER,
+            flg:true
+        })
         storageLocal.remove('emrParam');
         document.getElementById('addScrollEvent').scrollIntoView()
        // Notify.success('页面已清空')