bug2815,2814

src/components/Inspect/index.jsx

@@ -221,7 +221,7 @@ class Inspect extends React.Component {
         <div className={styles.top}>
           <span id="inspectResultData" className={setFontColorSize(2,5)}>化验结果数据</span>
           {/* <div className={this.getStyle()} onClick={ieVersion&&ieVersion<=9?null:this.handleImportExcel}> */}
-          <div className={this.getStyle()} style={{ display: hospitalMsg.import_way_lis == 0 ? 'none' : 'block' }}>
+          <div className={this.getStyle()} style={{ display: hospitalMsg.import_way_lis == 0||hospitalMsg.import_way_lis ==undefined ? 'none' : 'block' }}>
             {/* <button disabled={ieVersion&&ieVersion>9?true:false}onClick={ieVersion && ieVersion <= 9 ? null : this.handleImportExcel}>导入化验结果</button>
             <input accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel" type="file" name="uploadfile" id="choose" style={{ display: 'none' }} ref={(DOM) => this.inputRef = DOM} /> */}
             {/* {0没有，1本地，2医院，3本地和医院} */}

src/components/PreInIcss/RotateImg/index.jsx

@@ -31,9 +31,6 @@ class RotateImg extends Component {
     this.handlePlus = this.handlePlus.bind(this)
     this.handleReduce = this.handleReduce.bind(this)
   }
-  componentWillReceiveProps(next){
-    console.log(next.windowHeight,this.props.windowHeight)
-  }
   componentDidMount(){
     imgDragMove('add')
     const { idx,imgLis,windowHeight } = this.props;

src/components/PreInIcss/index.jsx

@@ -21,7 +21,7 @@ class PreIcss extends Component {
           data.map((item,index)=>{
             return <div className={style.mainPre}>
               <ul>
-                <li><span>预问诊录入时间：</span>{item.gmtCreate}</li>
+                <li><span>预问诊录入时间：</span>{item.gmtModified}</li>
                 <li><span>录入选择医院：</span>{item.sonHospitalName?item.sonHospitalName:item.hospitalName}</li>
                 <li><span>科室：</span>{item.hospitalDeptName}</li>
                 <li><span>主诉：</span>{item.detail.chiefComplaint}</li>

src/components/PreInIcss/index.less

@@ -45,6 +45,7 @@
       }
       .curStyle {
         padding: 0 0 5px 0;
+        line-height: 18px;
       }
       .slideTgl {
         line-height: 18px;