文字修改

src/common/components/Add/index.jsx

@@ -4,7 +4,7 @@ import classNames from 'classnames';
 import more from '@common/images/addItem1.png';
 
 /**
-添加组件，如添加化验项
+添加组件，如添加检验项
 
 **/
 

src/common/components/DelToast/index.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import style from './index.less';
 /**
-* 化验辅检删除弹窗 @Liucf 2019-5-22
+* 检验检查删除弹窗 @Liucf 2019-5-22
 * 接收参数：
 * show：展示组件
 * name：删除项的名称

src/common/components/ItemBox/index.jsx

@@ -43,7 +43,7 @@ class ItemBox extends Component {
     const checkBodyIsNull = state.checkBody.saveText.length === 0
     handleClick && handleClick(e);//为了获取鼠标位置，显示搜索结果框；
     hideAllDrop&&hideAllDrop();
-    if((title=='化验'|| title=='辅检'|| title=='诊断' || title=='医嘱'||title == '现病史' &&  currentIllIsNull || title == '查体' &&  checkBodyIsNull)&& moduleName != title) {
+    if((title=='检验'|| title=='检查'|| title=='诊断' || title=='医嘱'||title == '现病史' &&  currentIllIsNull || title == '查体' &&  checkBodyIsNull)&& moduleName != title) {
       store.dispatch({
         type: SET_CURRENT_MODULE,
         moduleName:title

src/components/AddAssistCheck/index.jsx

@@ -119,9 +119,13 @@ class AddAssistCheck extends React.Component {
       active: idx
     })
   }
+  handleSign(item,idx){
+    const { handleSign,handlePush } = this.props;
+    handleSign(item,idx)
+    handlePush && handlePush({mode:8});       //右侧推送
+  }
 
   getSearchList(list) {      //搜索列表
-    const { handleSign } = this.props;
     const contStyle={
       opacity:'0.4',
       right:'0',
@@ -146,7 +150,7 @@ class AddAssistCheck extends React.Component {
             title={item.name}
             onClick={() => {
               this.props.setHighter(48)
-              handleSign(item,'search');
+              this.handleSign(item,'search');
               this.setState({ show: false })
             }}
           >
@@ -166,7 +170,7 @@ class AddAssistCheck extends React.Component {
             title={item.name}
             onClick={() => {
               this.props.setHighter(48)
-              handleSign(item.conceptId, idx,'common');
+              this.handleSign(item.conceptId, idx,'common');
               this.setState({ show: false })
             }}
           >
@@ -275,12 +279,12 @@ class AddAssistCheck extends React.Component {
       <div className={styles.wrapper}>
         {this.getAssistLabel()}
         <div id="searchWrapAssist" style={{ position: "relative", clear: 'both' }}>
-          <Add showText="添加辅检项" handleClick={(e) => this.handleSearchShow(e)} id="assistCheck" />
+          <Add showText="添加检查项" handleClick={(e) => this.handleSearchShow(e)} id="assistCheck" />
           {this.state.show ? <SearchOption windowHeight={windowHeight} refreshScroller={refreshScroller }  pageTop={pageTop} height={280} handleChangeValue={handleChangeValue} visible={true}>
             {list && list.length>0?this.getSearchList(list):(assistVal == ''?'':<p style={{padding:'42px 30px',color:'#bfbfbf'}}>暂无筛选项</p>)}
             {/* {
               (list && list.length>0) || (assistVal != '') || (assistList&&assistList.length==0)?'':<div>
-                <p style={{padding:'5px 30px',color:'#bfbfbf'}}>常用辅检项</p>
+                <p style={{padding:'5px 30px',color:'#bfbfbf'}}>常用检查项</p>
                 {assistList.length>6?<ScrollArea speed={0.8}
                             horizontal={false}
                             stopScrollPropagation={true}

src/components/AddInspect/SlideExcel/index.jsx

@@ -58,7 +58,7 @@ class SlideExcel extends Component {
               <td style={{ width: '25%' }}>
                 {normalVal(value.min, value.max)}
               </td>
-              <td style={{ width: '25%' }}>{value.time == '' ? ('导入时间: ' + dateTime) : '化验时间: ' + this.toTime(value.time)}</td>
+              <td style={{ width: '25%' }}>{value.time == '' ? ('导入时间: ' + dateTime) : '检验时间: ' + this.toTime(value.time)}</td>
             </tr>
           })) : (item.lisExcelItem && item.lisExcelItem.map((value, idx) => {
             if (idx < 4) {
@@ -77,7 +77,7 @@ class SlideExcel extends Component {
                 <td style={{ width: '25%' }}>
                   {normalVal(value.min, value.max)}
                 </td>
-                <td style={{ width: '25%' }}>{value.time == '' ? ('导入时间: ' + dateTime) : '化验时间: ' + this.toTime(value.time)}</td>
+                <td style={{ width: '25%' }}>{value.time == '' ? ('导入时间: ' + dateTime) : '检验时间: ' + this.toTime(value.time)}</td>
               </tr>
             }
           }))

src/components/AddInspect/SlidePic/index.jsx

@@ -123,7 +123,7 @@ class SlideSelect extends Component {
     handleFillShow(e,idx);
     //弹窗高度超出屏幕，增加页面高度
     setPosition(e,"#inspectFill",setHighter);
-    /*setTimeout(function(){//如果化验下面有很多数据，则会跳过头
+    /*setTimeout(function(){//如果检验下面有很多数据，则会跳过头
       refreshScroller()&&refreshScroller().scrollYTo(290);
     })*/
   }
@@ -149,13 +149,17 @@ class SlideSelect extends Component {
     const {canEdit,activeInd,activeName,value,style} = this.state;
     return (
       item.flg == 1?<li key={item.uniqueName+idx} className={`${styles.slideLi} clearfix`}> 
-          <img className={styles.imgCheck} src={item.check?checkOn:checkOff} onClick={()=>this.checkOnOff(item)} alt=""/>
-          <span className={styles.bigname}>{item.uniqueName}</span>
-          <span className={styles.smallname}></span>
-          <span className={styles.edit}></span>
-          <span className={styles.maxmin}></span>
-          <span className={styles.pass}>化验时间：{item.time}</span>
-          <span id="addClose" className={styles.partDel} onClick={()=>{this.handleDel(item.time)}}></span>
+          <table>
+            <tr>
+              <img className={styles.imgCheck} src={item.check?checkOn:checkOff} onClick={()=>this.checkOnOff(item)} alt=""/>
+              <span className={styles.bigname}>{item.uniqueName}</span>
+              <span className={styles.smallname}></span>
+              <span className={styles.edit}></span>
+              <span className={styles.maxmin}></span>
+              <span className={styles.pass}>检验时间：{item.time}</span>
+              <span id="addClose" className={styles.partDel} onClick={()=>{this.handleDel(item.time)}}></span>
+            </tr>
+          </table>
           <DelToast show={time==item.time&&activeInd?true:false}
                     name={activeName} 
                     right={'-34px'}
@@ -179,7 +183,7 @@ class SlideSelect extends Component {
               /><img style={{display:style==1||style==2?'inline-block':'none'}} src={style==1?down:style==2?up:''} />{item.units}
           </span>
           <span className={styles.maxmin}>{normalVal(item.minValue,item.maxValue)}</span>
-          <span className={styles.pass}>化验时间：{item.time}</span>
+          <span className={styles.pass}>检验时间：{item.time}</span>
           <span id="addClose" className={styles.partDel} onClick={()=>{this.handleDel(item.time)}}></span>
           <DelToast show={time==item.time&&activeInd?true:false}
                     name={activeName}

src/components/AddInspect/SlideSelect/index.jsx

@@ -90,7 +90,7 @@ class SlideSelect extends Component {
     handleFillShow(e,idx);
     //弹窗高度超出屏幕，增加页面高度
     setPosition(e,"#inspectFill",setHighter);
-    /*setTimeout(function(){//如果化验下面有很多数据，则会跳过头
+    /*setTimeout(function(){//如果检验下面有很多数据，则会跳过头
       refreshScroller()&&refreshScroller().scrollYTo(290);
     })*/
   }
@@ -156,7 +156,7 @@ class SlideSelect extends Component {
                                     <td style={{width:'25%'}}>
                                       {val.questionDetailList.length > 0?'':normalVal(val.minValue,val.maxValue)}
                                     </td>
-                                    <td style={{width:'25%'}}>{'化验时间:'+item.time}</td>
+                                    <td style={{width:'25%'}}>{'检验时间:'+item.time}</td>
                                 </tr>
                             }
                         })):(item.details.map((val)=>{
@@ -174,7 +174,7 @@ class SlideSelect extends Component {
                                     <td style={{width:'25%'}}>
                                         {val.questionDetailList.length > 0?'':normalVal(val.minValue,val.maxValue)}
                                     </td>
-                                    <td style={{width:'25%'}}>{'化验时间:'+item.time}</td>
+                                    <td style={{width:'25%'}}>{'检验时间:'+item.time}</td>
                                 </tr>
                               }
                           }

src/components/AddInspect/index.jsx

@@ -253,8 +253,12 @@ class Inspect extends React.Component {
       }
     </ul>
   }
+  handleSign(item,idx){
+    const { handleSign,handlePush } = this.props;
+    handleSign(item,idx)
+    handlePush && handlePush({mode:8});       //右侧推送
+  }
   getSearchList(list) {//搜索列表
-    const { handleSign } = this.props;
     const contStyle={
       opacity:'0.4',
       right:'0',
@@ -279,7 +283,7 @@ class Inspect extends React.Component {
             title={item.uniqueName}
             onClick={() => {
               this.props.setHighter(48)
-              handleSign(item, idx, 'search');
+              this.handleSign(item, idx, 'search');
               this.setState({ show: false })
             }}
           >
@@ -299,7 +303,7 @@ class Inspect extends React.Component {
             title={item.name}
             onClick={() => {
               this.props.setHighter(48)
-              handleSign(item.questionId, idx, 'common');
+              this.handleSign(item.questionId, idx, 'common');
               this.setState({ show: false })
             }}
           >
@@ -370,12 +374,12 @@ class Inspect extends React.Component {
           </ul>
         </div>
         <div style={{ position: "relative", clear: "both", top: "5px" }}>
-          <Add showText="添加化验项" handleClick={(e) => this.handleSearchShow(e)} id="searchWrap" />
+          <Add showText="添加检验项" handleClick={(e) => this.handleSearchShow(e)} id="searchWrap" />
           {this.state.show ? <SearchOption searchType="1" detailClick={detailClick} windowHeight={windowHeight} height={280} refreshScroller={refreshScroller} pageTop={pageTop} handleChangeValue={handleChangeValue} visible={true}>
             {list && list.length > 0 ? this.getSearchList(list) : (inspectVal == '' ? '' : <p style={{ padding: '5px 30px', color: '#bfbfbf' }}>暂无筛选项</p>)}
             {/* {
               (list && list.length > 0) || (inspectVal != '') || (inspectList&&inspectList.length==0) ? '' : <div>
-                <p style={{ padding: '5px 30px', color: '#bfbfbf' }}>常用化验项</p>
+                <p style={{ padding: '5px 30px', color: '#bfbfbf' }}>常用检验项</p>
                 <ScrollArea speed={0.8}
                             horizontal={false}
                             stopScrollPropagation={true}

src/components/AddInspectCopy/SlideExcel/index.jsx

@@ -58,7 +58,7 @@ class SlideExcel extends Component {
               <td style={{ width: '25%' }}>
                 {normalVal(value.min, value.max)}
               </td>
-              <td style={{ width: '25%' }}>{value.time == '' ? ('导入时间: ' + dateTime) : '化验时间: ' + this.toTime(value.time)}</td>
+              <td style={{ width: '25%' }}>{value.time == '' ? ('导入时间: ' + dateTime) : '检验时间: ' + this.toTime(value.time)}</td>
             </tr>
           })) : (item.lisExcelItem && item.lisExcelItem.map((value, idx) => {
             if (idx < 4) {
@@ -77,7 +77,7 @@ class SlideExcel extends Component {
                 <td style={{ width: '25%' }}>
                   {normalVal(value.min, value.max)}
                 </td>
-                <td style={{ width: '25%' }}>{value.time == '' ? ('导入时间: ' + dateTime) : '化验时间: ' + this.toTime(value.time)}</td>
+                <td style={{ width: '25%' }}>{value.time == '' ? ('导入时间: ' + dateTime) : '检验时间: ' + this.toTime(value.time)}</td>
               </tr>
             }
           }))

src/components/AddInspectCopy/SlideSelect/index.jsx

@@ -90,7 +90,7 @@ class SlideSelect extends Component {
     handleFillShow(e,idx);
     //弹窗高度超出屏幕，增加页面高度
     setPosition(e,"#inspectFill",setHighter);
-    /*setTimeout(function(){//如果化验下面有很多数据，则会跳过头
+    /*setTimeout(function(){//如果检验下面有很多数据，则会跳过头
       refreshScroller()&&refreshScroller().scrollYTo(290);
     })*/
   }
@@ -176,7 +176,7 @@ class SlideSelect extends Component {
                                     <td style={{width:'25%'}}>
                                       {val.questionDetailList.length > 0?'':normalVal(val.minValue,val.maxValue)}
                                     </td>
-                                    <td style={{width:'25%'}}>{'化验时间:'+item.time}</td>
+                                    <td style={{width:'25%'}}>{'检验时间:'+item.time}</td>
                                 </tr>
                             }
                         })):(item.details.map((val)=>{
@@ -194,7 +194,7 @@ class SlideSelect extends Component {
                                     <td style={{width:'25%'}}>
                                         {val.questionDetailList.length > 0?'':normalVal(val.minValue,val.maxValue)}
                                     </td>
-                                    <td style={{width:'25%'}}>{'化验时间:'+item.time}</td>
+                                    <td style={{width:'25%'}}>{'检验时间:'+item.time}</td>
                                 </tr>
                               }
                           }

src/components/AddInspectCopy/index.jsx

@@ -409,12 +409,12 @@ class Inspect extends React.Component {
           </ul>
         </div>
         <div style={{ position: "relative", clear: "both", top: "5px" }}>
-          <Add showText="添加化验项" handleClick={(e) => this.handleSearchShow(e)} id="searchWrap" />
+          <Add showText="添加检验项" handleClick={(e) => this.handleSearchShow(e)} id="searchWrap" />
           {this.state.show ? <SearchOption searchType="1" windowHeight={windowHeight} height={280} refreshScroller={refreshScroller} pageTop={pageTop} handleChangeValue={handleChangeValue} visible={true}>
             {list && list.length > 0 ? this.getSearchList(list) : (inspectVal == '' ? '' : <p style={{ padding: '5px 30px', color: '#bfbfbf' }}>暂无筛选项</p>)}
             {
               (list && list.length > 0) || (inspectVal != '') || (inspectList&&inspectList.length==0) ? '' : <div>
-                <p style={{ padding: '5px 30px', color: '#bfbfbf' }}>常用化验项</p>
+                <p style={{ padding: '5px 30px', color: '#bfbfbf' }}>常用检验项</p>
                 <ScrollArea speed={0.8}
                             horizontal={false}
                             stopScrollPropagation={true}

src/components/AddNewInspect/SlideExcel/index.jsx

@@ -58,7 +58,7 @@ class SlideExcel extends Component {
               <td style={{ width: '25%' }}>
                 {normalVal(value.min, value.max)}
               </td>
-              <td style={{ width: '25%' }}>{value.time == '' ? ('导入时间: ' + dateTime) : '化验时间: ' + this.toTime(value.time)}</td>
+              <td style={{ width: '25%' }}>{value.time == '' ? ('导入时间: ' + dateTime) : '检验时间: ' + this.toTime(value.time)}</td>
             </tr>
           })) : (item.lisExcelItem && item.lisExcelItem.map((value, idx) => {
             if (idx < 4) {
@@ -77,7 +77,7 @@ class SlideExcel extends Component {
                 <td style={{ width: '25%' }}>
                   {normalVal(value.min, value.max)}
                 </td>
-                <td style={{ width: '25%' }}>{value.time == '' ? ('导入时间: ' + dateTime) : '化验时间: ' + this.toTime(value.time)}</td>
+                <td style={{ width: '25%' }}>{value.time == '' ? ('导入时间: ' + dateTime) : '检验时间: ' + this.toTime(value.time)}</td>
               </tr>
             }
           }))

src/components/AddNewInspect/SlidePic/index.jsx

@@ -122,7 +122,7 @@ class SlidePic extends Component {
     handleFillShow(e,idx);
     //弹窗高度超出屏幕，增加页面高度
     setPosition(e,"#inspectFill",setHighter);
-    /*setTimeout(function(){//如果化验下面有很多数据，则会跳过头
+    /*setTimeout(function(){//如果检验下面有很多数据，则会跳过头
       refreshScroller()&&refreshScroller().scrollYTo(290);
     })*/
   }
@@ -152,7 +152,7 @@ class SlidePic extends Component {
           <span className={styles.smallname}></span>
           <span className={styles.edit}></span>
           <span className={styles.maxmin}></span>
-          <span className={styles.pass}>化验时间：{item.time}</span>
+          <span className={styles.pass}>检验时间：{item.time}</span>
           <span id="addClose" className={styles.partDel} onClick={()=>{this.handleDel(item.time)}}></span>
           <DelToast show={time==item.time&&activeInd?true:false}
                     name={activeName}
@@ -205,7 +205,7 @@ class SlidePic extends Component {
               />
           </span>
           <span className={styles.maxmin}>{normalVal(item.minValue,item.maxValue)}</span>
-          <span className={styles.pass}>化验时间：{item.time}</span>
+          <span className={styles.pass}>检验时间：{item.time}</span>
           <span id="addClose" className={styles.partDel} onClick={()=>{this.handleDel(item.time)}}></span>
           <DelToast show={time==item.time&&activeInd?true:false}
                     name={activeName}

src/components/AddNewInspect/SlideSelect/index.jsx

@@ -90,7 +90,7 @@ class SlideSelect extends Component {
     handleFillShow(e,idx);
     //弹窗高度超出屏幕，增加页面高度
     setPosition(e,"#inspectFill",setHighter);
-    /*setTimeout(function(){//如果化验下面有很多数据，则会跳过头
+    /*setTimeout(function(){//如果检验下面有很多数据，则会跳过头
       refreshScroller()&&refreshScroller().scrollYTo(290);
     })*/
   }
@@ -156,7 +156,7 @@ class SlideSelect extends Component {
                                     <td style={{width:'25%'}}>
                                       {val.questionDetailList.length > 0?'':normalVal(val.minValue,val.maxValue)}
                                     </td>
-                                    <td style={{width:'25%'}}>{'化验时间:'+item.time}</td>
+                                    <td style={{width:'25%'}}>{'检验时间:'+item.time}</td>
                                 </tr>
                             }
                         })):(item.details.map((val)=>{
@@ -174,7 +174,7 @@ class SlideSelect extends Component {
                                     <td style={{width:'25%'}}>
                                         {val.questionDetailList.length > 0?'':normalVal(val.minValue,val.maxValue)}
                                     </td>
-                                    <td style={{width:'25%'}}>{'化验时间:'+item.time}</td>
+                                    <td style={{width:'25%'}}>{'检验时间:'+item.time}</td>
                                 </tr>
                               }
                           }

src/components/AddNewInspect/index.jsx

@@ -254,6 +254,11 @@ class AddNewInspect extends React.Component {
       }
     </ul>
   }
+  handleSign(item,idx){
+    const { handleSign,handlePush } = this.props;
+    handleSign(item,idx)
+    handlePush && handlePush({mode:8});       //右侧推送
+  }
   getSearchList(list) {//搜索列表
     const { handleSign } = this.props;
     const contStyle={
@@ -280,7 +285,7 @@ class AddNewInspect extends React.Component {
             title={item.uniqueName}
             onClick={() => {
               this.props.setHighter(48)
-              handleSign(item, idx, 'search');
+              this.handleSign(item, idx, 'search');
               this.setState({ show: false })
             }}
           >
@@ -374,7 +379,7 @@ class AddNewInspect extends React.Component {
             {list && list.length > 0 ? this.getSearchList(list) : (inspectVal == '' ? '' : <p style={{ padding: '5px 30px', color: '#bfbfbf' }}>暂无筛选项</p>)}
             {/* {
               (list && list.length > 0) || (inspectVal != '') || (inspectList&&inspectList.length==0) ? '' : <div>
-                <p style={{ padding: '5px 30px', color: '#bfbfbf' }}>常用化验项</p>
+                <p style={{ padding: '5px 30px', color: '#bfbfbf' }}>常用检验项</p>
                 <ScrollArea speed={0.8}
                             horizontal={false}
                             stopScrollPropagation={true}

src/components/AssistCheck/index.jsx

@@ -38,10 +38,10 @@ class AssistCheck extends React.Component {
       this.inputRef.click();
       const storeState = store.getState()
       const {moduleName} = storeState.homePage
-      if(moduleName != '辅检') {
+      if(moduleName != '检查') {
         store.dispatch({
           type: SET_CURRENT_MODULE,
-          moduleName:'辅检'
+          moduleName:'检查'
         });
         store.dispatch(getMRAnalyse());
       }
@@ -53,10 +53,10 @@ class AssistCheck extends React.Component {
       })
       const storeState = store.getState()
       const {moduleName} = storeState.homePage
-      if(moduleName != '辅检') {
+      if(moduleName != '检查') {
         store.dispatch({
           type: SET_CURRENT_MODULE,
-          moduleName:'辅检'
+          moduleName:'检查'
         });
         store.dispatch(getMRAnalyse());
       }
@@ -74,10 +74,10 @@ class AssistCheck extends React.Component {
       })
       const storeState = store.getState()
       const {moduleName} = storeState.homePage
-      if(moduleName != '辅检') {
+      if(moduleName != '检查') {
         store.dispatch({
           type: SET_CURRENT_MODULE,
-          moduleName:'辅检'
+          moduleName:'检查'
         });
         store.dispatch(getMRAnalyse());
       }
@@ -106,18 +106,18 @@ class AssistCheck extends React.Component {
         return (
             <div className={styles.wrapper}>
                 <div className={styles.top}>
-                    <span id="assistResultData" className={`${setFontColorSize(2,5)}`}>辅检结果数据</span>
+                    <span id="assistResultData" className={`${setFontColorSize(2,5)}`}>检查结果数据</span>
                     {/* <div className={styles.pushButton} disabled={ieVersion && ieVersion > 9 ? true : false} onClick={checkSystemIpt}>
-                        <p id="importPacBtn" className={styles.importInspectBtn}>导入辅检结果</p>
+                        <p id="importPacBtn" className={styles.importInspectBtn}>导入检查结果</p>
                     </div> */}
                     {/* {
                       hospitalMsg.import_way_pacs == 1 ? <div className={styles.pushButton} disabled={ieVersion && ieVersion > 9 ? true : false} onClick={ieVersion && ieVersion <= 9 ? null : this.handleImportExcel}>
-                        <p className={styles.importInspectBtn}>导入辅检结果</p>
+                        <p className={styles.importInspectBtn}>导入检查结果</p>
                         <input type="file" name="uploadfile" id="choose" style={{ display: 'none' }} ref={(DOM) => this.inputRef = DOM} />
                       </div> : hospitalMsg.import_way_pacs == 2 ? <div className={styles.pushButton} disabled={ieVersion && ieVersion > 9 ? true : false} onClick={checkSystemIpt}>
-                        <p className={styles.importInspectBtn}>导入辅检结果</p>
+                        <p className={styles.importInspectBtn}>导入检查结果</p>
                       </div> : hospitalMsg.import_way_pacs == 3 ? <div className={`${styles.pushButton} ${styles.importInspect}`} onClick={showSlideImport}>
-                        <p id="importExcelBtns" className={styles.importInspectBtn}>导入辅检结果</p>
+                        <p id="importExcelBtns" className={styles.importInspectBtn}>导入检查结果</p>
                         {
                           importLis?<ul className={styles.importSelect} id="importExcelLists">
                             <li className={styles.excelIpt}>
@@ -130,7 +130,7 @@ class AssistCheck extends React.Component {
                           </div> : null
                       } */}
                     {/* {
-                      hide ? <WrapModalContainer hide={hide} title={'导入辅检数据'} width={1000} height={580} onClose={onClose}>
+                      hide ? <WrapModalContainer hide={hide} title={'导入检查数据'} width={1000} height={580} onClose={onClose}>
                         <WrapModalBodyPac
                           closeInIcss={closeInIcss}
                           height={580}
@@ -141,7 +141,7 @@ class AssistCheck extends React.Component {
                 <ItemBox 
                     className={styles.title}
                     hideAllDrop={hideAllDrop}
-                    title={'辅检'}
+                    title={'检查'}
                     editable={false}
                     border={true}
                     marginTop={'20px'}

src/components/BlockEmrCont/index.jsx

@@ -80,9 +80,9 @@ class BlockEMRCont extends Component {
           <MenstruationHistory></MenstruationHistory>
           {/* <OtherHistory></OtherHistory> */}
           <CheckBody></CheckBody>
-          {/* 化验 */}
+          {/* 检验 */}
           <Inspect setHighter={this.setHighter}></Inspect>
-          {/* 辅检 */}
+          {/* 检查 */}
           <AssistCheck setHighter={this.setHighter}></AssistCheck>
           {/* 诊断 */}
           <Diagnosis setHighter={this.setHighter} hideChronic={true}></Diagnosis>

src/components/Emergency/index.jsx

@@ -152,8 +152,8 @@ class EmergencyHis extends Component{
         jsonDataString.present = dataStr[1].content || '';     //现病史
         jsonDataString.other = dataStr[2].content || '';      //其他史
         jsonDataString.vital = dataStr[3].content || '';    //查体
-        jsonDataString.lis = dataStr[4].content || '';      //化验导入填写
-        jsonDataString.pacs = dataStr[5].content || '';     //辅检
+        jsonDataString.lis = dataStr[4].content || '';      //检验导入填写
+        jsonDataString.pacs = dataStr[5].content || '';     //检查
         jsonDataString.diag = dataStr[6].content || '';      //诊断
         jsonDataString.advice = dataStr[7].content || '';       //医嘱
         return jsonDataString;

src/components/EmergencyProcedure/EmergencyPart/PartTrd/index.jsx

@@ -33,7 +33,7 @@ class PartTrd extends React.Component {
         { name: '告病重，立即送抢救室，停止活动，绝对卧床' },
         { name: '监测生命体征，持续心电监护，建立静脉通道（左侧肢体，1-2路）' },
         { name: '必要时给氧，保持血氧饱和度95%以上' },
-        { name: '取血化验', list: ['血常规', '急诊生化', '心肌酶谱', 'Troponinl', '凝血功能', '术前免疫'] },
+        { name: '取血检验', list: ['血常规', '急诊生化', '心肌酶谱', 'Troponinl', '凝血功能', '术前免疫'] },
         { name: '床边心超检查' },
         { name: '询问相关病史和体格检查' }
       ],

src/components/EmergencyProcedure/emergency.js

@@ -343,7 +343,7 @@ let data = [
                   {name:'告病重，立即送抢救室，停止活动，绝对卧床'},
                   {name:'监测生命体征，持续心电监护，建立静脉通道（左侧肢体，1-2路）'},
                   {name:'必要时给氧，保持血氧饱和度95%以上'},
-                  {name:'取血化验',list:['血常规','急诊生化','心肌酶谱','Troponinl','凝血功能','术前免疫']},
+                  {name:'取血检验',list:['血常规','急诊生化','心肌酶谱','Troponinl','凝血功能','术前免疫']},
                   {name:'床边心超检查'},
                   {name:'询问相关病史和体格检查'}
                 ],

src/components/HistoryCaseContainer/HistoryList/index.jsx

@@ -294,8 +294,8 @@ class HistoryCaseContainer extends React.Component {
             jsonDataString.marriageHistory = dataStr[5] &&dataStr[5].content || '';   
             jsonDataString.menstruationHistory = dataStr[6] && dataStr[6].content || '';      
             jsonDataString.vital = dataStr[7] && dataStr[7].content || '';    //查体
-            jsonDataString.lis = dataStr[8] && dataStr[8].content || '';      //化验导入填写
-            jsonDataString.pacs = dataStr[9] && dataStr[9].content || '';     //辅检
+            jsonDataString.lis = dataStr[8] && dataStr[8].content || '';      //检验导入填写
+            jsonDataString.pacs = dataStr[9] && dataStr[9].content || '';     //检查
             jsonDataString.diag = dataStr[10] &&dataStr[10].content || '';      //诊断
             jsonDataString.advice = dataStr[11] && dataStr[11].content || '';       //医嘱
             return jsonDataString;

src/components/Inspect/index.jsx

@@ -162,10 +162,10 @@ class Inspect extends React.Component {
     this.inputRef.click();
     const storeState = store.getState()
     const {moduleName} = storeState.homePage
-    if(moduleName != '化验') {
+    if(moduleName != '检验') {
       store.dispatch({
         type: SET_CURRENT_MODULE,
-        moduleName:'化验'
+        moduleName:'检验'
       });
       store.dispatch(getMRAnalyse());
     }
@@ -198,10 +198,10 @@ class Inspect extends React.Component {
     })
     const storeState = store.getState()
     const {moduleName} = storeState.homePage
-    if(moduleName != '化验') {
+    if(moduleName != '检验') {
       store.dispatch({
         type: SET_CURRENT_MODULE,
-        moduleName:'化验'
+        moduleName:'检验'
       });
       store.dispatch(getMRAnalyse());
     }
@@ -224,10 +224,10 @@ class Inspect extends React.Component {
     })
     const storeState = store.getState()
     const {moduleName} = storeState.homePage
-    if(moduleName != '化验') {
+    if(moduleName != '检验') {
       store.dispatch({
         type: SET_CURRENT_MODULE,
-        moduleName:'化验'
+        moduleName:'检验'
       });
       store.dispatch(getMRAnalyse());
     }
@@ -251,46 +251,12 @@ class Inspect extends React.Component {
       <div className={styles.wrapper}>
         {/* 导入功能插件，ie8/9权限问题暂未解决，先隐藏 */}
         <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||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本地和医院} */}
-            {/* {
-              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.import_way_lis == 2 ? <div className={styles.pushButton} disabled={ieVersion && ieVersion > 9 ? true : false} onClick={checkSystemIpt}>
-                <p className={styles.importInspectBtn}>导入化验结果</p>
-              </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">
-                    <li className={styles.excelIpt}>
-                      <div onClick={ieVersion && ieVersion <= 9 ? null : this.handleImportExcel}>本地导入</div>
-                      <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} />
-                    </li>
-                    <li className={`${styles.excelIpt} ${styles.systemIpt}`} onClick={checkSystemIpt}>从设备导入</li>
-                  </ul>
-                }
-              </div> : null
-            } */}
-
-            {/* {
-              hide ? <WrapModalContainer title={'导入化验数据'} width={1000} height={570} onClose={onClose}>
-                <WrapModalBody
-                  height={570}
-                  closeInIcss={closeInIcss}
-                ></WrapModalBody>
-              </WrapModalContainer> : null
-            } */}
-          {/* </div> */}
+          <span id="inspectResultData" className={setFontColorSize(2,5)}>检验结果数据</span>
         </div>
         <ItemBox
           hideAllDrop={hideAllDrop}
           className={styles.title}
-          title={'化验'}
+          title={'检验'}
           editable={false}
           border={true}
           style={{marginRight:'0'}}

src/components/NewAdvice/index.jsx

@@ -162,10 +162,10 @@ class NewAdvice extends React.Component {
     this.inputRef.click();
     const storeState = store.getState()
     const {moduleName} = storeState.homePage
-    if(moduleName != '化验') {
+    if(moduleName != '检验') {
       store.dispatch({
         type: SET_CURRENT_MODULE,
-        moduleName:'化验'
+        moduleName:'检验'
       });
       store.dispatch(getMRAnalyse());
     }
@@ -198,10 +198,10 @@ class NewAdvice extends React.Component {
     })
     const storeState = store.getState()
     const {moduleName} = storeState.homePage
-    if(moduleName != '化验') {
+    if(moduleName != '检验') {
       store.dispatch({
         type: SET_CURRENT_MODULE,
-        moduleName:'化验'
+        moduleName:'检验'
       });
       store.dispatch(getMRAnalyse());
     }
@@ -224,10 +224,10 @@ class NewAdvice extends React.Component {
     })
     const storeState = store.getState()
     const {moduleName} = storeState.homePage
-    if(moduleName != '化验') {
+    if(moduleName != '检验') {
       store.dispatch({
         type: SET_CURRENT_MODULE,
-        moduleName:'化验'
+        moduleName:'检验'
       });
       store.dispatch(getMRAnalyse());
     }
@@ -254,17 +254,17 @@ class NewAdvice extends React.Component {
           <span id="inspectResultData" className={styles.newAdviceTitle}> </span>
           {/* <div className={this.getStyle()} onClick={ieVersion&&ieVersion<=9?null:this.handleImportExcel}> */}
           {/* <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>
+            {/* <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.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>
+                <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.import_way_lis == 2 ? <div className={styles.pushButton} disabled={ieVersion && ieVersion > 9 ? true : false} onClick={checkSystemIpt}>
-                <p className={styles.importInspectBtn}>导入化验结果</p>
+                <p className={styles.importInspectBtn}>导入检验结果</p>
               </div> : hospitalMsg.import_way_lis == 3 ? <div className={`${styles.pushButton} ${styles.importInspect}`} onClick={showSlideImport}>
-                <p id="importInspectBtn" className={styles.importInspectBtn}>导入化验结果</p>
+                <p id="importInspectBtn" className={styles.importInspectBtn}>导入检验结果</p>
                 {
                   <ul className={styles.importSelect} style={{display:importLis?'block':'none'}} id="importList">
                     <li className={styles.excelIpt}>
@@ -278,7 +278,7 @@ class NewAdvice extends React.Component {
             } */}
 
             {/* {
-              hide ? <WrapModalContainer title={'导入化验数据'} width={1000} height={570} onClose={onClose}>
+              hide ? <WrapModalContainer title={'导入检验数据'} width={1000} height={570} onClose={onClose}>
                 <WrapModalBody
                   height={570}
                   closeInIcss={closeInIcss}

src/components/PreviewBody/Inspect/index.jsx

@@ -6,7 +6,7 @@ const PreviewInspect = (props) => {
   console.log(props,'===props');
   console.log(dataJson,'===dataJson==_');
     return <tr className={style['patInfoFst']}>
-      <td className={style['patInfoSec']}>化验：</td>
+      <td className={style['patInfoSec']}>检验：</td>
       <td className={style['patInfoSec']}>
         {
           dataJson&&dataJson.getExcelDataList && dataJson.getExcelDataList.map((items) => {
@@ -24,7 +24,7 @@ const PreviewInspect = (props) => {
                       <td className={style.assistTableTdTrd}>
                         {normalVal(value.min, value.max)}
                       </td>
-                      <td className={style.assistTableTdFor}>{value.time == '' ? ('导入时间：' + dateTime) : '化验时间：' + toTime(value.time)
+                      <td className={style.assistTableTdFor}>{value.time == '' ? ('导入时间：' + dateTime) : '检验时间：' + toTime(value.time)
                     }</td>
                     </tr>
                   })
@@ -57,7 +57,7 @@ const PreviewInspect = (props) => {
                       <td className={style.assistTableTdTrd}>
                         {normalVal(val.minValue, val.maxValue)}
                       </td>
-                      <td className={style.assistTableTdFor}>{'化验时间：' + item.time}</td>
+                      <td className={style.assistTableTdFor}>{'检验时间：' + item.time}</td>
                     </tr>
                   }
                 })

src/components/PreviewBody/index.jsx

@@ -110,7 +110,7 @@ class PreviewBody extends Component {
           <ItemPart dataStr={dataStr.vital} title={'查体：'} type={1}></ItemPart>
           {/* <PreviewInspect dataJson={come?dataJson.lis:lis_data} toTime={this.toTime} dateTime={this.state.dateTime} showDetails={this.showDetails}></PreviewInspect> */}
           <PreviewInspect dataJson={dataStr.lis} toTime={this.toTime} dateTime={this.state.dateTime} showDetails={this.showDetails}></PreviewInspect>
-          <ItemPart dataStr={dataStr.pacs} title={'辅检：'} type={2}></ItemPart>
+          <ItemPart dataStr={dataStr.pacs} title={'检查：'} type={2}></ItemPart>
           <ItemPart dataStr={dataStr.diag} title={'诊断：'} type={2} lastDot={true}></ItemPart>
           <MedicalAdvice advice={dataStr.advice}></MedicalAdvice>
           {/* <tr className={style['patInfoFst']}>

src/components/PushItems/index.jsx

@@ -64,14 +64,14 @@ class PushItems extends Component {
     const checkedCheck = check.filter(item => item.checked);
     this.props.billing(checkedAssay, checkedCheck);
     
-    let obj = {   //添加化验
+    let obj = {   //添加检验
       details: [],
       name: '',
       questionId: '',
       showType: 1,
       uniqueName:''
     }
-    let obj1 = {  //添加辅检
+    let obj1 = {  //添加检查
       name: '',
       questionId: '',
       showType: 1,
@@ -256,7 +256,7 @@ class PushItems extends Component {
                   <span>无</span>
                 ) : (<ul>
                      <RecommendInspect
-                      title = '化验'
+                      title = '检验'
                       list = {assay}
                       changeFlag = {changeAssay}
                       border = "true"

src/components/TemplateItems/TemplateItem/DesItem/index.jsx

@@ -26,8 +26,8 @@ const DesItem = (props) => {
                   filterDataArr(JSON.parse(preview.vital))
               }
           </p>
-          <p className={style.wrapperDes} title={'化验：'+preview.lis}>化验：{preview.lis}</p>
-          <p className={style.wrapperDes} title={'辅检：'+preview.pacs}>辅检：{preview.pacs}</p>
+          <p className={style.wrapperDes} title={'检验：'+preview.lis}>检验：{preview.lis}</p>
+          <p className={style.wrapperDes} title={'检查：'+preview.pacs}>检查：{preview.pacs}</p>
           <p className={style.wrapperDes} title={'诊断：'+preview.diag}>诊断：{preview.diag}</p>
           <p className={style.wrapperDes} title={'医嘱：'+preview.advice}>医嘱：{preview.advice}</p>
       </div>

src/components/WrapModalBody/WrapModalRight/index.jsx

@@ -6,7 +6,7 @@ const WrapModalRight = (props) => {
   const {selectGroupList,height,showInIcss} = props;
   return <div className={style['modalRight']}>
     <div className={`${style.modalRightT} clearfix`}>
-      <span className={style.tip}>已选化验项</span>
+      <span className={style.tip}>已选检验项</span>
       <span className={style.btnS} onClick={showInIcss}>确认选择</span>
     </div>
     <div className={style.modalRightB} style={{height:(height-106)+'px'}}>

src/components/WrapModalBodyPac/WrapModalRight/index.jsx

@@ -5,7 +5,7 @@ const WrapModalRight = (props) =>{
   const {selectGroupList,height,showInIcss} = props;
   return <div className={style['modalRight']}>
     <div className={`${style.modalRightT} clearfix`}>
-      <span className={style.tip}>已选辅检项</span>
+      <span className={style.tip}>已选检查项</span>
       <span className={style.btnS} onClick={showInIcss}>确认选择</span>
     </div>
     <div className={style.modalRightB} style={{height:(height-106)+'px'}}>

src/config/index.js

@@ -11,8 +11,8 @@ export default {
       '2':'current',           //现病史
       '3':'otherHisModel',     //其他史
       '4':'checkbody',         //查体
-      '5':'assay',             //化验
-      '6':'assistCheck',        //辅检
+      '5':'assay',             //检验
+      '6':'assistCheck',        //检查
       '22':'currentEmpty',      //现病史空模板
       '31':'addSymptom',        //主诉子模板--添加病情变化
       '32':'process',           //现病史子模板--病程变化

src/mock/form/17.js

@@ -67,7 +67,7 @@ Mock.mock('/17', {
                     "location": "0",
                     "status": "1",
                     "sync": null,
-                    "remark": "化验-尿液颜色",
+                    "remark": "检验-尿液颜色",
                     "elec": null,
                     "show": null,
                     "showDefault": null,
@@ -86,7 +86,7 @@ Mock.mock('/17', {
                             "structName": "#back",
                             "coverage": "1",
                             "status": "1",
-                            "remark": "化验-尿液颜色",
+                            "remark": "检验-尿液颜色",
                             "labelPrefix": "颜色",
                             "labelSuffix": null,
                             "addLine": "0",
@@ -110,7 +110,7 @@ Mock.mock('/17', {
                                     "coverage": "2",
                                     "relationId": null,
                                     "status": "1",
-                                    "remark": "化验-尿液颜色",
+                                    "remark": "检验-尿液颜色",
                                     "show": "1",
                                     "selectType": "1",
                                     "defaultSelect": "0",
@@ -133,7 +133,7 @@ Mock.mock('/17', {
                                     "coverage": "2",
                                     "relationId": null,
                                     "status": "1",
-                                    "remark": "化验-尿液颜色",
+                                    "remark": "检验-尿液颜色",
                                     "show": "1",
                                     "selectType": "1",
                                     "defaultSelect": "0",
@@ -156,7 +156,7 @@ Mock.mock('/17', {
                                     "coverage": "2",
                                     "relationId": null,
                                     "status": "1",
-                                    "remark": "化验-尿液颜色",
+                                    "remark": "检验-尿液颜色",
                                     "show": "1",
                                     "selectType": "1",
                                     "defaultSelect": "0",
@@ -179,7 +179,7 @@ Mock.mock('/17', {
                                     "coverage": "2",
                                     "relationId": null,
                                     "status": "1",
-                                    "remark": "化验-尿液颜色",
+                                    "remark": "检验-尿液颜色",
                                     "show": "1",
                                     "selectType": "1",
                                     "defaultSelect": "0",
@@ -202,7 +202,7 @@ Mock.mock('/17', {
                                     "coverage": "2",
                                     "relationId": null,
                                     "status": "1",
-                                    "remark": "化验-尿液颜色",
+                                    "remark": "检验-尿液颜色",
                                     "show": "1",
                                     "selectType": "1",
                                     "defaultSelect": "0",
@@ -225,7 +225,7 @@ Mock.mock('/17', {
                                     "coverage": "2",
                                     "relationId": null,
                                     "status": "1",
-                                    "remark": "化验-尿液颜色",
+                                    "remark": "检验-尿液颜色",
                                     "show": "1",
                                     "selectType": "1",
                                     "defaultSelect": "0",
@@ -254,7 +254,7 @@ Mock.mock('/17', {
                     "location": "0",
                     "status": "1",
                     "sync": null,
-                    "remark": "化验-尿液透明度",
+                    "remark": "检验-尿液透明度",
                     "elec": null,
                     "show": null,
                     "showDefault": null,
@@ -273,7 +273,7 @@ Mock.mock('/17', {
                             "structName": "#desc",
                             "coverage": "1",
                             "status": "1",
-                            "remark": "化验-尿液透明度",
+                            "remark": "检验-尿液透明度",
                             "labelPrefix": "透明度",
                             "labelSuffix": null,
                             "addLine": "0",
@@ -302,7 +302,7 @@ Mock.mock('/17', {
                     "location": "0",
                     "status": "1",
                     "sync": null,
-                    "remark": "化验-尿PH值",
+                    "remark": "检验-尿PH值",
                     "elec": null,
                     "show": null,
                     "showDefault": null,
@@ -321,7 +321,7 @@ Mock.mock('/17', {
                             "structName": "#desc",
                             "coverage": "1",
                             "status": "1",
-                            "remark": "化验-尿PH值",
+                            "remark": "检验-尿PH值",
                             "labelPrefix": "尿PH值",
                             "labelSuffix": null,
                             "addLine": "0",
@@ -350,7 +350,7 @@ Mock.mock('/17', {
                     "location": "0",
                     "status": "1",
                     "sync": null,
-                    "remark": "化验-尿亚硝酸盐",
+                    "remark": "检验-尿亚硝酸盐",
                     "elec": null,
                     "show": null,
                     "showDefault": null,
@@ -369,7 +369,7 @@ Mock.mock('/17', {
                             "structName": "#back",
                             "coverage": "1",
                             "status": "1",
-                            "remark": "化验-尿亚硝酸盐",
+                            "remark": "检验-尿亚硝酸盐",
                             "labelPrefix": "亚硝酸盐",
                             "labelSuffix": "",
                             "addLine": "0",
@@ -393,7 +393,7 @@ Mock.mock('/17', {
                                     "coverage": "1",
                                     "relationId": null,
                                     "status": "1",
-                                    "remark": "化验-尿亚硝酸盐",
+                                    "remark": "检验-尿亚硝酸盐",
                                     "show": null,
                                     "selectType": "1",
                                     "defaultSelect": "0",
@@ -416,7 +416,7 @@ Mock.mock('/17', {
                                     "coverage": "1",
                                     "relationId": null,
                                     "status": "1",
-                                    "remark": "化验-尿亚硝酸盐",
+                                    "remark": "检验-尿亚硝酸盐",
                                     "show": null,
                                     "selectType": "1",
                                     "defaultSelect": "0",
@@ -445,7 +445,7 @@ Mock.mock('/17', {
                     "location": "0",
                     "status": "1",
                     "sync": null,
-                    "remark": "化验-尿糖定性",
+                    "remark": "检验-尿糖定性",
                     "elec": null,
                     "show": null,
                     "showDefault": null,
@@ -464,7 +464,7 @@ Mock.mock('/17', {
                             "structName": "#back",
                             "coverage": "1",
                             "status": "1",
-                            "remark": "化验-尿糖定性",
+                            "remark": "检验-尿糖定性",
                             "labelPrefix": "尿糖定性",
                             "labelSuffix": null,
                             "addLine": "0",
@@ -488,7 +488,7 @@ Mock.mock('/17', {
                                     "coverage": null,
                                     "relationId": null,
                                     "status": "1",
-                                    "remark": "化验-尿糖定性",
+                                    "remark": "检验-尿糖定性",
                                     "show": null,
                                     "selectType": "1",
                                     "defaultSelect": "0",
@@ -511,7 +511,7 @@ Mock.mock('/17', {
                                     "coverage": null,
                                     "relationId": null,
                                     "status": "1",
-                                    "remark": "化验-尿糖定性",
+                                    "remark": "检验-尿糖定性",
                                     "show": null,
                                     "selectType": "1",
                                     "defaultSelect": "0",
@@ -540,7 +540,7 @@ Mock.mock('/17', {
                     "location": "0",
                     "status": "1",
                     "sync": null,
-                    "remark": "化验-尿糖定量",
+                    "remark": "检验-尿糖定量",
                     "elec": null,
                     "show": null,
                     "showDefault": null,
@@ -559,7 +559,7 @@ Mock.mock('/17', {
                             "structName": "#desc",
                             "coverage": "1",
                             "status": "1",
-                            "remark": "化验-尿糖定量",
+                            "remark": "检验-尿糖定量",
                             "labelPrefix": "尿糖定量",
                             "labelSuffix": "mmol/24h",
                             "addLine": "0",
@@ -588,7 +588,7 @@ Mock.mock('/17', {
                     "location": "0",
                     "status": "1",
                     "sync": null,
-                    "remark": "化验-尿维生素C",
+                    "remark": "检验-尿维生素C",
                     "elec": null,
                     "show": null,
                     "showDefault": null,
@@ -607,7 +607,7 @@ Mock.mock('/17', {
                             "structName": "#back",
                             "coverage": "1",
                             "status": "1",
-                            "remark": "化验-尿维生素C",
+                            "remark": "检验-尿维生素C",
                             "labelPrefix": "维生素C",
                             "labelSuffix": "",
                             "addLine": "0",
@@ -631,7 +631,7 @@ Mock.mock('/17', {
                                     "coverage": "1",
                                     "relationId": null,
                                     "status": "1",
-                                    "remark": "化验-尿维生素C",
+                                    "remark": "检验-尿维生素C",
                                     "show": null,
                                     "selectType": "1",
                                     "defaultSelect": "0",
@@ -654,7 +654,7 @@ Mock.mock('/17', {
                                     "coverage": "1",
                                     "relationId": null,
                                     "status": "1",
-                                    "remark": "化验-尿维生素C",
+                                    "remark": "检验-尿维生素C",
                                     "show": null,
                                     "selectType": "1",
                                     "defaultSelect": "0",
@@ -683,7 +683,7 @@ Mock.mock('/17', {
                     "location": "0",
                     "status": "1",
                     "sync": null,
-                    "remark": "化验-尿比重",
+                    "remark": "检验-尿比重",
                     "elec": null,
                     "show": null,
                     "showDefault": null,
@@ -702,7 +702,7 @@ Mock.mock('/17', {
                             "structName": "#desc",
                             "coverage": "1",
                             "status": "1",
-                            "remark": "化验-尿比重",
+                            "remark": "检验-尿比重",
                             "labelPrefix": "尿比重",
                             "labelSuffix": null,
                             "addLine": "0",
@@ -731,7 +731,7 @@ Mock.mock('/17', {
                     "location": "0",
                     "status": "1",
                     "sync": null,
-                    "remark": "化验-尿隐血",
+                    "remark": "检验-尿隐血",
                     "elec": null,
                     "show": null,
                     "showDefault": null,
@@ -750,7 +750,7 @@ Mock.mock('/17', {
                             "structName": "#back",
                             "coverage": "1",
                             "status": "1",
-                            "remark": "化验-尿隐血",
+                            "remark": "检验-尿隐血",
                             "labelPrefix": "隐血",
                             "labelSuffix": null,
                             "addLine": "0",
@@ -774,7 +774,7 @@ Mock.mock('/17', {
                                     "coverage": "1",
                                     "relationId": null,
                                     "status": "1",
-                                    "remark": "化验-尿隐血",
+                                    "remark": "检验-尿隐血",
                                     "show": null,
                                     "selectType": "1",
                                     "defaultSelect": "0",
@@ -797,7 +797,7 @@ Mock.mock('/17', {
                                     "coverage": "1",
                                     "relationId": null,
                                     "status": "1",
-                                    "remark": "化验-尿隐血",
+                                    "remark": "检验-尿隐血",
                                     "show": null,
                                     "selectType": "1",
                                     "defaultSelect": "0",
@@ -820,7 +820,7 @@ Mock.mock('/17', {
                                     "coverage": "1",
                                     "relationId": null,
                                     "status": "1",
-                                    "remark": "化验-尿隐血",
+                                    "remark": "检验-尿隐血",
                                     "show": null,
                                     "selectType": "1",
                                     "defaultSelect": "0",
@@ -843,7 +843,7 @@ Mock.mock('/17', {
                                     "coverage": "1",
                                     "relationId": null,
                                     "status": "1",
-                                    "remark": "化验-尿隐血",
+                                    "remark": "检验-尿隐血",
                                     "show": null,
                                     "selectType": "1",
                                     "defaultSelect": "0",
@@ -872,7 +872,7 @@ Mock.mock('/17', {
                     "location": "0",
                     "status": "1",
                     "sync": null,
-                    "remark": "化验-尿胆红素",
+                    "remark": "检验-尿胆红素",
                     "elec": null,
                     "show": null,
                     "showDefault": null,
@@ -891,7 +891,7 @@ Mock.mock('/17', {
                             "structName": "#back",
                             "coverage": "1",
                             "status": "1",
-                            "remark": "化验-尿胆红素",
+                            "remark": "检验-尿胆红素",
                             "labelPrefix": "胆红素",
                             "labelSuffix": "",
                             "addLine": "0",
@@ -915,7 +915,7 @@ Mock.mock('/17', {
                                     "coverage": "1",
                                     "relationId": null,
                                     "status": "1",
-                                    "remark": "化验-尿胆红素",
+                                    "remark": "检验-尿胆红素",
                                     "show": null,
                                     "selectType": "1",
                                     "defaultSelect": "0",
@@ -938,7 +938,7 @@ Mock.mock('/17', {
                                     "coverage": "1",
                                     "relationId": null,
                                     "status": "1",
-                                    "remark": "化验-尿胆红素",
+                                    "remark": "检验-尿胆红素",
                                     "show": null,
                                     "selectType": "1",
                                     "defaultSelect": "0",
@@ -961,7 +961,7 @@ Mock.mock('/17', {
                                     "coverage": "1",
                                     "relationId": null,
                                     "status": "1",
-                                    "remark": "化验-尿胆红素",
+                                    "remark": "检验-尿胆红素",
                                     "show": null,
                                     "selectType": "1",
                                     "defaultSelect": "0",
@@ -984,7 +984,7 @@ Mock.mock('/17', {
                                     "coverage": "1",
                                     "relationId": null,
                                     "status": "1",
-                                    "remark": "化验-尿胆红素",
+                                    "remark": "检验-尿胆红素",
                                     "show": null,
                                     "selectType": "1",
                                     "defaultSelect": "0",
@@ -1013,7 +1013,7 @@ Mock.mock('/17', {
                     "location": "0",
                     "status": "1",
                     "sync": null,
-                    "remark": "化验-尿胆原定性",
+                    "remark": "检验-尿胆原定性",
                     "elec": null,
                     "show": null,
                     "showDefault": null,
@@ -1032,7 +1032,7 @@ Mock.mock('/17', {
                             "structName": "#back",
                             "coverage": "1",
                             "status": "1",
-                            "remark": "化验-尿胆原定性",
+                            "remark": "检验-尿胆原定性",
                             "labelPrefix": "尿胆原定性",
                             "labelSuffix": null,
                             "addLine": "0",
@@ -1056,7 +1056,7 @@ Mock.mock('/17', {
                                     "coverage": null,
                                     "relationId": null,
                                     "status": "1",
-                                    "remark": "化验-尿胆原定性",
+                                    "remark": "检验-尿胆原定性",
                                     "show": null,
                                     "selectType": "1",
                                     "defaultSelect": "0",
@@ -1079,7 +1079,7 @@ Mock.mock('/17', {
                                     "coverage": null,
                                     "relationId": null,
                                     "status": "1",
-                                    "remark": "化验-尿胆原定性",
+                                    "remark": "检验-尿胆原定性",
                                     "show": null,
                                     "selectType": "1",
                                     "defaultSelect": "0",
@@ -1108,7 +1108,7 @@ Mock.mock('/17', {
                     "location": "0",
                     "status": "1",
                     "sync": null,
-                    "remark": "化验-尿胆原定量",
+                    "remark": "检验-尿胆原定量",
                     "elec": null,
                     "show": null,
                     "showDefault": null,
@@ -1127,7 +1127,7 @@ Mock.mock('/17', {
                             "structName": "#desc",
                             "coverage": "1",
                             "status": "1",
-                            "remark": "化验-尿胆原定量",
+                            "remark": "检验-尿胆原定量",
                             "labelPrefix": "尿胆原定量",
                             "labelSuffix": "μmol/24h",
                             "addLine": "0",
@@ -1156,7 +1156,7 @@ Mock.mock('/17', {
                     "location": "0",
                     "status": "1",
                     "sync": null,
-                    "remark": "化验-尿酮体",
+                    "remark": "检验-尿酮体",
                     "elec": null,
                     "show": null,
                     "showDefault": null,
@@ -1175,7 +1175,7 @@ Mock.mock('/17', {
                             "structName": "#back",
                             "coverage": "1",
                             "status": "1",
-                            "remark": "化验-尿酮体",
+                            "remark": "检验-尿酮体",
                             "labelPrefix": "酮体",
                             "labelSuffix": null,
                             "addLine": "0",
@@ -1199,7 +1199,7 @@ Mock.mock('/17', {
                                     "coverage": null,
                                     "relationId": null,
                                     "status": "1",
-                                    "remark": "化验-尿常规-尿酮体",
+                                    "remark": "检验-尿常规-尿酮体",
                                     "show": null,
                                     "selectType": "1",
                                     "defaultSelect": "0",
@@ -1222,7 +1222,7 @@ Mock.mock('/17', {
                                     "coverage": null,
                                     "relationId": null,
                                     "status": "1",
-                                    "remark": "化验-尿常规-尿酮体",
+                                    "remark": "检验-尿常规-尿酮体",
                                     "show": null,
                                     "selectType": "1",
                                     "defaultSelect": "0",
@@ -1251,7 +1251,7 @@ Mock.mock('/17', {
                     "location": "0",
                     "status": "1",
                     "sync": null,
-                    "remark": "化验-尿白细胞",
+                    "remark": "检验-尿白细胞",
                     "elec": null,
                     "show": null,
                     "showDefault": null,
@@ -1270,7 +1270,7 @@ Mock.mock('/17', {
                             "structName": "#desc",
                             "coverage": "1",
                             "status": "1",
-                            "remark": "化验-尿白细胞",
+                            "remark": "检验-尿白细胞",
                             "labelPrefix": "白细胞",
                             "labelSuffix": "个/HP",
                             "addLine": "0",
@@ -1299,7 +1299,7 @@ Mock.mock('/17', {
                     "location": "0",
                     "status": "1",
                     "sync": null,
-                    "remark": "化验-尿蛋白定性",
+                    "remark": "检验-尿蛋白定性",
                     "elec": null,
                     "show": null,
                     "showDefault": null,
@@ -1318,7 +1318,7 @@ Mock.mock('/17', {
                             "structName": "#back",
                             "coverage": "1",
                             "status": "1",
-                            "remark": "化验-尿蛋白定性",
+                            "remark": "检验-尿蛋白定性",
                             "labelPrefix": "尿蛋白定性",
                             "labelSuffix": null,
                             "addLine": "0",
@@ -1342,7 +1342,7 @@ Mock.mock('/17', {
                                     "coverage": null,
                                     "relationId": null,
                                     "status": "1",
-                                    "remark": "化验-尿蛋白定性",
+                                    "remark": "检验-尿蛋白定性",
                                     "show": null,
                                     "selectType": "1",
                                     "defaultSelect": "0",
@@ -1365,7 +1365,7 @@ Mock.mock('/17', {
                                     "coverage": null,
                                     "relationId": null,
                                     "status": "1",
-                                    "remark": "化验-尿蛋白定性",
+                                    "remark": "检验-尿蛋白定性",
                                     "show": null,
                                     "selectType": "1",
                                     "defaultSelect": "0",
@@ -1394,7 +1394,7 @@ Mock.mock('/17', {
                     "location": "0",
                     "status": "1",
                     "sync": null,
-                    "remark": "化验-尿蛋白定量",
+                    "remark": "检验-尿蛋白定量",
                     "elec": null,
                     "show": null,
                     "showDefault": null,
@@ -1413,7 +1413,7 @@ Mock.mock('/17', {
                             "structName": "#desc",
                             "coverage": "1",
                             "status": "1",
-                            "remark": "化验-尿蛋白定量",
+                            "remark": "检验-尿蛋白定量",
                             "labelPrefix": "尿蛋白定量",
                             "labelSuffix": "mg/24h",
                             "addLine": "0",
@@ -1442,7 +1442,7 @@ Mock.mock('/17', {
                     "location": "0",
                     "status": "1",
                     "sync": null,
-                    "remark": "化验-尿上皮细胞",
+                    "remark": "检验-尿上皮细胞",
                     "elec": null,
                     "show": null,
                     "showDefault": null,
@@ -1461,7 +1461,7 @@ Mock.mock('/17', {
                             "structName": "#desc",
                             "coverage": "1",
                             "status": "1",
-                            "remark": "化验-尿上皮细胞",
+                            "remark": "检验-尿上皮细胞",
                             "labelPrefix": "上皮细胞",
                             "labelSuffix": "个/HP",
                             "addLine": "0",
@@ -1490,7 +1490,7 @@ Mock.mock('/17', {
                     "location": "0",
                     "status": "1",
                     "sync": null,
-                    "remark": "化验-尿红细胞",
+                    "remark": "检验-尿红细胞",
                     "elec": null,
                     "show": null,
                     "showDefault": null,
@@ -1509,7 +1509,7 @@ Mock.mock('/17', {
                             "structName": "#desc",
                             "coverage": "1",
                             "status": "1",
-                            "remark": "化验-尿红细胞",
+                            "remark": "检验-尿红细胞",
                             "labelPrefix": "红细胞",
                             "labelSuffix": "个/HP",
                             "addLine": "0",
@@ -1538,7 +1538,7 @@ Mock.mock('/17', {
                     "location": "0",
                     "status": "1",
                     "sync": null,
-                    "remark": "化验-尿渗透压",
+                    "remark": "检验-尿渗透压",
                     "elec": null,
                     "show": null,
                     "showDefault": null,
@@ -1557,7 +1557,7 @@ Mock.mock('/17', {
                             "structName": "#desc",
                             "coverage": "1",
                             "status": "1",
-                            "remark": "化验-尿渗透压",
+                            "remark": "检验-尿渗透压",
                             "labelPrefix": "尿渗透压",
                             "labelSuffix": "mmol/L",
                             "addLine": "0",
@@ -1586,7 +1586,7 @@ Mock.mock('/17', {
                     "location": "0",
                     "status": "1",
                     "sync": null,
-                    "remark": "化验-尿白蛋白/肌酐比值",
+                    "remark": "检验-尿白蛋白/肌酐比值",
                     "elec": null,
                     "show": null,
                     "showDefault": null,
@@ -1605,7 +1605,7 @@ Mock.mock('/17', {
                             "structName": "#desc",
                             "coverage": "1",
                             "status": "1",
-                            "remark": "化验-尿白蛋白/肌酐比值",
+                            "remark": "检验-尿白蛋白/肌酐比值",
                             "labelPrefix": "尿白蛋白/肌酐比值",
                             "labelSuffix": "mg/g",
                             "addLine": "0",
@@ -1634,7 +1634,7 @@ Mock.mock('/17', {
                     "location": "0",
                     "status": "1",
                     "sync": null,
-                    "remark": "化验-尿白蛋白排泄率",
+                    "remark": "检验-尿白蛋白排泄率",
                     "elec": null,
                     "show": null,
                     "showDefault": null,
@@ -1653,7 +1653,7 @@ Mock.mock('/17', {
                             "structName": "#desc",
                             "coverage": "1",
                             "status": "1",
-                            "remark": "化验-尿白蛋白排泄率",
+                            "remark": "检验-尿白蛋白排泄率",
                             "labelPrefix": "尿白蛋白排泄率",
                             "labelSuffix": "μg/min",
                             "addLine": "0",

src/mock/form/384.js

@@ -67,7 +67,7 @@ Mock.mock('/384',{
                     "location": "0",
                     "status": "1",
                     "sync": null,
-                    "remark": "化验-胆病理检查-正常/异常",
+                    "remark": "检验-胆病理检查-正常/异常",
                     "elec": null,
                     "show": null,
                     "showDefault": null,
@@ -86,7 +86,7 @@ Mock.mock('/384',{
                             "structName": "#back",
                             "coverage": "1",
                             "status": "1",
-                            "remark": "化验-胆病理检查-正常/异常",
+                            "remark": "检验-胆病理检查-正常/异常",
                             "labelPrefix": null,
                             "labelSuffix": null,
                             "addLine": "1",
@@ -110,7 +110,7 @@ Mock.mock('/384',{
                                     "coverage": "2",
                                     "relationId": "1439",
                                     "status": "1",
-                                    "remark": "化验-胆病理检查-正常/异常",
+                                    "remark": "检验-胆病理检查-正常/异常",
                                     "show": "1",
                                     "selectType": "1",
                                     "defaultSelect": "0",
@@ -134,7 +134,7 @@ Mock.mock('/384',{
                                             "location": "0",
                                             "status": "1",
                                             "sync": null,
-                                            "remark": "化验-病理检查(通用)-正常",
+                                            "remark": "检验-病理检查(通用)-正常",
                                             "elec": null,
                                             "show": "1",
                                             "showDefault": "0",
@@ -153,7 +153,7 @@ Mock.mock('/384',{
                                                     "structName": "#desc",
                                                     "coverage": "1",
                                                     "status": "1",
-                                                    "remark": "化验-病理检查(通用)-正常",
+                                                    "remark": "检验-病理检查(通用)-正常",
                                                     "labelPrefix": null,
                                                     "labelSuffix": null,
                                                     "addLine": "1",
@@ -182,7 +182,7 @@ Mock.mock('/384',{
                                     "coverage": "1",
                                     "relationId": "1550",
                                     "status": "1",
-                                    "remark": "化验-胆病理检查-正常/异常",
+                                    "remark": "检验-胆病理检查-正常/异常",
                                     "show": "1",
                                     "selectType": "1",
                                     "defaultSelect": "0",
@@ -206,7 +206,7 @@ Mock.mock('/384',{
                                             "location": "0",
                                             "status": "1",
                                             "sync": null,
-                                            "remark": "化验-胆病理检查-异常",
+                                            "remark": "检验-胆病理检查-异常",
                                             "elec": null,
                                             "show": "1",
                                             "showDefault": "0",
@@ -225,7 +225,7 @@ Mock.mock('/384',{
                                                     "structName": "#back",
                                                     "coverage": "1",
                                                     "status": "1",
-                                                    "remark": "化验-胆病理检查-异常",
+                                                    "remark": "检验-胆病理检查-异常",
                                                     "labelPrefix": null,
                                                     "labelSuffix": null,
                                                     "addLine": "0",
@@ -249,7 +249,7 @@ Mock.mock('/384',{
                                                             "coverage": "2",
                                                             "relationId": "1431",
                                                             "status": "1",
-                                                            "remark": "化验-胆病理检查-异常",
+                                                            "remark": "检验-胆病理检查-异常",
                                                             "show": null,
                                                             "selectType": "1",
                                                             "defaultSelect": "0",
@@ -273,7 +273,7 @@ Mock.mock('/384',{
                                                                     "location": "0",
                                                                     "status": "1",
                                                                     "sync": null,
-                                                                    "remark": "化验-病理检查(通用)-炎症",
+                                                                    "remark": "检验-病理检查(通用)-炎症",
                                                                     "elec": null,
                                                                     "show": "1",
                                                                     "showDefault": "0",
@@ -292,7 +292,7 @@ Mock.mock('/384',{
                                                                             "structName": "#back",
                                                                             "coverage": "1",
                                                                             "status": "1",
-                                                                            "remark": "化验-病理检查(通用)-炎症",
+                                                                            "remark": "检验-病理检查(通用)-炎症",
                                                                             "labelPrefix": null,
                                                                             "labelSuffix": null,
                                                                             "addLine": "0",
@@ -316,7 +316,7 @@ Mock.mock('/384',{
                                                                                     "coverage": "2",
                                                                                     "relationId": null,
                                                                                     "status": "1",
-                                                                                    "remark": "化验-病理检查(通用)-炎症",
+                                                                                    "remark": "检验-病理检查(通用)-炎症",
                                                                                     "show": null,
                                                                                     "selectType": "1",
                                                                                     "defaultSelect": "0",
@@ -339,7 +339,7 @@ Mock.mock('/384',{
                                                                                     "coverage": "2",
                                                                                     "relationId": null,
                                                                                     "status": "1",
-                                                                                    "remark": "化验-病理检查(通用)-炎症",
+                                                                                    "remark": "检验-病理检查(通用)-炎症",
                                                                                     "show": null,
                                                                                     "selectType": "1",
                                                                                     "defaultSelect": "0",
@@ -362,7 +362,7 @@ Mock.mock('/384',{
                                                                                     "coverage": "2",
                                                                                     "relationId": null,
                                                                                     "status": "1",
-                                                                                    "remark": "化验-病理检查(通用)-炎症",
+                                                                                    "remark": "检验-病理检查(通用)-炎症",
                                                                                     "show": null,
                                                                                     "selectType": "1",
                                                                                     "defaultSelect": "0",
@@ -385,7 +385,7 @@ Mock.mock('/384',{
                                                                                     "coverage": "2",
                                                                                     "relationId": null,
                                                                                     "status": "1",
-                                                                                    "remark": "化验-病理检查(通用)-炎症",
+                                                                                    "remark": "检验-病理检查(通用)-炎症",
                                                                                     "show": null,
                                                                                     "selectType": "1",
                                                                                     "defaultSelect": "0",
@@ -408,7 +408,7 @@ Mock.mock('/384',{
                                                                                     "coverage": "2",
                                                                                     "relationId": null,
                                                                                     "status": "1",
-                                                                                    "remark": "化验-病理检查(通用)-炎症",
+                                                                                    "remark": "检验-病理检查(通用)-炎症",
                                                                                     "show": null,
                                                                                     "selectType": "1",
                                                                                     "defaultSelect": "0",
@@ -431,7 +431,7 @@ Mock.mock('/384',{
                                                                                     "coverage": "2",
                                                                                     "relationId": null,
                                                                                     "status": "1",
-                                                                                    "remark": "化验-病理检查(通用)-炎症",
+                                                                                    "remark": "检验-病理检查(通用)-炎症",
                                                                                     "show": null,
                                                                                     "selectType": "1",
                                                                                     "defaultSelect": "0",
@@ -454,7 +454,7 @@ Mock.mock('/384',{
                                                                                     "coverage": "2",
                                                                                     "relationId": null,
                                                                                     "status": "1",
-                                                                                    "remark": "化验-病理检查(通用)-炎症",
+                                                                                    "remark": "检验-病理检查(通用)-炎症",
                                                                                     "show": null,
                                                                                     "selectType": "1",
                                                                                     "defaultSelect": "0",
@@ -477,7 +477,7 @@ Mock.mock('/384',{
                                                                                     "coverage": "2",
                                                                                     "relationId": null,
                                                                                     "status": "1",
-                                                                                    "remark": "化验-病理检查(通用)-炎症",
+                                                                                    "remark": "检验-病理检查(通用)-炎症",
                                                                                     "show": null,
                                                                                     "selectType": "1",
                                                                                     "defaultSelect": "0",
@@ -505,7 +505,7 @@ Mock.mock('/384',{
                                                                             "structName": "#desc",
                                                                             "coverage": "1",
                                                                             "status": "1",
-                                                                            "remark": "化验-病理检查(通用)-炎症-分隔符",
+                                                                            "remark": "检验-病理检查(通用)-炎症-分隔符",
                                                                             "labelPrefix": null,
                                                                             "labelSuffix": null,
                                                                             "addLine": "0",
@@ -533,7 +533,7 @@ Mock.mock('/384',{
                                                                             "structName": "#desc",
                                                                             "coverage": "1",
                                                                             "status": "1",
-                                                                            "remark": "化验-病理检查(通用)-炎症-补充",
+                                                                            "remark": "检验-病理检查(通用)-炎症-补充",
                                                                             "labelPrefix": null,
                                                                             "labelSuffix": null,
                                                                             "addLine": "0",
@@ -562,7 +562,7 @@ Mock.mock('/384',{
                                                             "coverage": "2",
                                                             "relationId": "1432",
                                                             "status": "1",
-                                                            "remark": "化验-胆病理检查-异常",
+                                                            "remark": "检验-胆病理检查-异常",
                                                             "show": null,
                                                             "selectType": "1",
                                                             "defaultSelect": "0",
@@ -586,7 +586,7 @@ Mock.mock('/384',{
                                                                     "location": "0",
                                                                     "status": "1",
                                                                     "sync": null,
-                                                                    "remark": "化验-病理检查(通用)-肿瘤",
+                                                                    "remark": "检验-病理检查(通用)-肿瘤",
                                                                     "elec": null,
                                                                     "show": "1",
                                                                     "showDefault": "0",
@@ -605,7 +605,7 @@ Mock.mock('/384',{
                                                                             "structName": "#back",
                                                                             "coverage": "1",
                                                                             "status": "1",
-                                                                            "remark": "化验-病理检查(通用)-肿瘤",
+                                                                            "remark": "检验-病理检查(通用)-肿瘤",
                                                                             "labelPrefix": null,
                                                                             "labelSuffix": null,
                                                                             "addLine": "0",
@@ -629,7 +629,7 @@ Mock.mock('/384',{
                                                                                     "coverage": "2",
                                                                                     "relationId": null,
                                                                                     "status": "1",
-                                                                                    "remark": "化验-病理检查(通用)-肿瘤",
+                                                                                    "remark": "检验-病理检查(通用)-肿瘤",
                                                                                     "show": null,
                                                                                     "selectType": "1",
                                                                                     "defaultSelect": "0",
@@ -652,7 +652,7 @@ Mock.mock('/384',{
                                                                                     "coverage": "2",
                                                                                     "relationId": null,
                                                                                     "status": "1",
-                                                                                    "remark": "化验-病理检查(通用)-肿瘤",
+                                                                                    "remark": "检验-病理检查(通用)-肿瘤",
                                                                                     "show": null,
                                                                                     "selectType": "1",
                                                                                     "defaultSelect": "0",
@@ -675,7 +675,7 @@ Mock.mock('/384',{
                                                                                     "coverage": "2",
                                                                                     "relationId": null,
                                                                                     "status": "1",
-                                                                                    "remark": "化验-病理检查(通用)-肿瘤",
+                                                                                    "remark": "检验-病理检查(通用)-肿瘤",
                                                                                     "show": null,
                                                                                     "selectType": "1",
                                                                                     "defaultSelect": "0",
@@ -698,7 +698,7 @@ Mock.mock('/384',{
                                                                                     "coverage": "2",
                                                                                     "relationId": null,
                                                                                     "status": "1",
-                                                                                    "remark": "化验-病理检查(通用)-肿瘤",
+                                                                                    "remark": "检验-病理检查(通用)-肿瘤",
                                                                                     "show": null,
                                                                                     "selectType": "1",
                                                                                     "defaultSelect": "0",
@@ -721,7 +721,7 @@ Mock.mock('/384',{
                                                                                     "coverage": "2",
                                                                                     "relationId": null,
                                                                                     "status": "1",
-                                                                                    "remark": "化验-病理检查(通用)-肿瘤",
+                                                                                    "remark": "检验-病理检查(通用)-肿瘤",
                                                                                     "show": null,
                                                                                     "selectType": "1",
                                                                                     "defaultSelect": "0",
@@ -749,7 +749,7 @@ Mock.mock('/384',{
                                                                             "structName": "#desc",
                                                                             "coverage": "1",
                                                                             "status": "1",
-                                                                            "remark": "化验-病理检查(通用)-肿瘤-分隔符",
+                                                                            "remark": "检验-病理检查(通用)-肿瘤-分隔符",
                                                                             "labelPrefix": null,
                                                                             "labelSuffix": null,
                                                                             "addLine": "0",
@@ -777,7 +777,7 @@ Mock.mock('/384',{
                                                                             "structName": "#desc",
                                                                             "coverage": "1",
                                                                             "status": "1",
-                                                                            "remark": "化验-病理检查(通用)-肿瘤-补充",
+                                                                            "remark": "检验-病理检查(通用)-肿瘤-补充",
                                                                             "labelPrefix": null,
                                                                             "labelSuffix": null,
                                                                             "addLine": "0",
@@ -806,7 +806,7 @@ Mock.mock('/384',{
                                                             "coverage": "2",
                                                             "relationId": "1433",
                                                             "status": "1",
-                                                            "remark": "化验-胆病理检查-异常",
+                                                            "remark": "检验-胆病理检查-异常",
                                                             "show": null,
                                                             "selectType": "1",
                                                             "defaultSelect": "0",
@@ -830,7 +830,7 @@ Mock.mock('/384',{
                                                                     "location": "0",
                                                                     "status": "1",
                                                                     "sync": null,
-                                                                    "remark": "化验-病理检查(通用)-损伤",
+                                                                    "remark": "检验-病理检查(通用)-损伤",
                                                                     "elec": null,
                                                                     "show": "1",
                                                                     "showDefault": "0",
@@ -849,7 +849,7 @@ Mock.mock('/384',{
                                                                             "structName": "#back",
                                                                             "coverage": "1",
                                                                             "status": "1",
-                                                                            "remark": "化验-病理检查(通用)-损伤",
+                                                                            "remark": "检验-病理检查(通用)-损伤",
                                                                             "labelPrefix": null,
                                                                             "labelSuffix": null,
                                                                             "addLine": "0",
@@ -873,7 +873,7 @@ Mock.mock('/384',{
                                                                                     "coverage": "2",
                                                                                     "relationId": null,
                                                                                     "status": "1",
-                                                                                    "remark": "化验-病理检查(通用)-破损",
+                                                                                    "remark": "检验-病理检查(通用)-破损",
                                                                                     "show": null,
                                                                                     "selectType": "1",
                                                                                     "defaultSelect": "0",
@@ -896,7 +896,7 @@ Mock.mock('/384',{
                                                                                     "coverage": "2",
                                                                                     "relationId": null,
                                                                                     "status": "1",
-                                                                                    "remark": "化验-病理检查(通用)-破损",
+                                                                                    "remark": "检验-病理检查(通用)-破损",
                                                                                     "show": null,
                                                                                     "selectType": "1",
                                                                                     "defaultSelect": "0",
@@ -919,7 +919,7 @@ Mock.mock('/384',{
                                                                                     "coverage": "2",
                                                                                     "relationId": null,
                                                                                     "status": "1",
-                                                                                    "remark": "化验-病理检查(通用)-破损",
+                                                                                    "remark": "检验-病理检查(通用)-破损",
                                                                                     "show": null,
                                                                                     "selectType": "1",
                                                                                     "defaultSelect": "0",
@@ -942,7 +942,7 @@ Mock.mock('/384',{
                                                                                     "coverage": "2",
                                                                                     "relationId": null,
                                                                                     "status": "1",
-                                                                                    "remark": "化验-病理检查(通用)-破损",
+                                                                                    "remark": "检验-病理检查(通用)-破损",
                                                                                     "show": null,
                                                                                     "selectType": "1",
                                                                                     "defaultSelect": "0",
@@ -970,7 +970,7 @@ Mock.mock('/384',{
                                                                             "structName": "#desc",
                                                                             "coverage": "1",
                                                                             "status": "1",
-                                                                            "remark": "化验-病理检查(通用)-损伤-分隔符",
+                                                                            "remark": "检验-病理检查(通用)-损伤-分隔符",
                                                                             "labelPrefix": null,
                                                                             "labelSuffix": null,
                                                                             "addLine": "0",
@@ -998,7 +998,7 @@ Mock.mock('/384',{
                                                                             "structName": "#desc",
                                                                             "coverage": "1",
                                                                             "status": "1",
-                                                                            "remark": "化验-病理检查(通用)-损伤-补充",
+                                                                            "remark": "检验-病理检查(通用)-损伤-补充",
                                                                             "labelPrefix": null,
                                                                             "labelSuffix": null,
                                                                             "addLine": "0",
@@ -1027,7 +1027,7 @@ Mock.mock('/384',{
                                                             "coverage": "2",
                                                             "relationId": "1434",
                                                             "status": "1",
-                                                            "remark": "化验-胆病理检查-异常",
+                                                            "remark": "检验-胆病理检查-异常",
                                                             "show": null,
                                                             "selectType": "1",
                                                             "defaultSelect": "0",
@@ -1051,7 +1051,7 @@ Mock.mock('/384',{
                                                                     "location": "0",
                                                                     "status": "1",
                                                                     "sync": null,
-                                                                    "remark": "化验-病理检查(通用)-萎缩",
+                                                                    "remark": "检验-病理检查(通用)-萎缩",
                                                                     "elec": null,
                                                                     "show": "1",
                                                                     "showDefault": "0",
@@ -1070,7 +1070,7 @@ Mock.mock('/384',{
                                                                             "structName": "#back",
                                                                             "coverage": "1",
                                                                             "status": "1",
-                                                                            "remark": "化验-病理检查(通用)-萎缩",
+                                                                            "remark": "检验-病理检查(通用)-萎缩",
                                                                             "labelPrefix": null,
                                                                             "labelSuffix": null,
                                                                             "addLine": "0",
@@ -1094,7 +1094,7 @@ Mock.mock('/384',{
                                                                                     "coverage": "2",
                                                                                     "relationId": null,
                                                                                     "status": "1",
-                                                                                    "remark": "化验-病理检查(通用)-萎缩",
+                                                                                    "remark": "检验-病理检查(通用)-萎缩",
                                                                                     "show": null,
                                                                                     "selectType": "1",
                                                                                     "defaultSelect": "0",
@@ -1117,7 +1117,7 @@ Mock.mock('/384',{
                                                                                     "coverage": "2",
                                                                                     "relationId": null,
                                                                                     "status": "1",
-                                                                                    "remark": "化验-病理检查(通用)-萎缩",
+                                                                                    "remark": "检验-病理检查(通用)-萎缩",
                                                                                     "show": null,
                                                                                     "selectType": "1",
                                                                                     "defaultSelect": "0",
@@ -1145,7 +1145,7 @@ Mock.mock('/384',{
                                                                             "structName": "#desc",
                                                                             "coverage": "1",
                                                                             "status": "1",
-                                                                            "remark": "化验-病理检查(通用)-萎缩-分隔符",
+                                                                            "remark": "检验-病理检查(通用)-萎缩-分隔符",
                                                                             "labelPrefix": null,
                                                                             "labelSuffix": null,
                                                                             "addLine": "0",
@@ -1173,7 +1173,7 @@ Mock.mock('/384',{
                                                                             "structName": "#desc",
                                                                             "coverage": "1",
                                                                             "status": "1",
-                                                                            "remark": "化验-病理检查(通用)-萎缩-补充",
+                                                                            "remark": "检验-病理检查(通用)-萎缩-补充",
                                                                             "labelPrefix": null,
                                                                             "labelSuffix": null,
                                                                             "addLine": "0",
@@ -1202,7 +1202,7 @@ Mock.mock('/384',{
                                                             "coverage": "2",
                                                             "relationId": "1435",
                                                             "status": "1",
-                                                            "remark": "化验-胆病理检查-异常",
+                                                            "remark": "检验-胆病理检查-异常",
                                                             "show": null,
                                                             "selectType": "1",
                                                             "defaultSelect": "0",
@@ -1226,7 +1226,7 @@ Mock.mock('/384',{
                                                                     "location": "0",
                                                                     "status": "1",
                                                                     "sync": null,
-                                                                    "remark": "化验-病理检查(通用)-血管异常",
+                                                                    "remark": "检验-病理检查(通用)-血管异常",
                                                                     "elec": null,
                                                                     "show": "1",
                                                                     "showDefault": "0",
@@ -1245,7 +1245,7 @@ Mock.mock('/384',{
                                                                             "structName": "#back",
                                                                             "coverage": "1",
                                                                             "status": "1",
-                                                                            "remark": "化验-病理检查(通用)-血管异常",
+                                                                            "remark": "检验-病理检查(通用)-血管异常",
                                                                             "labelPrefix": null,
                                                                             "labelSuffix": null,
                                                                             "addLine": "0",
@@ -1269,7 +1269,7 @@ Mock.mock('/384',{
                                                                                     "coverage": "2",
                                                                                     "relationId": null,
                                                                                     "status": "1",
-                                                                                    "remark": "化验-病理检查(通用)-血管异常",
+                                                                                    "remark": "检验-病理检查(通用)-血管异常",
                                                                                     "show": null,
                                                                                     "selectType": "1",
                                                                                     "defaultSelect": "0",
@@ -1292,7 +1292,7 @@ Mock.mock('/384',{
                                                                                     "coverage": "2",
                                                                                     "relationId": null,
                                                                                     "status": "1",
-                                                                                    "remark": "化验-病理检查(通用)-血管异常",
+                                                                                    "remark": "检验-病理检查(通用)-血管异常",
                                                                                     "show": null,
                                                                                     "selectType": "1",
                                                                                     "defaultSelect": "0",
@@ -1315,7 +1315,7 @@ Mock.mock('/384',{
                                                                                     "coverage": "2",
                                                                                     "relationId": null,
                                                                                     "status": "1",
-                                                                                    "remark": "化验-病理检查(通用)-血管异常",
+                                                                                    "remark": "检验-病理检查(通用)-血管异常",
                                                                                     "show": null,
                                                                                     "selectType": "1",
                                                                                     "defaultSelect": "0",
@@ -1343,7 +1343,7 @@ Mock.mock('/384',{
                                                                             "structName": "#desc",
                                                                             "coverage": "1",
                                                                             "status": "1",
-                                                                            "remark": "化验-病理检查(通用)-血管异常-分隔符",
+                                                                            "remark": "检验-病理检查(通用)-血管异常-分隔符",
                                                                             "labelPrefix": null,
                                                                             "labelSuffix": null,
                                                                             "addLine": "0",
@@ -1371,7 +1371,7 @@ Mock.mock('/384',{
                                                                             "structName": "#desc",
                                                                             "coverage": "1",
                                                                             "status": "1",
-                                                                            "remark": "化验-病理检查(通用)-血管异常-补充",
+                                                                            "remark": "检验-病理检查(通用)-血管异常-补充",
                                                                             "labelPrefix": null,
                                                                             "labelSuffix": null,
                                                                             "addLine": "0",
@@ -1400,7 +1400,7 @@ Mock.mock('/384',{
                                                             "coverage": "2",
                                                             "relationId": "1551",
                                                             "status": "1",
-                                                            "remark": "化验-胆病理检查-异常",
+                                                            "remark": "检验-胆病理检查-异常",
                                                             "show": null,
                                                             "selectType": "1",
                                                             "defaultSelect": "0",
@@ -1424,7 +1424,7 @@ Mock.mock('/384',{
                                                                     "location": "0",
                                                                     "status": "1",
                                                                     "sync": null,
-                                                                    "remark": "化验-胆病理检查-异常成分",
+                                                                    "remark": "检验-胆病理检查-异常成分",
                                                                     "elec": null,
                                                                     "show": "1",
                                                                     "showDefault": "0",
@@ -1443,7 +1443,7 @@ Mock.mock('/384',{
                                                                             "structName": "#back",
                                                                             "coverage": "1",
                                                                             "status": "1",
-                                                                            "remark": "化验-胆病理检查-异常成分",
+                                                                            "remark": "检验-胆病理检查-异常成分",
                                                                             "labelPrefix": null,
                                                                             "labelSuffix": null,
                                                                             "addLine": "0",
@@ -1467,7 +1467,7 @@ Mock.mock('/384',{
                                                                                     "coverage": "2",
                                                                                     "relationId": null,
                                                                                     "status": "1",
-                                                                                    "remark": "化验-胆病理检查-异常成分",
+                                                                                    "remark": "检验-胆病理检查-异常成分",
                                                                                     "show": null,
                                                                                     "selectType": "1",
                                                                                     "defaultSelect": "0",
@@ -1495,7 +1495,7 @@ Mock.mock('/384',{
                                                                             "structName": "#desc",
                                                                             "coverage": "1",
                                                                             "status": "1",
-                                                                            "remark": "化验-胆病理检查-异常成分-分隔符",
+                                                                            "remark": "检验-胆病理检查-异常成分-分隔符",
                                                                             "labelPrefix": null,
                                                                             "labelSuffix": null,
                                                                             "addLine": "0",
@@ -1523,7 +1523,7 @@ Mock.mock('/384',{
                                                                             "structName": "#desc",
                                                                             "coverage": "1",
                                                                             "status": "1",
-                                                                            "remark": "化验-胆病理检查-异常成分-补充",
+                                                                            "remark": "检验-胆病理检查-异常成分-补充",
                                                                             "labelPrefix": null,
                                                                             "labelSuffix": null,
                                                                             "addLine": "0",
@@ -1557,7 +1557,7 @@ Mock.mock('/384',{
                                                     "structName": "#desc",
                                                     "coverage": "1",
                                                     "status": "1",
-                                                    "remark": "化验-胆病理检查-异常-补充",
+                                                    "remark": "检验-胆病理检查-异常-补充",
                                                     "labelPrefix": null,
                                                     "labelSuffix": null,
                                                     "addLine": "0",

src/mock/form/index.js

@@ -10,6 +10,6 @@ module.exports = {
     formData1756, // 既往史
     formData1647, // 其他史
     formData1948,// 查体
-    formData17,// 化验
-    formData384,// 化验
+    formData17,// 检验
+    formData384,// 检验
 };

src/store/actions/patInfo.js

@@ -39,9 +39,9 @@ export const updateHospitalMessage=(state,action)=>{
       connect:{}
     };
     for(let i = 0;i < action.data.length;i++){
-      if(action.data[i].code == 'import_way_lis'){//化验数据
+      if(action.data[i].code == 'import_way_lis'){//检验数据
         tmpObj.lis=action.data[i]
-      }else if(action.data[i].code == 'import_way_pacs'){//辅检数据
+      }else if(action.data[i].code == 'import_way_pacs'){//检查数据
         tmpObj.pacs=action.data[i]
       }else if(action.data[i].code == 'connect'){//是否对接
         tmpObj.connect=action.data[i]

src/store/actions/wrapModalBody.js

@@ -16,11 +16,11 @@ export const allCheckImportIns = () => ({         //全选反选
     type:SET_ALLCHECK_INS
 })
 
-export const getHospitalInspectList = (list) => ({         //检索医院化验项
+export const getHospitalInspectList = (list) => ({         //检索医院检验项
     type:SEARCH_HOSPITAL_INSPECT, 
     list
 })
-export const getHospitalInspectDetailList = (list,name,time) => ({         //检索医院化验项
+export const getHospitalInspectDetailList = (list,name,time) => ({         //检索医院检验项
     type:SEARCH_HOSPITAL_INSPECT_SON,
     list,
     name,

src/store/actions/wrapModalBodyPac.js

@@ -13,12 +13,12 @@ export const selectOneChecks = (name,checkItem,item,idx) => ({         //选一
 export const allCheckImports = () => ({         //全选反选
   type:SET_ALLCHECKS
 })
-export const getHospitalPacDetailList = (list,name) => ({         //检索医院辅检项
+export const getHospitalPacDetailList = (list,name) => ({         //检索医院检查项
   type:SEARCH_HOSPITAL_PAC_SON,
   list,
   name
 })
-export const getHospitalPacList = (list,msg) => ({         //检索医院辅检项
+export const getHospitalPacList = (list,msg) => ({         //检索医院检查项
   type:SEARCH_HOSPITAL_PAC,
   list,msg
 })

src/store/async-actions/assistCheck.js

@@ -2,6 +2,7 @@ import axios from '@utils/ajax';
 import store from '@store';
 import { searchList } from '../actions/assistCheck';
 import {  Notify } from '@commonComp';
+import { formatFormParmas } from '@utils/tools';
 
 export const getSearchList = (val) => {
     if(val.trim() == ''){
@@ -12,9 +13,9 @@ export const getSearchList = (val) => {
     let sex = baseList.patInfo.message.patientSex;
     return (dispatch) => {
         axios.json('/demo/retrieval/index',{
-            "age": 10,
+            "age": formatFormParmas('patientAge',baseList.patInfo.patInfoData),
             "inputStr": val,
-            "sex": 1,
+            "sex": formatFormParmas('patientSex',baseList.patInfo.patInfoData),
             "type": '3'
         })
         .then((res)=>{

src/store/async-actions/diagnosticList.js

@@ -9,7 +9,7 @@ export const isAddMainSuit = () =>{
     return (dispatch, getState) => {
         const state = getState();
         if(state.diagnosticList.diagnosticList.length === 1 && state.diagnosticList.diagnosticList[0].type === 2) {
-            const isAddMainSuitFlag = state.mainSuit.data && state.mainSuit.data.length === 0 && state.mainSuit.saveText    //判断主诉和化验查体是否为空
+            const isAddMainSuitFlag = state.mainSuit.data && state.mainSuit.data.length === 0 && state.mainSuit.saveText    //判断主诉和检验查体是否为空
                                       && (state.mainSuit.saveText.length === 0 || state.mainSuit.saveText.length === 1 
                                       &&  state.mainSuit.saveText[0] === '') && state.assistCheck && state.assistCheck.dataString.length === 0
                                       && state.inspect.labelList && state.inspect.labelList.length === 0 && state.inspect.inspectStrPlus.length === 0

src/store/async-actions/diagnosticSearch.js

@@ -2,6 +2,7 @@ import { json } from "@utils/ajax";
 import { GET_SEARCH_RESULT } from '@store/types/diagnosticSearch';
 import { GET_SEARCH } from '@store/types/emergencyHis';
 import {  Notify } from '@commonComp';
+import { formatFormParmas } from '@utils/tools';
 
 export const getSearchList = (val,flag) => {
     if(val.trim() == ''){
@@ -29,9 +30,9 @@ export const getSearchList = (val,flag) => {
         }
         json('/demo/retrieval/index',{
             "type":'4',
-            "age": 10,
+            "age": formatFormParmas('patientAge',baseList.patInfo.patInfoData),
             "inputStr": val,
-            "sex": 1
+            "sex": formatFormParmas('patientSex',baseList.patInfo.patInfoData),
         })
         .then((res)=>{
             if(res.data.code==0){

src/store/async-actions/fetchModules.js

@@ -323,7 +323,7 @@ export function autoFillModules (){
     const cbody = initData.checkbody?[...initData.checkbody]:[block];
     dispatch({type: CURRENT_CHRONIC})//现病史
     //其他史模板填充-先去历史，无历史用模板
-    inspectAndAssist()//化验辅检
+    inspectAndAssist()//检验检查
     dispatch(setOtherHisModule());
     //查体模板填充
     dispatch({

src/store/async-actions/homePage.js

@@ -11,7 +11,7 @@ const api = {
   getModules:'/moduleInfo/getAll',
   clickCount:'/buriedSomeStatistical/saveBuriedSomeStatisticals', //埋点统计
   getChronic:'/disType/getDisType', //慢病列表
-  getQuestionUsual:'/questionUsual/getQuestionUsual', //化验常用标签
+  getQuestionUsual:'/questionUsual/getQuestionUsual', //检验常用标签
   getSystemConfig:'/sysSet/getSysSetInfoDatas',     //获取系统配置
 };
 
@@ -130,7 +130,7 @@ export const getChronic = (dispatch,getState)=>{
     }
   })
 }
-// 请求化验辅检常用标签
+// 请求检验检查常用标签
 export const getCommonList = (val)=>{
   return (dispatch,getState) => {
     const state = getState();

src/store/async-actions/inspect.js

@@ -3,6 +3,7 @@ import store from '@store';
 import {  Notify } from '@commonComp';
 
 import { searchList,resetLabel } from '../actions/inspect';
+import { formatFormParmas } from '@utils/tools';
 
 export const getSearchList = (val) => {
     if(val.trim() == ''){
@@ -10,13 +11,12 @@ export const getSearchList = (val) => {
         return (dispatch) => dispatch(searchList(data,''));
     }
     let baseList = store.getState();
-    // console.log(baseList)
     let type = baseList.inspect.shType;
     return (dispatch) => {
         axios.json('/demo/retrieval/index',{
-            "age": 10,
+            "age": formatFormParmas('patientAge',baseList.patInfo.patInfoData),
             "inputStr": val,
-            "sex": 1,
+            "sex": formatFormParmas('patientSex',baseList.patInfo.patInfoData),
             "type": type
         })
         .then((res)=>{

src/store/async-actions/mainSuit.js

@@ -44,7 +44,7 @@ export async function getCommSymptomPush(){//获取大数据推送症状
       const type = 1;
       const emrData = getEMRParams();
       const params = {
-        "featureType": type,//类型1：症状，4：查体，5：化验，6：辅检，7：诊断
+        "featureType": type,//类型1：症状，4：查体，5：检验，6：检查，7：诊断
       };
     const bigData = json(api.symptomPush,Object.assign({},params,emrData));
     return bigData;

src/store/async-actions/newAdvice.js

@@ -2,6 +2,7 @@ import axios from '@utils/ajax';
 import store from '@store';
 import { searchList,resetLabel } from '../actions/newAdvice';
 import {  Notify } from '@commonComp';
+import { formatFormParmas } from '@utils/tools';
 
 export const getSearchList = (val) => {
     if(val.trim() == ''){
@@ -12,9 +13,9 @@ export const getSearchList = (val) => {
     let type = baseList.newAdvice.shType;
     return (dispatch) => {
         axios.json('/demo/retrieval/index',{
-            "age": 10,
+            "age": formatFormParmas('patientAge',baseList.patInfo.patInfoData),
             "inputStr": val,
-            "sex": 1,
+            "sex": formatFormParmas('patientSex',baseList.patInfo.patInfoData),
             "type": type
         })
         .then((res)=>{

src/store/async-actions/patInfo.js

@@ -244,8 +244,8 @@ export async function getPatientMessage(dispatch, getState){
     dispatch(embedPush({mode:1}));      //默认空白情况，刷新右侧
   //}
   //dispatch(getInitModules);     //确保病人信息获取以后再获取模板等数据，否则参数为空
-  dispatch(getCommonList(5));     //获取常用化验标签列表
-  dispatch(getCommonList(6));     //获取常用辅检标签列表if(allModules.length == 0){//模板为空才回读
+  dispatch(getCommonList(5));     //获取常用检验标签列表
+  dispatch(getCommonList(6));     //获取常用检查标签列表if(allModules.length == 0){//模板为空才回读
   //dispatch(initHistoryDetails());      //历史病历回读
 }
 

src/store/async-actions/print.js

@@ -118,7 +118,7 @@ export const saveMedicalData = () =>{
             "contentJson": '',
             "type": 8
         },
-        // 化验
+        // 检验
         {
             "content": tempPreview.lis,
             "contentValue": tempPreview.lis,
@@ -315,7 +315,7 @@ export const realSaveData = (bool,list) => {
     }
 };
 
-//转换化验指标保存需要的数据
+//转换检验指标保存需要的数据
 function transferIndexData(data) {
     const arr=[];
    data.map((it)=>{

src/store/reducers/assistCheck.js

@@ -21,7 +21,7 @@ const initSearchList = {
   selectGroupList: [], //选的组的明细可能有多个组
   allCheck: false, //全选反选
   checkedList: [], //选中的小项
-  checkedListImport: [], //辅检导入
+  checkedListImport: [], //检查导入
   allCheckLis:[],//所有导入数据
   msgObj:{
     name:'',
@@ -94,7 +94,7 @@ export default (state = initSearchList, action) => {
     const newState = Object.assign({}, state);
     let tempArr = newState.assistLabel,tempArrs = [],tempOrder=[];
     let tmpImportLis = newState.checkedListImport;
-    if(action.flg == 0){//删除辅检导入
+    if(action.flg == 0){//删除检查导入
       tmpImportLis.splice(action.idx,1)
     }else{
       for (let k = 0; k < tempArr.length; k++) {

src/store/reducers/inspect.js

@@ -155,7 +155,7 @@ export default (state = initSearchList, action) => {
         newState.inspectStrPlus = getStringPlus(newState.pushItems)
         return newState;
     }
-    if (action.type == ADD_LABEL) {             //右侧推送的化验辅检项，点击开单放到左侧化验辅检的位置上
+    if (action.type == ADD_LABEL) {             //右侧推送的检验检查项，点击开单放到左侧检验检查的位置上
         const newState = Object.assign({}, state);
         const tempArr = newState.labelList;
         for(let i = 0;i <action.lis.length;i++){

src/store/reducers/newAdvice.js

@@ -151,7 +151,7 @@ export default (state = initSearchList, action) => {
         newState.inspectStrPlus = getStringPlus(newState.pushItems)
         return newState;
     }
-    if (action.type == ADD_LABEL) {             //右侧推送的化验辅检项，点击开单放到左侧化验辅检的位置上
+    if (action.type == ADD_LABEL) {             //右侧推送的检验检查项，点击开单放到左侧检验检查的位置上
         const newState = Object.assign({}, state);
         const tempArr = newState.labelList;
         for(let i = 0;i <action.lis.length;i++){

src/store/reducers/pushMessage.js

@@ -15,7 +15,7 @@ const initState = {
   assay: [],
   determine: [],
   MRAnalyseResult:[],
-  check: [ //辅检
+  check: [ //检查
   ],
   tips: {},
   advice: {},

src/store/reducers/wrapModalBodyPac.js

@@ -15,7 +15,7 @@ const initSearchList = {
   dataString: '', //结果拼接
   assistVal: '',
 
-  checkedListImport: [], //辅检导入
+  checkedListImport: [], //检查导入
   hospitalPac: [], //医院检索到的
   hospitalPacObj: {}, //组对应的明细（单选多选全选）
   selectGroupList: [], //选的组的明细可能有多个组

src/store/types/homePage.js

@@ -12,8 +12,8 @@ export const ISREAD = 'is_history_or_template';     //是否回读或模板数
 export const SETOTHERHISTORY = 'set_otherHis_history';    //其他史历史数据暂存
 export const SETMINSCREEN = 'SETMINSCREEN';    //1024标识
 export const MODI_LOADING = 'MODI_LOADING';    //1024标识
-export const GET_ASSIST_LIST = 'GET_ASSIST_LIST';    //辅检
-export const GET_INSPECT_LIST = 'GET_INSPECT_LIST';    //化验
+export const GET_ASSIST_LIST = 'GET_ASSIST_LIST';    //检查
+export const GET_INSPECT_LIST = 'GET_INSPECT_LIST';    //检验
 export const SETALLMODULES = 'SETALLMODULES';    //储存所有模板数据
 export const SETSYSTEMCONFIG = 'SETSYSTEMCONFIG';   //设置配置数据
 export const SETPRE = 'SETPRE';   //设置预问诊引用弹窗

src/store/types/pushMessage.js

@@ -1,15 +1,15 @@
 export const CHANGE_ASSAY = 'CHANGE_ASSAY';
 export const CHANGE_CHECK = 'CHANGE_CHECK';
 export const BILLING_ADVICE = 'BILLING_ADVICE';
-export const ADD_ASSAY = 'ADD_ASSAY'; //添加化验；
-export const ADD_CHECK = 'ADD_CHECK'; //添加辅检；
+export const ADD_ASSAY = 'ADD_ASSAY'; //添加检验；
+export const ADD_CHECK = 'ADD_CHECK'; //添加检查；
 export const ADD_SCHEME = 'ADD_SCHEME'; //添加治疗方案；
 export const SET_TIPS = 'SET_TIPS'; //设置提示信息；
 export const SET_TIPS_DETAILS = 'SET_TIPS_DETAILS'; //设置提示信息详情页内容；
 export const SET_CHANGE_ADVICE_TREATMENT = 'SET_CHANGE_ADVICE_TREATMENT';//改变医嘱的文字内容；
 export const ADD_BILLING = 'ADD_BILLIND'; //添加开单项
-export const SET_CHANGE_ADVICE_ASSAY = 'SET_CHANGE_ADVICE_ASSAY';   //改变医嘱部分辅检的文字内容
-export const SET_CHANGE_ADVICE_CHECK = 'SET_CHANGE_ADVICE_CHECK';   //改变医嘱部分化验的文字内容
+export const SET_CHANGE_ADVICE_ASSAY = 'SET_CHANGE_ADVICE_ASSAY';   //改变医嘱部分检查的文字内容
+export const SET_CHANGE_ADVICE_CHECK = 'SET_CHANGE_ADVICE_CHECK';   //改变医嘱部分检验的文字内容
 export const CLEAR_ALL_PUSH_MESSAGE = 'CLEAR_ALL_PUSH_MESSAGE';   //清除所有推送信息
 export const SHOW_TIPS_DETAILS = 'SHOW_TIPS_DETAILS'; //显示提示详情页
 export const HIDE_TIPS_DETAILS = 'HIDE_TIPS_DETAILS'; //显示提示详情页

src/utils/utils.js

@@ -234,7 +234,7 @@ export async function getBigPush(type,symData,save){
   const emrData = getEMRParams();
   const params = {
     "ruleType":config.ruleTypeMap[type],
-    "featureType": type,  //类型1：症状，4：查体，5：化验，6：辅检，7：诊断
+    "featureType": type,  //类型1：症状，4：查体，5：检验，6：检查，7：诊断
   };
   if(save){
     let savePm = Object.assign({},emrData);