参数获取去掉多余接口

src/components/AssistCheck/index.jsx

@@ -179,12 +179,12 @@ class AssistCheck extends React.Component {
                         <p id="importPacBtn" className={styles.importInspectBtn}>导入辅检结果</p>
                     </div> */}
                     {
-                      hospitalMsg.value == 1 ? <div className={styles.pushButton} disabled={ieVersion && ieVersion > 9 ? true : false} onClick={ieVersion && ieVersion <= 9 ? null : this.handleImportExcel}>
+                      hospitalMsg.import_way_pacs == 1 ? <div className={styles.pushButton} disabled={ieVersion && ieVersion > 9 ? true : false} onClick={ieVersion && ieVersion <= 9 ? null : this.handleImportExcel}>
                         导入化验结果
                         <input type="file" name="uploadfile" id="choose" style={{ display: 'none' }} ref={(DOM) => this.inputRef = DOM} />
-                      </div> : hospitalMsg.value == 2 ? <div className={styles.pushButton} disabled={ieVersion && ieVersion > 9 ? true : false} onClick={checkSystemIpt}>
+                      </div> : hospitalMsg.import_way_pacs == 2 ? <div className={styles.pushButton} disabled={ieVersion && ieVersion > 9 ? true : false} onClick={checkSystemIpt}>
                         检查系统导入
-                      </div> : hospitalMsg.value == 3 ? <div className={`${styles.pushButton} ${styles.importInspect}`} onClick={showSlideImport}>
+                      </div> : hospitalMsg.import_way_pacs == 3 ? <div className={`${styles.pushButton} ${styles.importInspect}`} onClick={showSlideImport}>
                         <p id="importExcelBtns" className={styles.importInspectBtn}>导入化验结果</p>
                         {
                           importLis?<ul className={styles.importSelect} id="importExcelLists">

src/components/Inspect/index.jsx

@@ -205,18 +205,18 @@ class Inspect extends React.Component {
         <div className={styles.top}>
           <span id="inspectResultData">化验结果数据</span>
           {/* <div className={this.getStyle()} onClick={ieVersion&&ieVersion<=9?null:this.handleImportExcel}> */}
-          <div className={this.getStyle()} style={{ display: hospitalMsg.value == 0 ? 'none' : 'block' }}>
+          <div className={this.getStyle()} style={{ display: hospitalMsg.import_way_lis == 0 ? '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本地和医院} */}
             {
-              hospitalMsg.value == 1 ? <div className={styles.pushButton} disabled={ieVersion && ieVersion > 9 ? true : false} onClick={ieVersion && ieVersion <= 9 ? null : this.handleImportExcel}>
+              hospitalMsg.import_way_lis == 1 ? <div className={styles.pushButton} disabled={ieVersion && ieVersion > 9 ? true : false} onClick={ieVersion && ieVersion <= 9 ? null : this.handleImportExcel}>
                 <p className={styles.importInspectBtn}>导入化验结果</p>
                 <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} />
-              </div> : hospitalMsg.value == 2 ? <div className={styles.pushButton} disabled={ieVersion && ieVersion > 9 ? true : false} onClick={checkSystemIpt}>
+              </div> : hospitalMsg.import_way_lis == 2 ? <div className={styles.pushButton} disabled={ieVersion && ieVersion > 9 ? true : false} onClick={checkSystemIpt}>
                 <p className={styles.importInspectBtn}>导入化验结果</p>
-              </div> : hospitalMsg.value == 3 ? <div className={`${styles.pushButton} ${styles.importInspect}`} onClick={showSlideImport}>
+              </div> : hospitalMsg.import_way_lis == 3 ? <div className={`${styles.pushButton} ${styles.importInspect}`} onClick={showSlideImport}>
                 <p id="importInspectBtn" className={styles.importInspectBtn}>导入化验结果</p>
                 {
                   <ul className={styles.importSelect} style={{display:importLis?'block':'none'}} id="importList">

src/components/WrapModalBody/index.less

@@ -155,8 +155,8 @@
         max-width: 116px;
       }
       td.trd {
-        // width: 215px;
-        // max-width: 215px;
+        width: 192px;
+        max-width: 192px;
         // cursor: pointer;
       }
       td.four {
@@ -200,9 +200,8 @@
         max-width: 59px;
       }
       td.trd {
-        // width: 215px;
-        // max-width: 215px;
-        cursor: default;
+        width: 192px;
+        max-width: 192px;
       }
       td.four {
         width: 87px;
@@ -247,16 +246,17 @@
     table {
       border-collapse: collapse;
       tr {
-        height: 40px;
-        line-height: 40px;
+        height: 24px;
+        line-height: 24px;
         text-align: center;
         td {
-          overflow: hidden;
-          text-overflow: ellipsis;
-          white-space: nowrap;
+          // overflow: hidden;
+          // text-overflow: ellipsis;
+          // white-space: nowrap;
           border: 1px solid #E7EAEB;
-          padding: 0 5px;
+          padding: 8px 5px;
           box-sizing: border-box;
+          vertical-align: middle;
         }
       }
       .head {

src/components/WrapModalBodyPac/index.less

@@ -155,9 +155,8 @@
         max-width: 100px;
       }
       td.trd {
-        width: 112px;
-        max-width: 112px;
-        cursor: pointer;
+        width: 95px;
+        max-width: 95px;
       }
       td.four {
         width: 80px;
@@ -215,9 +214,8 @@
         max-width: 100px;
       }
       td.trd {
-        // width: 215px;
-        // max-width: 215px;
-        cursor: default;
+        width: 95px;
+        max-width: 95px;
       }
       td.four {
         width: 100px;
@@ -253,18 +251,18 @@
     }
     table {
       tr {
-        height: 40px;
-        line-height: 40px;
+        height: 24px;
+        line-height: 24px;
         text-align: center;
+        border-collapse: collapse;
         td {
-          border-collapse: collapse;
           // overflow: hidden;
           // text-overflow: ellipsis;
           // white-space: nowrap;
           border: 1px solid #E7EAEB;
-          padding: 0 5px;
+          padding: 8px 5px;
           box-sizing: border-box;
-          // line-height: 24px;
+          vertical-align: middle;
         }
       }
       .head {

src/containers/AssistCheck.js

@@ -17,7 +17,7 @@ function mapStateToProps(state) {//console.log(state.assistCheck)
         assistList:state.homePage.assistList,
         assistVal:state.assistCheck.assistVal,
         windowHeight:state.homePage.windowHeight,
-        hospitalMsg: state.patInfo.hospitalMsg.pacs || {},
+        hospitalMsg: state.homePage.sysConfig || {},
 
         message: state.patInfo.message,
         hospitalPac: state.assistCheck.hospitalPac,

src/containers/Inspect.js

@@ -38,7 +38,8 @@ function mapStateToProps(state) {//console.log(state.inspect)
     windowHeight: state.homePage.windowHeight,
     inspectVal: state.inspect.inspectVal,
     message: state.patInfo.message,
-    hospitalMsg: state.patInfo.hospitalMsg.lis || {},
+
+    hospitalMsg: state.homePage.sysConfig || {},
     hospitalInspect: state.inspect.hospitalInspect,
     hospitalSonInspect: state.inspect.hospitalInspectObj,
     allCheck: state.inspect.allCheck,

src/store/async-actions/patInfo.js

@@ -124,7 +124,7 @@ export async function getPatientMessage(dispatch, getState){
   dispatch(getCommonList(5));     //获取常用化验标签列表
   dispatch(getCommonList(6));     //获取常用辅检标签列表if(allModules.length == 0){//模板为空才回读
   dispatch(initHistoryDetails());      //历史病历回读
-  initHospitalInfo(dispatch, getState)
+  // initHospitalInfo(dispatch, getState) //不需要的
 }
 
 /*