Merge remote-tracking branch 'origin/optimize' into dev/new1

src/components/AddInspect/SlideExcel/index.jsx

@@ -34,7 +34,7 @@ class SlideExcel extends Component {
     const {items,item,idx,dateTime,getInfomation} = this.props;
     const {show} = this.state;
     return (
-      <li className={styles.excelDataLis} style={{border:items.lisExcelRes.length-1 == idx? 0:''}}>
+      <li className={`${styles.excelDataLis} clearfix`} style={{border:items.lisExcelRes.length-1 == idx? 0:''}}>
           <span className={styles.excelDataTitle}>
               <span className={styles.tagSpan}>
                 {item.menus}
@@ -71,7 +71,7 @@ class SlideExcel extends Component {
                         </td>
                         <td style={{width:'20%'}}>
                           {
-                            getStatusImg(value.type,value.value,0)
+                            getStatusImg(value.type,value.value,1)
                           } 
                           {value.unit}</td>
                         <td style={{width:'25%'}}>

src/components/AddInspect/SlideExcel/index.less

@@ -42,7 +42,7 @@
 .table {
   color: #000;
   width: 80%;
-  display: inline-block;
+  // display: inline-block;
   tr {
       line-height: 18px;
       height: 18px;

src/components/AddInspect/SlideSelect/index.less

@@ -3,8 +3,9 @@
     // cursor: pointer;
     // color: #767676;
     position: relative;
-    padding: 10px 20px 10px 0;
+    padding: 10px 0px 10px 0;
     border-bottom:1px dashed #989DA3;
+    margin-top: 5px;
     i {
         font-style: normal;
         display: inline-block;
@@ -31,10 +32,10 @@
         cursor: pointer;
         display: inline-block;
         position: absolute;
-        right: 2px;
-        top: 13px;
-        // background-color: #fff;
+        right: -4px;
+        top: 0px;
         background: @closeIcon;
+        background-color: #fff;
         background-size: 100% 100%;
     }
 }
@@ -43,6 +44,7 @@
     border-radius: 4px;
        .partDel{
         background: @closeHor;
+        background-color: #fff;
         background-size: 100% 100%;
       } 
 }

src/components/AddInspect/index.jsx

@@ -1,8 +1,8 @@
 import React from 'react';
-import { SearchOption, InspectCommon, Calendar ,Notify,ConfirmModal,Add,DelToast} from '@commonComp';
+import { SearchOption, InspectCommon, Calendar, Notify, ConfirmModal, Add, DelToast } from '@commonComp';
 import SlideExcel from './SlideExcel';
 import SlideSelect from './SlideSelect';
-import { deepClone,getPageCoordinate } from '@utils/tools';
+import { deepClone, getPageCoordinate, getStatusImg ,getCurrentDate} from '@utils/tools';
 import styles from './index.less';
 import date1 from './img/date1.png';
 import close from './img/close.png';
@@ -24,9 +24,9 @@ class Inspect extends React.Component {
       num: 0,            //暂存数据，获取一次，不能每次都是新的数据
       type: null,
       id: null,
-      pageTop:'',
+      pageTop: '',
       // tmpIds: [],      //内层外层
-      impId:null
+      impId: null
     }
     this.handleChangeDate = this.handleChangeDate.bind(this)
     this.handleShowDate = this.handleShowDate.bind(this)
@@ -45,7 +45,7 @@ class Inspect extends React.Component {
   }
   delConfirm() {//弹窗确定
     const { delPartItem, handleCloseExcel, handlePush } = this.props;
-    const { type, id ,impId} = this.state;
+    const { type, id, impId } = this.state;
     if (type == 1) {
       delPartItem(id)
     } else if (type == 2) {
@@ -59,18 +59,18 @@ class Inspect extends React.Component {
     Notify.success("删除成功");
     handlePush && handlePush();       //右侧推送
   }
-  handleDelClick(type, idx) { 
-    if (type == 2){
+  handleDelClick(type, idx) {
+    if (type == 2) {
       this.setState({
-        impId:idx,
+        impId: idx,
         type: type,
-        id:null
+        id: null
       })
-    }else{
+    } else {
       this.setState({
         type: type,
         id: idx,
-        impId:null
+        impId: null
       })
     }
   }
@@ -101,9 +101,9 @@ class Inspect extends React.Component {
           this.setState({ showFill: false, date: false });
         }
       }
-      
-      if(_del){
-        if(!event.target.isEqualNode(_impClose) && !event.target.isEqualNode(_addClose) && !event.target.isEqualNode(_del)  && event.target.parentNode != _del && !event.target.isEqualNode(_closeTil)){
+
+      if (_del) {
+        if (!event.target.isEqualNode(_impClose) && !event.target.isEqualNode(_addClose) && !event.target.isEqualNode(_del) && event.target.parentNode != _del && !event.target.isEqualNode(_closeTil)) {
           this.setState({
             id: null,
             impId: null
@@ -111,7 +111,7 @@ class Inspect extends React.Component {
         }
       }
     });
-    this.getCurrentDate();
+    this.setState({ dateTime: getCurrentDate(1) })
   }
   componentWillReceiveProps(nextProps) {
     if (nextProps.fillActive.name != this.props.fillActive.name) {
@@ -122,12 +122,13 @@ class Inspect extends React.Component {
     this.setState({ showFill: false })
   }
   handleChangeDate(info) {
-    let date = info.year + '-' + (info.month < 10 ? '0' + info.month : info.month) + '-' + (info.day < 10 ? '0' + info.day : info.day);
+    let date = info.year+'-'+info.month.toString().padStart(2,'0')+'-'+info.day.toString().padStart(2,'0')
+    // let date = info.year+'-'+info.month.toString().padStart(2,'0')+'-'+info.day.toString().padStart(2,'0')+' '+h.toString().padStart(2,'0')+m.toString().padStart(2,'0')+s.toString().padStart(2,'0');
     this.setState({ dateTime: date, date: false })
   }
   handleSearchShow(e) {
     let tmpShow = this.state.show;
-    this.setState({ show: !tmpShow,pageTop:getPageCoordinate(e).boxTop })
+    this.setState({ show: !tmpShow, pageTop: getPageCoordinate(e).boxTop })
     // e.stopPropagation();
   }
   handleFillShow(e, idx) {
@@ -137,7 +138,7 @@ class Inspect extends React.Component {
       showFill: !tmpShow,
       currentIdx: idx,
       currentData: baseList,
-      dateTime: baseList.time ? baseList.time : this.getCurrentDate()
+      dateTime: baseList.time ? baseList.time : getCurrentDate(1)
     })
     e.stopPropagation();
   }
@@ -172,7 +173,7 @@ class Inspect extends React.Component {
         tempArr.details[i].value = ''
         tempArr.show = false;
       }
-      tempArr.time = this.getCurrentDate();
+      tempArr.time = getCurrentDate(1);
       this.setState({ currentData: tempArr })
       return;
     } else {
@@ -258,7 +259,7 @@ class Inspect extends React.Component {
             className={styles.searchLi}
             title={(item.name == item.retrievalName || !item.retrievalName) ? item.name : item.name + '(' + item.retrievalName + ')'}
             onClick={() => {
-              handleSign(item.questionId, idx,'search');
+              handleSign(item.questionId, idx, 'search');
               this.setState({ show: false })
             }}
           >
@@ -268,8 +269,8 @@ class Inspect extends React.Component {
       }
     </ul>
   }
-  getCommonList(){//常用列表
-    const { handleSign,inspectList } = this.props;
+  getCommonList() {//常用列表
+    const { handleSign, inspectList } = this.props;
     return <ul className={styles.searchLiUl}>
       {
         inspectList && inspectList.map((item, idx) => {
@@ -277,7 +278,7 @@ class Inspect extends React.Component {
             className={styles.searchLi}
             title={item.name}
             onClick={() => {
-              handleSign(item.questionId, idx,'common');
+              handleSign(item.questionId, idx, 'common');
               this.setState({ show: false })
             }}
           >
@@ -288,6 +289,32 @@ class Inspect extends React.Component {
     </ul>
   }
   showDetails(val) {
+    let min = val.minValue, max = val.maxValue, value = val.value, dom = '';
+    if (!isNaN(min) && !isNaN(max)) {//有最大值最小值
+      if (isNaN(value)) {//输入的不是数据
+        dom = getStatusImg(1, value, 1)
+      } else if (value <= min) {//下降
+        dom = getStatusImg(3, value, 1)
+      } else if (value >= max) {//上升
+        dom = getStatusImg(2, value, 1)
+      } else {//正常
+        dom = getStatusImg(0, value, 1)
+      }
+    } else if (isNaN(min) && !isNaN(max)) {//有最大值无最小值
+      if (value >= max) {//上升
+        dom = getStatusImg(2, value, 1)
+      } else {//正常
+        dom = getStatusImg(0, value, 1)
+      }
+    } else if (!isNaN(min) && isNaN(max)) {//有最小值无最大值
+      if (value <= min) {//下降
+        dom = getStatusImg(3, value, 1)
+      } else {//正常
+        dom = getStatusImg(0, value, 1)
+      }
+    } else {//无最大最小值
+      dom = getStatusImg(1, value, 1)
+    }
     if (val.questionDetailList.length > 0) {
       return val.questionDetailList.map((item) => {
         if (val.value == item.name) {
@@ -295,12 +322,13 @@ class Inspect extends React.Component {
         }
       })
     } else {
-      return <td style={{ width: '20%' }}><span className={(val.value - 0).toString() == 'NaN' ? "red" : (val.maxValue || val.minValue) ? (val.value > val.maxValue || val.value < val.minValue ? "red" : '') : ''}>{val.value}</span> {val.labelSuffix}</td>
+      // return <td style={{ width: '20%' }}><span className={(val.value - 0).toString() == 'NaN' ? "red" : (val.maxValue || val.minValue) ? (val.value > val.maxValue || val.value < val.minValue ? "red" : '') : ''}>{val.value}</span> {val.labelSuffix}</td>
+      return <td style={{ width: '20%' }}>{dom} {val.labelSuffix}</td>
     }
   }
   render() {
-    const { getInfomation,handleChangeValue,inspectVal, list, labelList,windowHeight, delPartItem, handleLabelSub, handleClear, handleConfirm, fillActive, getExcelDataList, handleCloseExcel, handlePush } = this.props;
-    const { tmpId, tmpIdx,id,pageTop,impId} = this.state;
+    const { getInfomation, handleChangeValue, inspectVal, list, labelList, windowHeight, delPartItem, handleLabelSub, handleClear, handleConfirm, fillActive, getExcelDataList, handleCloseExcel, handlePush } = this.props;
+    const { tmpId, tmpIdx, id, pageTop, impId } = this.state;
 
     return (
       <div className={styles.wrapper}>
@@ -312,10 +340,10 @@ class Inspect extends React.Component {
                   items && items.lisExcelRes.length > 0 ? <ul className={styles.excelDataLists}>
                     {/*<img className={styles.close} src={close} alt="关闭导入excel数据" onClick={() => { this.handleDelClick(2, id) }} />*/}
                     <span className={styles.close} id="impClose" onClick={() => { this.handleDelClick(2, ind) }}></span>
-                    <DelToast show={impId==ind?true:false}
-                    name="该导入项" 
-                    cancel={this.handleCancel}
-                    confirm={this.delConfirm}/>
+                    <DelToast show={impId == ind ? true : false}
+                      name="该导入项"
+                      cancel={this.handleCancel}
+                      confirm={this.delConfirm} />
                     {
                       items.lisExcelRes.map((item, idx) => {
                         return <SlideExcel
@@ -338,7 +366,7 @@ class Inspect extends React.Component {
                 return <SlideSelect
                   item={item}
                   idx={idx}
-                  showToast={idx==id?true:false}
+                  showToast={idx == id ? true : false}
                   showFill={this.state.showFill}
                   handlePush={handlePush}
                   fillActive={fillActive}
@@ -363,17 +391,17 @@ class Inspect extends React.Component {
             }
           </ul>
         </div>
-        <div style={{ position: "relative", clear: "both",top:"5px" }}>
+        <div style={{ position: "relative", clear: "both", top: "5px" }}>
           <Add showText="添加化验项" handleClick={(e) => this.handleSearchShow(e)} id="searchWrap" />
           {this.state.show ? <SearchOption windowHeight={windowHeight} height={280} 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 ? this.getSearchList(list) : (inspectVal == '' ? '' : <p style={{ padding: '5px 30px', color: '#bfbfbf' }}>暂无筛选项</p>)}
             {
-              list && list.length>0 || (inspectVal != '')?'':<div>
-                  <p style={{padding:'5px 30px',color:'#bfbfbf'}}>常用化验项</p>
-                  {
-                    this.getCommonList()
-                  }
-                </div>
+              list && list.length > 0 || (inspectVal != '') ? '' : <div>
+                <p style={{ padding: '5px 30px', color: '#bfbfbf' }}>常用化验项</p>
+                {
+                  this.getCommonList()
+                }
+              </div>
             }
           </SearchOption> : ''}
         </div>

src/components/AssessResult/ScaleItem/index.jsx

@@ -309,7 +309,7 @@ class ScaleItem extends Component {
     }
     for( let i in scaleItems){
       it = this.getScaleContent(scaleItems[i]);
-      if(!it) return '';
+      if(!it) continue;
       let scaleRes=formulaResult&&formulaResult[it.id]&&formulaResult[it.id].calcalculate;
       temp =<span className={style['scale']} onClick={()=>this.handleShowScale(it)}>
                         {scaleRes&&scaleRes.result?(' 【'+it.name+'】 结果：'+scaleRes.result.value+" "+(scaleRes.result.text||'')):'【'+it.name+'】'}
@@ -324,7 +324,7 @@ class ScaleItem extends Component {
           <img className={style["deleteIcon"]} src={deleteIcon} />
         </div>
       </li>;
-      return li;
+      arr.push(li);
     };
     return arr;
   }

src/components/AssessResult/index.jsx

@@ -6,15 +6,15 @@ import ScaleItem from "./ScaleItem";
 import Information from '../Information'
 import ChartItem from "./ChartItem";
 import Notify from '@commonComp/Notify';
-import {readyKeepHistory} from '@utils/tools';
+import {readyKeepHistory,deepClone} from '@utils/tools';
 import loadingIcon from '@common/images/loading.gif';
 
 class AssessResult extends Component {
   constructor(props) {
     super(props);
-    const chooseSelecteds = JSON.parse(JSON.stringify(props.chooseSelecteds)||{});
-    const wholeIndexs = JSON.parse(JSON.stringify(props.wholeIndexs)||{});      //深度复制，Object.assgin为浅复制，下下级会同源
-    const wholeScale = JSON.parse(JSON.stringify(props.wholeScaleItems)||{});
+    const chooseSelecteds = deepClone(props.chooseSelecteds);
+    const wholeIndexs = deepClone(props.wholeIndexs);      //深度复制，Object.assgin为浅复制，下下级会同源
+    const wholeScale = deepClone(props.wholeScaleItems);
 
     this.state={
       chooseSelecteds:chooseSelecteds,     //大数据选择模块
@@ -56,7 +56,8 @@ class AssessResult extends Component {
     }
     if(isList){         //删除全部量表中的项目
       const items = Object.assign({},this.state.wholeScaleItems);
-      items[i]=null;
+      delete items[i];
+      //items[i]=null;
       this.setState({
         wholeScaleItems: items,
         addedScaleIds:ids

src/components/AssistCheck/index.jsx

@@ -180,19 +180,19 @@ class AssistCheck extends React.Component {
                     </div> */}
                     {
                       hospitalMsg.import_way_pacs == 1 ? <div className={styles.pushButton} disabled={ieVersion && ieVersion > 9 ? true : false} onClick={ieVersion && ieVersion <= 9 ? null : this.handleImportExcel}>
-                        导入化验结果
+                        导入辅检结果
                         <input type="file" name="uploadfile" id="choose" style={{ display: 'none' }} ref={(DOM) => this.inputRef = DOM} />
                       </div> : hospitalMsg.import_way_pacs == 2 ? <div className={styles.pushButton} disabled={ieVersion && ieVersion > 9 ? true : false} onClick={checkSystemIpt}>
-                        检查系统导入
+                        导入辅检结果
                       </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}>
                               <div onClick={ieVersion && ieVersion <= 9 ? null : this.handleImportExcel}>本地导入</div>
                               <input type="file" name="uploadfile" id="choose" style={{ display: 'none' }} ref={(DOM) => this.inputRef = DOM} />
                             </li>
-                            <li className={`${styles.excelIpt} ${styles.systemIpt}`} onClick={checkSystemIpt}>检查系统导入</li>
+                            <li className={`${styles.excelIpt} ${styles.systemIpt}`} onClick={checkSystemIpt}>从设备导入</li>
                           </ul>:null
                         }
                           </div> : null

src/components/ChronicInfo/index.jsx

@@ -4,8 +4,6 @@ import chronicPic from "../../common/images/chronic.png";
 import level1 from "../../common/images/级别1.png";
 import tableIcon from '@common/images/table.png';
 import allTableIcon from '@common/images/all-table.png';
-import add from '@common/images/add-result.png';
-import added from '@common/images/first.png';
 import checkIcon from '@common/images/check.png';
 import up from '@common/images/slide-up.png';
 import down from '@common/images/slide-down.png';
@@ -152,6 +150,9 @@ class ChronicInfo extends React.Component{
         return ;
       }
       this.handleAddAssessItem(scaleParam.v,scaleParam.i,scaleParam.j);
+      this.setState({
+        scaleParam:{}
+      });
     }
     this.props.hideList({name:'showTable',value:false});
   }
@@ -497,43 +498,69 @@ class ChronicInfo extends React.Component{
   }
   render(){
     const {comfirnFlag,flag,ff} = this.state;
-    const {chronicMagItem,chronicDesease,formulaResult,showHide,slideUp} = this.props;
+    const {chronicMagItem,chronicDesease,data,showHide,slideUp} = this.props;
+    console.log(showHide)
     const scaleFooter = <Footer print={true}
                                 footText={showHide.isPop||!chronicMagItem?"确定":"加入病例记录"}
                                 handlePrint={this.onPrint}
-                                handleConfirm={()=>{this.comfirnTable()}}/>;
-    return <div className={style["tips"]} style={{marginBottom:'15px'}}>
-              <div className={`${style["tips-title"]} ${style["chronic"]}`}>
-                <div className={style["tips-name"]}>
-                  <img src={chronicPic} />
-                  <h2>{chronicMagItem&&chronicMagItem.name||chronicDesease&&chronicDesease.name||'病情提示'}</h2>
-                  <span className={style["redTips"]}>(页面信息有更新可能影响评估结果)</span>
-                </div>
-                <div className={style['toggle-btn']}>
-                  <img src={slideUp?down:up} alt="展开/收起" onClick={this.slideToggle}/>
-                </div>
-              </div>
-              <div className={style["content"]} ref={this.$content}>
-                  {this.getDetail()}
-              </div>
-              {showHide&&showHide.showTable?<ComplexModal onclose={()=>this.closeTable(true)} footer={scaleFooter}
-                      title={showHide.name}
-                      icon={tableIcon}
-                      top={20}
-                      bottom={20}
-                      width={820}>
-                <ScaleTable title={showHide.name} 
-                            tableId={showHide.id} 
-                            comfirnFlag={comfirnFlag} 
-                            flag={flag}
-                            flagT={ff}
-                            resetFlag={this.resetComfirnFlag}
-                            unscroeClose={this.unscroeClose}
-                            closeTable={this.closeTable}
-							resRef={this.$result}
-                            ></ScaleTable>
-              </ComplexModal>:''}
+                                handleConfirm={this.comfirnTable}/>;
+    if(data&&data.length>0){
+      return <div className={style["tips"]} style={{marginBottom:'15px'}}>
+        <div className={`${style["tips-title"]} ${style["chronic"]}`}>
+          <div className={style["tips-name"]}>
+            <img src={chronicPic} />
+            <h2>{chronicMagItem&&chronicMagItem.name||chronicDesease&&chronicDesease.name||'病情提示'}</h2>
+            <span className={style["redTips"]}>(页面信息有更新可能影响评估结果)</span>
+          </div>
+          <div className={style['toggle-btn']}>
+            <img src={slideUp?down:up} alt="展开/收起" onClick={this.slideToggle}/>
+          </div>
+        </div>
+        <div className={style["content"]} ref={this.$content}>
+          {this.getDetail()}
+        </div>
+        {showHide&&showHide.showTable?<ComplexModal onclose={()=>this.closeTable(true)} footer={scaleFooter}
+                                                    title={showHide.name}
+                                                    icon={tableIcon}
+                                                    top={20}
+                                                    bottom={20}
+                                                    width={820}>
+          <ScaleTable title={showHide.name}
+                      tableId={showHide.id}
+                      comfirnFlag={comfirnFlag}
+                      flag={flag}
+                      flagT={ff}
+                      resetFlag={this.resetComfirnFlag}
+                      unscroeClose={this.unscroeClose}
+                      closeTable={this.closeTable}
+                      resRef={this.$result}
+          ></ScaleTable>
+        </ComplexModal>:''}
       </div>
+    }
+    //量表弹窗-无指标推送时量表弹窗要单独加载
+    if(showHide&&showHide.showTable){
+      return <ComplexModal onclose={()=>this.closeTable(true)} footer={scaleFooter}
+                           title={showHide.name}
+                           icon={tableIcon}
+                           top={20}
+                           bottom={20}
+                           width={820}>
+        <ScaleTable title={showHide.name}
+                    tableId={showHide.id}
+                    comfirnFlag={comfirnFlag}
+                    flag={flag}
+                    flagT={ff}
+                    resetFlag={this.resetComfirnFlag}
+                    unscroeClose={this.unscroeClose}
+                    closeTable={this.closeTable}
+                    resRef={this.$result}
+        ></ScaleTable>
+      </ComplexModal>;
+    }
+
+
+
   }
 }
 export default ChronicInfo;

src/components/CurrentIll/index.jsx

@@ -140,7 +140,6 @@ class CurrentIll extends Component{
     const {fuzhen,isChronic,type,fetchPushInfos,handleInput,isRead,saveText,searchData,totalHide,editClear,data,boxLeft,boxTop} = this.props;
     const {forbidInput} = this.state;
     const searchFlag = searchData.length > 0 ? true : false;
-
     if(+type===1){      //文本模式
       return <Textarea  title='现病史' boxMark='2'
                         isRead={isRead}

src/components/EmergencyProcedure/EmergencyModal/index.jsx

@@ -16,7 +16,7 @@ class EmergencyModal extends React.Component{
       show:false,
       imgShow:false,
       diseaseName:[
-        '胸痛','心包积液','气胸','肺栓塞','急性冠脉综合征','主动脉夹层'
+        '','心包积液','气胸','肺栓塞','急性冠脉综合征','主动脉夹层'
       ]
     }
     this.handleImgShow=this.handleImgShow.bind(this)
@@ -68,7 +68,7 @@ class EmergencyModal extends React.Component{
               <i></i>
               {
                 this.state.diseaseName.map((item,index)=>{
-                  return <li className={idx == index?styles.selectColor:null} onClick={()=>{this.setDataIdx(index,false)}}>
+                  return <li className={idx == index?styles.selectColor:null} style={{display:item?'inline-block':'none'}} onClick={()=>{this.setDataIdx(index,false)}}>
                     {item}
                   </li>
                 })

src/components/Inspect/index.jsx

@@ -61,7 +61,7 @@ class Inspect extends React.Component {
     $(document).click((event) => {
       let searchWrap = $('#importInspectBtn')[0];   // 导入按钮按钮
       let searchOption = $('#importList')[0];   // 下拉列表
-      if (searchOption) {
+      if (searchOption&&$('#importList').css("display")=="block") {
         if(searchWrap != event.target){
           this.setState({ importLis: false });
         }
@@ -224,7 +224,7 @@ class Inspect extends React.Component {
                       <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>
+                    <li className={`${styles.excelIpt} ${styles.systemIpt}`} onClick={checkSystemIpt}>从设备导入</li>
                   </ul>
                 }
               </div> : null

src/components/MedicalInfo/index.jsx

@@ -43,10 +43,12 @@ class MedicalInfo extends Component {
       }
   }
   clear(){
-    this.$inp.current.value = '';
-    this.setState({
-      val:''
-    });
+      const {clearResult} = this.props;
+      this.$inp.current.value = '';
+      this.setState({
+        val:''
+      });
+      clearResult&&clearResult();
   }
   componentDidMount(){
     const height = getWindowInnerHeight()-170;

src/components/PushItems/TipsMsg/index.jsx

@@ -1,13 +1,20 @@
 import React, { Component } from 'react';
 import style from './index.less';
+import $ from 'jquery';
 
 class TipsMsg extends Component {
     constructor(props) {
-        super(props)
+        super(props);
+    }
+    componentWillReceiveProps(){
+        //滚动条定位到提示信息模块
+        const {patDom} = this.props;
+        const ht = $(patDom.current).height();
+        $(patDom.current).scrollTop(ht);
     }
 
     render() {
-        const { tips, showTips, tipsDiscalimer, tipsImg, tmpFlg} = this.props
+        const { tips, showTips, tipsDiscalimer, tipsImg, tmpFlg} = this.props;
         return <div className={style["tips"]}>
         <h1>
           <img src={tipsImg} />

src/components/PushItems/index.jsx

@@ -251,8 +251,9 @@ class PushItems extends Component {
               </div>
             </div>
             {/*{chronicPushItems&&chronicPushItems.length>0?<ChronicInfo data={chronicPushItems}></ChronicInfo>:''}*/}
-            {<ChronicInfo></ChronicInfo>}
+            {<ChronicInfo data={chronicPushItems}></ChronicInfo>}
             <TipsMsg
+              patDom={this.$cont}
              tmpFlg = {tmpFlg}
              tipsImg = {tipsImg}
               tips = {tips}

src/components/ScaleSearch/index.jsx

@@ -58,10 +58,12 @@ class ScaleSearch extends Component {
     }
   }
   clear(){
+    const {clearResult} = this.props;
     this.$inp.current.value = '';
     this.setState({
       val:''
     });
+    clearResult&&clearResult();
   }
   componentDidMount(){
     const height = getWindowInnerHeight()-170;

src/components/WrapModalBody/WrapModalTable/index.jsx

@@ -1,39 +1,44 @@
 import React from "react";
 import style from "../index.less";
 
-const WrapModalTable = (props) => {
-  const { hospitalInspect, handleGetSonList } = props;
-  return <div className={style['modalTable']}>
-    <div className={style.tablePubP}>
-      <table>
-        <tr className={style.head}>
-          <td className={`${style.fst} ellipsOver`}>编号</td>
-          <td className={`${style.sec} ellipsOver`}>标本类型</td>
-          <td className={`${style.trd} ellipsOver`}>组名称</td>
-          <td className={`${style.four} ellipsOver`}>送检医生</td>
-          <td className={`${style.fif} ellipsOver`}>送检时间</td>
-          <td className={`${style.six} ellipsOver`}>报告时间</td>
-          <td className={`${style.sev} ellipsOver`} style={{display:hospitalInspect.length>5?'':'none'}}></td>
-        </tr>
-      </table>
+class WrapModalTable extends React.Component {
+  constructor(props) {
+    super(props)
+  }
+  render() {
+    const { hospitalInspect, handleGetSonList } = this.props;
+    return <div className={style['modalTable']}>
+      <div className={style.tablePubP}>
+        <table>
+          <tr className={style.head}>
+            <td className={`${style.fst} ellipsOver`}>编号</td>
+            <td className={`${style.sec} ellipsOver`}>标本类型</td>
+            <td className={`${style.trd} ellipsOver`}>组名称</td>
+            <td className={`${style.four} ellipsOver`}>送检医生</td>
+            <td className={`${style.fif} ellipsOver`}>送检时间</td>
+            <td className={`${style.six} ellipsOver`}>报告时间</td>
+            <td className={`${style.sev} ellipsOver`} style={{ display: hospitalInspect.length > 5 ? '' : 'none' }}></td>
+          </tr>
+        </table>
+      </div>
+      <div className={`${style.parentTable} ${style.tablePubP}`}>
+        <table>
+          {
+            hospitalInspect && hospitalInspect.map((item, idx) => {
+              return <tr onClick={() => handleGetSonList(item.groupName)}>
+                <td className={`${style.fst} ellipsOver`}>{idx + 1}</td>
+                <td title={item.specimenType} className={`${style.sec} ellipsOver`}>{item.specimenType}</td>
+                <td title={item.groupName} className={`${style.trd} ellipsOver`}>{item.groupName}</td>
+                <td title={item.inspectDoctor} className={`${style.four} ellipsOver`}>{item.inspectDoctor}</td>
+                <td title={item.inspectTime} className={`${style.fif} ellipsOver`}>{item.inspectTime}</td>
+                <td title={item.reportTime} className={`${style.six} ellipsOver`}>{item.reportTime}</td>
+              </tr>
+            })
+          }
+        </table>
+      </div>
     </div>
-    <div className={`${style.parentTable} ${style.tablePubP}`}>
-      <table>
-        {
-          hospitalInspect && hospitalInspect.map((item, idx) => {
-            return <tr onClick={() => handleGetSonList(item.groupName)}>
-              <td className={`${style.fst} ellipsOver`}>{idx+1}</td>
-              <td title={item.specimenType} className={`${style.sec} ellipsOver`}>{item.specimenType}</td>
-              <td title={item.groupName} className={`${style.trd} ellipsOver`}>{item.groupName}</td>
-              <td title={item.inspectDoctor} className={`${style.four} ellipsOver`}>{item.inspectDoctor}</td>
-              <td title={item.inspectTime} className={`${style.fif} ellipsOver`}>{item.inspectTime}</td>
-              <td title={item.reportTime} className={`${style.six} ellipsOver`}>{item.reportTime}</td>
-            </tr>
-          })
-        }
-      </table>
-    </div>
-  </div>
+  }
 }
 
 export default WrapModalTable;

src/components/WrapModalBody/WrapModalTableSon/index.jsx

@@ -58,7 +58,7 @@ class WrapModalTableSon extends React.Component {
                 <td title={item.itemName} className={`${style.trd}`}>{item.itemName}</td>
                 <td title={item.value} className={`${style.four}`}>
                   {
-                    getStatusImg(item.type,item.value,0)
+                    getStatusImg(item.type,item.value,1)
                   }
                 </td>
                 <td title={item.unit} className={`${style.fif}`}>{item.unit}</td>

src/components/WrapModalBody/index.jsx

@@ -17,13 +17,13 @@ const WrapModalBody =(props)=>{
       {
         hospitalSonInspect && hospitalSonInspect.lisExcelWrapper?
         <WrapModalTableSon
-          allCheckImport={allCheckImport}
           allCheck={allCheck}
-          hospitalSonInspect={hospitalSonInspect}
-          selectGroupList={selectGroupList}
           checkedList={checkedList}
-          selectOneCheck={selectOneCheck}
           selectWaring={selectWaring}
+          allCheckImport={allCheckImport}
+          selectOneCheck={selectOneCheck}
+          selectGroupList={selectGroupList}
+          hospitalSonInspect={hospitalSonInspect}
         ></WrapModalTableSon>:null
       }
     </div>

src/components/WrapModalBodyPac/WrapModalTable/index.jsx

@@ -1,45 +1,49 @@
 import React from "react";
 import style from "../index.less";
-
-const WrapModalTable = (props) => {
-  const { hospitalPac, handleGetSonList,msgObj } = props;
-  return <div className={style['modalTable']}>
-    <div className={style.tablePubP}>
-      <table>
-        <tr className={style.head}>
-          <td className={`${style.fst} ellipsOver`}>申请单号</td>
-          <td className={`${style.sec} ellipsOver`}>申请时间</td>
-          <td className={`${style.trd} ellipsOver`}>检查项目</td>
-          <td className={`${style.four} ellipsOver`}>检查号</td>
-          <td className={`${style.fif} ellipsOver`}>类型</td>
-          <td className={`${style.six} ellipsOver`}>患者姓名</td>
-          <td className={`${style.sev} ellipsOver`}>病人编号</td>
-          <td className={`${style.egt} ellipsOver`}>检查时间</td>
-          <td className={`${style.egt} ellipsOver`}>报告时间</td>
-          <td className={`${style.nig} ellipsOver`} style={{display:hospitalPac.length>4?'':'none'}}></td>
-        </tr>
-      </table>
-    </div>
-    <div className={`${style.parentTable} ${style.tablePubP}`}>
-      <table>
-        {
-          hospitalPac && hospitalPac.map((item, idx) => {
-            return <tr onClick={() => handleGetSonList(item.checkItem,item.reportTime)}>
-              <td title={item.applicationNum} className={`${style.fst} ellipsOver`}>{item.applicationNum}</td>
-              <td title={item.applicationDate} className={`${style.sec} ellipsOver`}>{item.applicationDate}</td>
-              <td title={item.checkItem} className={`${style.trd} ellipsOver`}>{item.checkItem}</td>
-              <td title={item.checkNum} className={`${style.four} ellipsOver`}>{item.checkNum}</td>
-              <td title={item.type} className={`${style.fif} ellipsOver`}>{item.type}</td>
-              <td title={msgObj.name} className={`${style.six} ellipsOver`}>{msgObj.name}</td>
-              <td title={msgObj.patientNum} className={`${style.sev} ellipsOver`}>{msgObj.patientNum}</td>
-              <td title={item.inspectTime} className={`${style.egt} ellipsOver`}>{item.inspectTime}</td>
-              <td title={item.reportTime} className={`${style.egt} ellipsOver`}>{item.reportTime}</td>
-            </tr>
-          })
-        }
-      </table>
+class WrapModalTable extends React.Component {
+  constructor(props) {
+    super(props)
+  }
+  render() {
+    const { hospitalPac, handleGetSonList, msgObj } = this.props;
+    return <div className={style['modalTable']}>
+      <div className={style.tablePubP}>
+        <table>
+          <tr className={style.head}>
+            <td className={`${style.fst} ellipsOver`}>申请单号</td>
+            <td className={`${style.sec} ellipsOver`}>申请时间</td>
+            <td className={`${style.trd} ellipsOver`}>检查项目</td>
+            <td className={`${style.four} ellipsOver`}>检查号</td>
+            <td className={`${style.fif} ellipsOver`}>类型</td>
+            <td className={`${style.six} ellipsOver`}>患者姓名</td>
+            <td className={`${style.sev} ellipsOver`}>病人编号</td>
+            <td className={`${style.egt} ellipsOver`}>检查时间</td>
+            <td className={`${style.egt} ellipsOver`}>报告时间</td>
+            <td className={`${style.nig} ellipsOver`} style={{ display: hospitalPac.length > 4 ? '' : 'none' }}></td>
+          </tr>
+        </table>
+      </div>
+      <div className={`${style.parentTable} ${style.tablePubP}`}>
+        <table>
+          {
+            hospitalPac && hospitalPac.map((item, idx) => {
+              return <tr onClick={() => handleGetSonList(item.checkItem, item.reportTime)}>
+                <td title={item.applicationNum} className={`${style.fst} ellipsOver`}>{item.applicationNum}</td>
+                <td title={item.applicationDate} className={`${style.sec} ellipsOver`}>{item.applicationDate}</td>
+                <td title={item.checkItem} className={`${style.trd} ellipsOver`}>{item.checkItem}</td>
+                <td title={item.checkNum} className={`${style.four} ellipsOver`}>{item.checkNum}</td>
+                <td title={item.type} className={`${style.fif} ellipsOver`}>{item.type}</td>
+                <td title={msgObj.name} className={`${style.six} ellipsOver`}>{msgObj.name}</td>
+                <td title={msgObj.patientNum} className={`${style.sev} ellipsOver`}>{msgObj.patientNum}</td>
+                <td title={item.inspectTime} className={`${style.egt} ellipsOver`}>{item.inspectTime}</td>
+                <td title={item.reportTime} className={`${style.egt} ellipsOver`}>{item.reportTime}</td>
+              </tr>
+            })
+          }
+        </table>
+      </div>
     </div>
-  </div>
+  }
 }
 
 export default WrapModalTable;

src/containers/ChronicInfo.js

@@ -14,7 +14,7 @@ function mapStateToProps(state){
   const {pushMessage,assessResult} = state;
   return{
     chronicMagItem: state.diagnosticList.chronicMagItem,//慢病疾病
-    data:pushMessage.chronicPushItems,     //慢病右侧推送
+    //data:pushMessage.chronicPushItems,     //慢病右侧推送
     tableList: pushMessage.tableList,
     showList: pushMessage.showList,
     showHide: pushMessage.showHide,

src/containers/MedicalInfoContainer.js

@@ -3,6 +3,7 @@ import { connect } from 'react-redux';
 import { getSearchList } from '@store/async-actions/medicalInfo';
 import MedicalInfo from '@components/MedicalInfo';
 import {getAllConceptDetail} from '../store/async-actions/pushMessage';
+import {CLEAR_INFO_SEARCH_LIST} from '@types/medicalInfo';
 
 function mapStateToProps(state) {
     return{
@@ -17,6 +18,11 @@ function mapDispatchToProps(dispatch) {
         },
         getAllConceptDetail(item) {
             dispatch(getAllConceptDetail(item))
+        },
+        clearResult(){
+              dispatch({
+                type:CLEAR_INFO_SEARCH_LIST
+              })
         }
     }
 }

src/containers/Multiple.js

@@ -6,8 +6,9 @@ import {CURRENT_MUL,CURRENT_TEXT_LABEL} from '@types/currentIll';
 import {MAINSUIT_MUL,CHANGE_LABELVAL} from '@types/mainSuit';
 import {OTHERHIS_MUL,CHANGEOTHERTEXTLABEL} from '@types/otherHistory';
 import {CHECKBODY_MUL,CHANGECHECKTEXTLABEL} from '@types/checkBody';
-import {filterDataArr,getLabelIndex} from '@utils/tools.js';
+import {filterDataArr,getLabelIndex,didPushParamChange} from '@utils/tools.js';
 import config from '@config/index.js';
+import {billing} from '@store/async-actions/pushMessage';
 import {Notify} from '@commonComp';
 
 function handleMainSuit(dispatch,params){
@@ -170,9 +171,16 @@ function mapDispatchToProps(dispatch){
     },
     handleLabelChange(obj){//标签内输入
       handleLabel(dispatch,obj);
+      dispatch(billing());
     },
     handleConfirm(params){
       handleDiff(dispatch,params);
+      //右侧推送
+      setTimeout(function(){      //延迟待确定后的数据更新后推送，避免获取的参数还是旧的
+        if(didPushParamChange()){     //操作后内容有变化才推送
+          dispatch(billing('',params.ikey.substr(0,1)));
+        }
+      },500);
     }
   }
 }

src/containers/PushItemsContainer.js

@@ -15,7 +15,7 @@ function mapStateToProps(state) {
         clickDiag: diagnosticList.clickDiag,
         tableList: pushMessage.tableList,
         showList: pushMessage.showList,
-        //chronicPushItems: pushMessage.chronicPushItems,
+        chronicPushItems: pushMessage.chronicPushItems,
     }
 }
 

src/containers/ScaleSearchContainer.js

@@ -4,6 +4,7 @@ import { getSearchList } from '@store/async-actions/scaleSearch';
 import ScaleSearch from '@components/ScaleSearch';
 import {getScaleInfo} from '../store/async-actions/pushMessage';
 import {SHOW_TABLE_LIST} from '@store/types/pushMessage';
+import {CLEAR_SCALE_SEARCH_LIST} from '@types/scaleSearch';
 
 function mapStateToProps(state) {
     const {pushMessage} = state;
@@ -31,6 +32,11 @@ function mapDispatchToProps(dispatch) {
             item:Object.assign({},item)
           });
         },
+        clearResult(){
+            dispatch({
+              type:CLEAR_SCALE_SEARCH_LIST
+            })
+        }
     }
 }
 const ScaleSearchContainer = connect(

src/modules/HomePage/index.jsx

@@ -55,7 +55,8 @@ class HomePage extends Component {
     }
     render() {
         const {flag,setPushEmergencyIdx,sysConfig} = this.props;
-        return <div className={style['home-page']} onClick={this.props.hideAllDrop}>
+        return <div className={style['home-page']}>
+        {/* return <div className={style['home-page']} onClick={this.props.hideAllDrop}> */}
             <BannerContainer />
             {/* <InfoTitle /> */}
             <BodyContainer></BodyContainer>

src/store/actions/homePage.js

@@ -31,17 +31,25 @@ export const showDrop=(state,action)=>{
 export const confirmHide=(state,action)=>{
   let res = Object.assign({},state);
   let obj = res.showDrop||{};
+  //页面空白时不更新
+  if(Object.keys(res.showDrop).length==0){
+    return res;
+  }
   let temp = Object.assign({},obj);
   let keyArr = Object.keys(obj);
+  let flag = false;
   for(let i=0; i<keyArr.length; i++){
-    temp[JSON.parse(keyArr[i])] = false;
+    if(temp[keyArr[i]]){
+      flag = true;
+      temp[keyArr[i]] = false;
+    }
+  }
+  if(!flag){      //未修改值时不更新
+    return res;
   }
-  /*for(let i in obj){
-    temp[i] = false;
-  };*/
   res.showDrop = temp;
   res.commSymHide = true;
-  res.update=Math.random();
+  //res.update=Math.random();     //temp已是新对象，无需再update唤起更新
   return res;
 }
 

src/store/reducers/medicalInfo.js

@@ -1,4 +1,4 @@
-import { SET_SEARCH_VALUE, GET_SEARCH_RESULT } from '../types/medicalInfo'; 
+import { SET_SEARCH_VALUE, GET_SEARCH_RESULT ,CLEAR_INFO_SEARCH_LIST} from '../types/medicalInfo';
 import { setSearchValue, getSearchResult } from '../actions/medicalInfo'; 
 
 const initState = {
@@ -7,11 +7,15 @@ const initState = {
 }
 
 export default function (state=initState, action) {
+  const res = Object.assign({},state);
     switch(action.type) {
         case SET_SEARCH_VALUE: 
             return setSearchValue(state, action);
         case GET_SEARCH_RESULT: 
             return getSearchResult(state, action);
+        case CLEAR_INFO_SEARCH_LIST:
+            res.searchResult=[];
+            return res;
         default: 
             return state;
     }

src/store/reducers/scaleSearch.js

@@ -1,4 +1,4 @@
-import { GET_SCALE_SEARCH_RESULT } from '../types/scaleSearch.js';
+import { GET_SCALE_SEARCH_RESULT,CLEAR_SCALE_SEARCH_LIST } from '../types/scaleSearch.js';
 
 const initState = {
     searchResult: []
@@ -10,6 +10,9 @@ export default function (state=initState, action) {
         case GET_SCALE_SEARCH_RESULT:
             res.searchResult = action.data;
             return res;
+        case CLEAR_SCALE_SEARCH_LIST:
+            res.searchResult=[];
+            return res;
         default: 
             return res;
     }

src/store/types/medicalInfo.js

@@ -1,2 +1,3 @@
 export const SET_SEARCH_VALUE = 'SET_SEARCH_VALUE';
-export const GET_SEARCH_RESULT = Symbol('GET_SEARCH_RESULT');
+export const GET_SEARCH_RESULT = Symbol('GET_SEARCH_RESULT');
+export const CLEAR_INFO_SEARCH_LIST = 'CLEAR_INFO_SEARCH_LIST';

src/store/types/scaleSearch.js

@@ -1 +1,2 @@
-export const GET_SCALE_SEARCH_RESULT = 'GET_SCALE_SEARCH_RESULT';
+export const GET_SCALE_SEARCH_RESULT = 'GET_SCALE_SEARCH_RESULT';
+export const CLEAR_SCALE_SEARCH_LIST = 'CLEAR_SCALE_SEARCH_LIST';

src/utils/config.js

@@ -1,8 +1,8 @@
 // const host='http://192.168.3.1:5050';//赵
 // const host='http://192.168.3.100:5050';//王峰
-// const host='http://192.168.2.241:5050';//后端接口访问地址
+const host='http://192.168.2.241:5050';//后端接口访问地址
 // const host='http://192.168.2.121:5050';//后端接口访问地址
-const host='http://192.168.2.236:5050';//后端接口访问地址
+// const host='http://192.168.2.236:5050';//后端接口访问地址
 // const host='http://192.168.3.11:5050';//王宇
 //const host='http://192.168.2.164:8080';
 // const host='http://192.168.3.117:5050'; //周铁刚

src/utils/tools.js

@@ -717,18 +717,14 @@ function ifOtherClear(jsonData,jsonStr,baseList){
   }
 }
 function normalVal(min,max){
-  if((min-0) && (max-0)){
+  if(min == ''&&max==''){
+    return null;
+  }else if(!isNaN(min) && !isNaN(max)){
       return `正常值: (${min}~${max})`
-  }else if((min-0) && !(max-0)){
-      return `正常值: (>=${min})`
-  }else if(!(min-0) && (max-0)){
-      if(min == '' || min == null){
-          return `正常值: (<=${max})`
-      }else{
-          return `正常值: (${min}~${max})`
-      }
-  }else{
-      return null;
+  }else if(!isNaN(min) && isNaN(max)){
+      return `正常值: (>${min})`
+  }else if(isNaN(min) && !isNaN(max)){
+      return `正常值: (<${max})`
   }
 }
 /**
@@ -770,10 +766,10 @@ function getCurrentDate(flg,con){
   let day = myDate.getDate();            //获取当前日(1-31)
   let date = '';           
   if(flg){
-    var h = date.getHours();
-    var m = date.getMinutes();
-    var s = date.getSeconds();
-    date = year+link+mon.toString().padStart(2,'0')+link+day.toString().padStart(2,'0')+' '+h.toString().padStart(2,'0')+m.toString().padStart(2,'0')+s.toString().padStart(2,'0');
+    var h = myDate.getHours();
+    var m = myDate.getMinutes();
+    var s = myDate.getSeconds();
+    date = year+link+mon.toString().padStart(2,'0')+link+day.toString().padStart(2,'0')+' '+h.toString().padStart(2,'0')+':'+m.toString().padStart(2,'0')+':'+s.toString().padStart(2,'0');
   }else{
     date = year+link+mon.toString().padStart(2,'0')+link+day.toString().padStart(2,'0');
   }
@@ -1164,9 +1160,9 @@ function downloadExportedData(data, fileName) {
 }
 
 function getStatusImg(type,val,status){
-  if(type == 0){
+  if(type == 0){//正常
     return <span>{val} </span>
-  }else if(type == 1){
+  }else if(type == 1){//异常（表单输入的话非数字显示为异常）
     return <span className={'red'}>{val} </span>
   }
   if(status == 1){