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

src/components/Banner/index.jsx

@@ -37,7 +37,7 @@ class Banner extends Component {
       emergencyBox:false,
       showHos:false,
       showM:false,
-      hosName:"杭州朗通信息技术有限公司",
+      hosName:"",
       hosId:"-1",
       hosNameTmp:"",
       hosIdTmp:"-1",
@@ -215,7 +215,7 @@ class Banner extends Component {
           </div>:null} */}
           <div className={style["showHospitalLis"]} onClick={showHospitalLis} id="showHospitalLis">
             <p className={`${style["selectedHos"]}`}>
-              <span className={style["ellipsis"]} title={curHos.hosName}>{curHos.hosName}</span>
+              <span className={style["ellipsis"]} title={curHos.hosName||hospitalMsg[0].name}>{curHos.hosName||hospitalMsg[0].name}</span>
               <i style={{color:curHos.connect==1?'#3B9ED0':'#FF545B'}} onClick={(e)=>{showConnect(e)}}><img src={left3}/>{curHos.connect==1?'术语已关联':'术语未关联'}</i>
               <img className={style['bannerDown']} src={bannerDown} />
             </p>

src/components/PatInfo/Select/index.jsx

@@ -72,19 +72,26 @@ export default class Select extends Component {
   };
 
   onChange(e, val) {
-    const state = store.getState();
+    const sex = e.target.innerHTML
+    let obj = {
+      label: 'patientSex',
+      id: 'patientSex',
+      value: sex=='男'?1:2,
+      title: '性别',
+      maxlength: 11
+    }
     e.stopPropagation()
     this.setState({
-      value: val,
+      value: obj,
       isOpen: false
     });
-    this.props.onChange(val);
+    this.props.onChange(obj);
     store.dispatch({
       type: CLEARMENSTRUATIONTEXTDATA,
     });
 
     store.dispatch(embedPush({
-      action: "patientia",
+      action: "info",
       mode: 1
     }))
   };

src/components/PatInfo/index.jsx

@@ -128,7 +128,7 @@ class PatInfo extends Component {
       clearTimeout(tempTimer)
       let timer =setTimeout(() => {
         store.dispatch(embedPush({
-          action: "patientia",
+          action: "info",
           mode: 1
         }))
         clearTimeout(tempTimer)
@@ -145,7 +145,7 @@ class PatInfo extends Component {
     let newInfo = Object.assign([], patientInfo);
     newInfo[3] = item
     this.setState({
-      patientInfo: newInfo
+      patientInfo: 'newInfo'
     })
     initPatInfoData && initPatInfoData(newInfo)
   }

src/containers/PatInfoContainer.js

@@ -14,6 +14,7 @@ function mapDispatchToProps(dispatch) {
             dispatch(initPersonInfo)
         },
         initPatInfoData: (params) =>{
+            // console.log(params,11111)
             dispatch({
                 type: SETINITPATINFO,
                 params

src/store/reducers/homePage.js

@@ -39,7 +39,7 @@ const initState = {
   }],
   curHos:{
     hosId:-1,
-    hosName:'杭州朗通信息技术有限公司',
+    hosName:'',
     connect:1
   }
 

src/utils/config.js

@@ -17,7 +17,7 @@ const imageUrlPrefix = 'http://192.168.2.241:82';
 function geturl(){
     if(window.location.href.indexOf('localhost')>-1){
         return {
-            gourl:'http://localhost:8083/cdss.html',
+            gourl:'http://localhost:8081/cdss.html',
             // gourl:'http://192.168.2.241:5654/cdss.html',
             imgurl:host.replace('6060','22')
         }

src/utils/tools.js

@@ -1226,7 +1226,7 @@ function timestampToTime(timestamp) {     //excel导入2019年5月1日会转换
   var date = new Date(timestamp);//时间戳为10位需*1000，时间戳为13位的话不需乘1000
   var Y = date.getFullYear() + '-';
   var M = (date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1) : date.getMonth()+1) + '-';
-  var D = date.getDate() + ' ';
+  var D = (date.getDate() < 10 ? '0'+(date.getDate()) : date.getDate()) + ' ';
   var h = date.getHours() + ':';
   var m = date.getMinutes() + ':';
   var s = date.getSeconds();