merge from 'optimize'

src/components/AddAssistCheck/index.jsx

@@ -146,59 +146,85 @@ class AddAssistCheck extends React.Component {
     this.props.handleChangeDate(date,idx)
     this.setState({ date: false })
   }
+
   getAssistLabel() {
-    const { assistLabel, handleChangeAssistValue, handleChangeDate, isRead, handlePush, winWidth,getInfomation,assistList } = this.props;
+    const { assistLabel,checkedListImport, handleChangeAssistValue, handleChangeDate, isRead, handlePush, winWidth,getInfomation,assistList } = this.props;
     const { visible,activeName,id,date } = this.state;
-    return <ul className={styles.labelWrap} id="datePick">
+    return <React.Fragment>
       {
-        assistLabel.map((item, idx) => {
-          let staticTime = {}
-          if(item.time){
-            let tmp1 = (item.time).split(' ')[0].split('-')
-            let tmp2 = (item.time).split(' ').length>1&&(item.time).split(' ')[1].split(':')
-            staticTime = {
-              year: tmp1[0]-0,
-              month: tmp1[1]-0,
-              day: tmp1[2]-0,
-              hour: tmp2[0],
-              minute: tmp2[1],
-              second: tmp2[2]
+        checkedListImport.map((part,index)=>{
+          return <ul className={`${styles.labelWrap} ${styles.labelWrapSpec}`}>
+            {
+              part.map((item, idx) => {
+                return (<li className={`${styles.assistLists} ${styles.clearfix}`}>
+                  <span className={styles.assistName} style={{ width: winWidth < 1200 ? '120px' : 'auto' }}>
+                    <span className={styles.tagSpan}>
+                      {item.name}：
+                      <span className={styles.imgInfo} onClick={()=>getInfomation({name: item.name, position: 1, type: 6})}></span>
+                    </span>
+                  </span>
+                  <div className={styles.textareaWrap}>
+                    <Textarea value={item.value} disabled={item.disabled} handlePush={handlePush} isRead={isRead} handleChangeAssistValue={handleChangeAssistValue} idx={idx}></Textarea>
+                  </div>
+                  <div className={styles.pointerFinger}>
+                    <p>报告日期：<span>{item.time || this.state.dateTime}</span></p>
+                    {/* <span className={styles.closeIcon} id="assiClose" onClick={() => { this.handleDelClick(idx,item) }}></span> */}
+                  </div>
+                <DelToast show={idx==id?visible:false}
+                          name={activeName} 
+                          cancel={this.handleCancel}
+                          confirm={this.delConfirm}/>
+                </li>)
+              })
             }
-          }
-          return (<li className={`${styles.assistLists} ${styles.clearfix}`}>
-            <span className={styles.assistName} style={{ width: winWidth < 1200 ? '120px' : 'auto' }}>
-              <span className={styles.tagSpan}>
-                {item.name}：
-                <span className={styles.imgInfo} onClick={()=>getInfomation({name: item.name, position: 1, type: 6})}></span>
-              </span>
-            </span>
-            <div className={styles.textareaWrap}>
-              <Textarea value={item.value} disabled={item.disabled} handlePush={handlePush} isRead={isRead} handleChangeAssistValue={handleChangeAssistValue} idx={idx}></Textarea>
-            </div>
-            <div className={styles.pointerFinger}>
-              {
-                item.disabled?<React.Fragment>
-                  <p>报告日期：<span>{item.time || this.state.dateTime}</span></p>
-                  <i></i>
-                </React.Fragment>:<React.Fragment>
-                  <p onClick={() => this.handleShowDate(idx)}>报告日期：<span>{item.time || this.state.dateTime}</span></p>
-                  <i onClick={() => this.handleShowDate(idx)}></i>
-                </React.Fragment>
-              }
-              {/*<a href="javascript:void(0);" onClick={() => { this.handleDelClick(idx,item) }}><img src={close} alt="" /></a>*/}
-              <span className={styles.closeIcon} id="assiClose" onClick={() => { this.handleDelClick(idx,item) }}></span>
-              {
-                this.state.date && idx == this.state.active ?<Calendar timeLis={staticTime} isShow={true} timeSure={(date)=>this.timeSure(date,idx)} needTime={true} sure={true} handleChange={(info) => { this.handleChangeDate(info, idx) }} top={30}></Calendar>:null
-              }
-            </div>
-          <DelToast show={idx==id?visible:false}
-                    name={activeName} 
-                    cancel={this.handleCancel}
-                    confirm={this.delConfirm}/>
-          </li>)
+          </ul>
         })
       }
-    </ul>
+
+      <ul className={styles.labelWrap} id="datePick">
+        {
+          assistLabel.map((item, idx) => {
+            let staticTime = {}
+            if(item.time){
+              let tmp1 = (item.time).split(' ')[0].split('-')
+              let tmp2 = (item.time).split(' ').length>1&&(item.time).split(' ')[1].split(':')
+              staticTime = {
+                year: tmp1[0]-0,
+                month: tmp1[1]-0,
+                day: tmp1[2]-0,
+                hour: tmp2[0],
+                minute: tmp2[1],
+                second: tmp2[2]
+              }
+            }
+            return (item.disabled?null:<li className={`${styles.assistLists} ${styles.clearfix}`}>
+              <span className={styles.assistName} style={{ width: winWidth < 1200 ? '120px' : 'auto' }}>
+                <span className={styles.tagSpan}>
+                  {item.name}：
+                  <span className={styles.imgInfo} onClick={()=>getInfomation({name: item.name, position: 1, type: 6})}></span>
+                </span>
+              </span>
+              <div className={styles.textareaWrap}>
+                <Textarea value={item.value} disabled={item.disabled} handlePush={handlePush} isRead={isRead} handleChangeAssistValue={handleChangeAssistValue} idx={idx}></Textarea>
+              </div>
+              <div className={styles.pointerFinger}>
+                <p onClick={() => this.handleShowDate(idx)}>报告日期：<span>{item.time || this.state.dateTime}</span></p>
+                <i onClick={() => this.handleShowDate(idx)}></i>
+                {/*<a href="javascript:void(0);" onClick={() => { this.handleDelClick(idx,item) }}><img src={close} alt="" /></a>*/}
+                <span className={styles.closeIcon} id="assiClose" onClick={() => { this.handleDelClick(idx,item) }}></span>
+                {
+                  this.state.date && idx == this.state.active ?<Calendar timeLis={staticTime} isShow={true} timeSure={(date)=>this.timeSure(date,idx)} needTime={true} sure={true} handleChange={(info) => { this.handleChangeDate(info, idx) }} top={30}></Calendar>:null
+                }
+              </div>
+            <DelToast show={idx==id?visible:false}
+                      name={activeName} 
+                      cancel={this.handleCancel}
+                      confirm={this.delConfirm}/>
+            </li>)
+          })
+        }
+      </ul>
+    </React.Fragment> 
   }
   render() {
     const { handleChangeValue, list,assistVal,windowHeight,assistList } = this.props;

src/components/AssessResult/AssessHis/index.jsx

@@ -67,6 +67,7 @@ class AssessResultHis extends Component {
       case 10:    //数据来源于后台
         return <ChartItem title={name}
                           data={indexData||{}}
+                          disName={item.diseaseName}
                           names={indexNames||{}}
                           timeTypes={JSON.stringify(chartTimeTypes||{})=='{}'?timeTypes&&timeTypes[i]:chartTimeTypes[i]}
                           initFn={getIndexData}

src/components/AssessResult/ScaleItem/index.jsx

@@ -174,7 +174,7 @@ class ScaleItem extends Component {
         if(its.type==1){     //量表
           let scaleRes=formulaResult&&formulaResult[it.content.conceptId]&&formulaResult[it.content.conceptId].calcalculate;
           temp =<span className={style['scale']}
-                      onClick={()=>this.handleShowScale(it.content)}>
+                      onClick={this.handleShowScale.bind(this,it.content)}>
                         {scaleRes&&scaleRes.result?(' 【'+it.content.name+'】 结果：'+scaleRes.result.value+" "+(scaleRes.result.text||'')):'【'+it.content.name+'】'}
                         </span>;
         }else if(its.type==2){      //计算公式
@@ -301,19 +301,20 @@ class ScaleItem extends Component {
       return null;
     }
     const content = JSON.parse(item.content||null);
-    return {id:item.conceptId,content,name:content.scaleName};
+    return {conceptId:item.conceptId,content,name:content.scaleName};
   }
   getScales(){
     const {scaleItems,disabled,formulaResult} = this.props;
     let li='',temp='',arr=[],it={};
     if(!scaleItems){
       return '';
-    }
+    };
     for( let i in scaleItems){
       it = this.getScaleContent(scaleItems[i]);
       if(!it) continue;
-      let scaleRes=formulaResult&&formulaResult[it.id]&&formulaResult[it.id].calcalculate;
-      temp =<span className={style['scale']} onClick={()=>this.handleShowScale(it)}>
+      let scaleRes=formulaResult&&formulaResult[it.conceptId]&&formulaResult[it.conceptId].calcalculate;
+      //这里onClick不能用箭头函数，用箭头函数会一直绑定for的最后一个it
+      temp =<span className={style['scale']} onClick={this.handleShowScale.bind(this,it)}>
                         {scaleRes&&scaleRes.result?(' 【'+it.name+'】 结果：'+scaleRes.result.value+" "+(scaleRes.result.text||'')):'【'+it.name+'】'}
                         </span>;
       li = disabled?<li>

src/components/AssistCheck/index.jsx

@@ -164,7 +164,7 @@ class AssistCheck extends React.Component {
       dragBox('previewWrapper', 'previewStatic', 'del')
     }
     render(){
-        const {checkedList,selectOneCheck,msgObj,selectGroupList,allCheckImport,hospitalSonInspect,handleSearchs,allCheck,message,hospitalPac, handleGetSonList,list,getInfomation,windowHeight,hospitalMsg,assistLabel,assistVal,handleChangeValue,handleSign,fetchPushInfos,handleDelAssist,handleChangeAssistValue,handleChangeDate,isRead,winWidth,assistList} = this.props;
+        const {checkedList,checkedListImport,selectOneCheck,msgObj,selectGroupList,allCheckImport,hospitalSonInspect,handleSearchs,allCheck,message,hospitalPac, handleGetSonList,list,getInfomation,windowHeight,hospitalMsg,assistLabel,assistVal,handleChangeValue,handleSign,fetchPushInfos,handleDelAssist,handleChangeAssistValue,handleChangeDate,isRead,winWidth,assistList} = this.props;
         const {showSlideImport,checkSystemIpt,handleBindFileApi,showInIcss,onClose} = this;
         const {importLis,ieVersion,hide} = this.state;
         // if(JSON.stringify(hospitalMsg) != {} && document.getElementById("choose")){//动态绑定只绑定一次
@@ -240,6 +240,7 @@ class AssistCheck extends React.Component {
                             assistList={assistList}
                             assistVal={assistVal}
                             windowHeight={windowHeight}
+                            checkedListImport={checkedListImport}
                         >
                         </AddAssistCheck>
                     </div>

src/components/ChronicInfo/index.jsx

@@ -149,7 +149,7 @@ class ChronicInfo extends React.Component{
         Notify.info("请先计算量表结果！");
         return ;
       }
-      this.handleAddAssessItem(scaleParam.v,scaleParam.i,scaleParam.j);
+      !isClose&&this.handleAddAssessItem(scaleParam.v,scaleParam.i,scaleParam.j);
       this.setState({
         scaleParam:{}
       });

src/components/MedicalInfo/index.less

@@ -23,7 +23,7 @@
         img{
             position: absolute;
             width: 15px;
-            left: 266px;
+            left: 278px;
             top: 9px;
             cursor: pointer;
         }
@@ -37,7 +37,7 @@
         display: inline-block;
         width: 300px;
         height: 34px;
-        padding: 5px;
+        padding: 5px 25px 5px 5px;
         border:1px #CECECE solid;
         vertical-align: top
     }

src/components/NumberDrop/index.jsx

@@ -248,6 +248,9 @@ class NumberDrop extends Component{
     const cls = this.props.show?style['blued']:'';
     return cls;
   }
+  stopBubble(e){
+    e.stopPropagation();
+  }
   componentDidMount(){
     //设置最小宽度避免输入后宽度跳动
     const spanWidth = window.getComputedStyle(this.$span.current).width;
@@ -262,12 +265,12 @@ class NumberDrop extends Component{
     //console.log(prefix,value,placeholder+'1',this.props.placeholder)
     return <div className={this.getClasses()}
                 ref={this.$cont}
-                onDoubleClick={this.changeToEdit}
+                onDblClick ={this.changeToEdit}
                 onClick={allClick?this.handleNumClick:null}
                 contentEditable={editable}
                 onBlur={this.handleBlur}
                 onKeyDown={handleEnter}
-                onFocus={(e)=>{e.stopPropagation()}}>
+                onFocus={this.stopBubble.bind(this)}>
       <span ref = {this.$pre}>&nbsp;{prefix}</span>
       <span onFocus={this.handleNumFocus}
             onClick={allClick?null:this.handleNumClick}

src/components/ScaleSearch/index.less

@@ -23,7 +23,7 @@
     img{
       position: absolute;
       width: 15px;
-      left: 266px;
+      left: 278px;
       top: 9px;
       cursor: pointer;
     }
@@ -37,7 +37,7 @@
     display: inline-block;
     width: 300px;
     height: 34px;
-    padding: 5px;
+    padding: 5px 25px 5px 5px;
     border:1px #CECECE solid;
     vertical-align: top
   }

src/components/ScaleTableHis/index.jsx

@@ -27,56 +27,78 @@ class ScaleTableHis extends React.Component{
   }
 
   getContent(datas){
-    let content =  datas&&datas.group&&datas.group.map((v,i)=>{
-                return <div className={style['group']}>
-                  <p className={style['groupName']}>{v.groupName}</p>
-                  {v.rows&&v.rows.map((it,ind)=>{
-                    return <div>
-                      {it.row.map((item,index)=>{
-                        if(item.controlType==0){
-                          return <div className={style['block']}>
-                              <p className={style['miniName']}>{item.name}</p>
-                              {item.details&&item.details.map((vv,ii)=>{
-                                return <div className={style['item']}>
-                                        <Radio label={vv.detailName+'('+vv.score+')'}
-                                           isSelect={vv.select==1}
-                                               disabled={true}>
-                                        </Radio>
-                                        {vv.state==1?<span className={style['recomand']}>（智能推荐）</span>:''}
-                                    </div>
-                              })}
-                              
-                            </div>
-                          }else{
-                            return <div className={style['block']}>
-                                <p className={style['miniName']}>{item.name}</p>
-                                  {item.details&&item.details.map((vv,ii)=>{
-                                    return <div className={style['item']}>
-                                    <CheckBtn value={vv.detailName}
-                                                    label={vv.detailName}
-                                                    disabled={true}
-                                                    isSelect={vv.select==1}>
-                                          </CheckBtn>
-                                    {vv.state==1?<span className={style['recomand']}>（智能推荐）</span>:''}
-                                    </div>
-                                  })}
-                            </div>
-                          }
-                        
-                      })}
-                    </div>
-                  })}
-                  {v.groupCalculate.isShow==1?<p className={style['subTotal']}>
-                    <span>计分：</span>
-                    {/*<span>{v.groupCalculate.result.value}</span>*/}
-                    <span>{scaleResult&&scaleResult.group.map((m,ii)=>{
-                      if(m.groupName==v.groupName){
-                        return m.groupCalculate.result.value;
-                      }
-                    })}</span>
-                  </p>:''}  
-                </div>
-              })
+    const {tableId,result,comfirnFlag} = this.props;
+    const scaleResult = result&&result[tableId]; //量表计算结果
+    let content;
+    if(datas&&datas.scaleType==1){//计分
+      content =  datas&&datas.group&&datas.group.map((v,i)=>{
+        return <div className={style['group']}>
+          <p className={style['groupName']}>{v.groupName}</p>
+          {v.rows&&v.rows.map((it)=>{
+            return <div className={style['rows']}>
+              {it.required==1&&it.row.length>1?<span className={style['tip']}>本组选项可多选或根据需要选择某一条选项</span>:''}
+              {it.row.map((item,index)=>{
+                if(item.controlType==0){
+                  return <div className={style['block']} style={{border:it.required==1&&!item.isSelect?'1px solid #f00':'none'}}>
+                    {/*<p className={style['miniName']}>{item.name}</p>*/}
+                    <p className={style['miniName']}>
+                      <i>{index==0?it.indexId + '.':''}</i>
+                      {item.name}
+                    </p>
+                    {item.details&&item.details.map((vv,ii)=>{
+                      return <div className={style['item']}>
+                        <Radio label={vv.detailName+'('+vv.score+')'}
+                               isSelect={vv.select==1}
+                               disabled={true}>
+                        </Radio>
+                        {vv.state==1?<span className={style['recomand']}>（智能推荐）</span>:''}
+                      </div>
+                    })}
+
+                  </div>
+                }else{
+                  return <div className={style['block']}>
+                    <p className={style['miniName']}>{item.name}</p>
+                    {item.details&&item.details.map((vv)=>{
+                      return <div className={style['item']}>
+                        <CheckBtn value={vv.detailName}
+                                  label={vv.detailName}
+                                  isSelect={vv.select==1}
+                                  disabled={true}>
+                        </CheckBtn>
+                        {vv.state==1?<span className={style['recomand']}>（智能推荐）</span>:''}
+                      </div>
+                    })}
+                  </div>
+                }
+
+              })}
+            </div>
+          })}
+          {/*<p className={style['subTotal']}>
+            <span>计分：</span>
+            <span></span>
+          </p>*/}
+        </div>
+      })
+    }else if(datas&&datas.scaleType==2){//不计分
+      content =  datas&&datas.rows.map((item)=>{
+        return <div className={style['block']} style={{border:item.required==1&&!item.isSelect&&comfirnFlag?'1px solid #f00':'none'}}>
+          <p className={style['miniName']}>{item.name}</p>
+          {item.details&&item.details.map((vv)=>{
+            return <div className={style['item']}>
+              <Radio label={vv.detailName+'('+vv.result+')'}
+                     isSelect={vv.select==1}
+                     disabled={true}>
+              </Radio>
+              {vv.state==1?<span className={style['recomand']}>（智能推荐）</span>:''}
+            </div>
+          })}
+
+        </div>
+      })
+    }
+
     return content;
   }
 
@@ -99,7 +121,10 @@ class ScaleTableHis extends React.Component{
                   {datas&&datas.Calc==1?<div className={style['total']}>
                     <span>总分：</span>
                     <span>{result&&result.calcalculate&&result.calcalculate.result&&result.calcalculate.result.value +' '+ (result.calcalculate.result.text||'')}</span>
-                  </div>:''}
+                  </div>:<div className={style['total']}>
+                    <span>结果：</span>
+                    <span>{result&&result.calcalculate&&result.calcalculate.result&&result.calcalculate.result.value +' '+ (result.calcalculate.result.text||'')}</span>
+                  </div>}
                 </div>
               }
             })}

src/components/SpreadDrop/index.jsx

@@ -229,9 +229,15 @@ class SpreadDrop extends Component{
     const linkStr = joint||'';
     const name = item.name+linkStr;
     if(isExclu){      //操作“互斥项”
-      if([...noneIds,...exists,...withs].length>0){     //已选非互斥项，互斥项不可操作
+      if([...noneIds,...exists,...withs].length>0){     //已选非互斥项，清空已选项，选中该互斥项
+        this.clearState();
+        this.setState({
+          exclusion:id,
+          excluName:name
+        });
         return;
       }
+      //未选中互斥项，直接选中该互斥项
       let temp = '';
       if(exclusion==''){
         temp = id;
@@ -262,8 +268,11 @@ class SpreadDrop extends Component{
       }
       return;
     }
-    if(exclusion!==''){     //互斥项被选中，其他不可操作
-      return;
+    if(exclusion!==''){     //互斥项已选中，清空互斥项
+      this.setState({
+        exclusion:'',
+        excluName:''
+      });
     }
     if(+item.code===1){     //操作“伴”类型
       this.setState({
@@ -356,7 +365,7 @@ class SpreadDrop extends Component{
   }
 
   render(){
-    const {placeholder,value,show,data} = this.props;
+    const {placeholder,value,show,data,order} = this.props;
     const {editable,boxLeft,boxTop} = this.state;
     return  <div className={style['container']}
               onFocus={(e)=>e.stopPropagation()}
@@ -372,7 +381,7 @@ class SpreadDrop extends Component{
         onInput={this.onChange}
         onkeydown={handleEnter}
         >{value||placeholder}</div>
-          <ListItems data={data} left={boxLeft}
+          <ListItems data={data} left={boxLeft} order={order}
             top={boxTop} show={show} handleSelect={this.handleSelect} handleConfirm={this.handleConfirm} handleClear={this.handleClear} {...this.state}></ListItems>
       </div>
   }
@@ -417,10 +426,11 @@ class ListItems extends Component{
     }
   }
   render (){
-    const {handleClear,handleConfirm} = this.props;
+    const {handleClear,handleConfirm,order} = this.props;
     const domNode = document.getElementById('root');
     return ReactDom.createPortal(
       <div className={style["drop-list"]} style={this.getStyle()} contentEditable="false" onClick={(e)=>{e.stopPropagation();}}>
+        <p className={style['orderTips']}>按{order?'从左到右列':'点选'}顺序成文</p>
         {this.getLabels()}
         <div className="oper">
           <span className={style['clear']} onClick={handleClear}>清空选项</span>

src/components/SpreadDrop/index.less

@@ -47,6 +47,10 @@
   border-bottom: 1px @border-color solid;
   line-height: 22px;
 }
+.orderTips{
+  color: #bfbfbf;
+  margin:0 0 10px 28px;
+}
 .clear{
   .btnCom;
   .clear;

src/containers/AssessResultHis.js

@@ -57,8 +57,8 @@ function mapDispatchToProps(dispatch) {
       });
     },
     getIndexData(param){        //获取评估图表数据
-      const {range,rangeType,index,pindex,getNew} = param;
-      dispatch(getIndexData(range)).then((res)=>{
+      const {range,rangeType,index,pindex,getNew,disName} = param;
+      dispatch(getIndexData(range,disName)).then((res)=>{
         if(res.data.code=='0'){
           dispatch({
             type:SET_INDEX_DATA,

src/containers/AssistCheck.js

@@ -25,7 +25,8 @@ function mapStateToProps(state) {//console.log(state)
         checkedList: state.assistCheck.checkedList,
         selectGroupList: state.assistCheck.selectGroupList,
         allCheck: state.assistCheck.allCheck,
-        msgObj: state.assistCheck.msgObj
+        msgObj: state.assistCheck.msgObj,
+        checkedListImport: state.assistCheck.checkedListImport,
     }
 }
 

src/containers/Inspect.js

@@ -27,7 +27,7 @@ import {
   getConceptDetail
 } from '@store/async-actions/pushMessage';
 
-function mapStateToProps(state) {//console.log(state.inspect)
+function mapStateToProps(state) {//console.log(state)
   return {
     list: state.inspect.list,
     labelList: state.inspect.labelList,

src/store/reducers/assistCheck.js

@@ -24,6 +24,7 @@ const initSearchList = {
   selectGroupList: [], //选的组的明细可能有多个组
   allCheck: false, //全选反选
   checkedList: [], //选中的小项
+  checkedListImport: [], //辅检导入
   msgObj:{
     name:'',
     patientNum:''
@@ -36,7 +37,8 @@ export default (state = initSearchList, action) => {
   if (action.type == SHOW_IN_ICSSS) {
     const newState = Object.assign({}, state);
     let tmpGroup = JSON.parse(JSON.stringify(newState.selectGroupList))
-    let tempArrs = newState.assistLabel,tmpString ='';
+    let tmpListImport = JSON.parse(JSON.stringify(newState.checkedListImport))
+    let tempArrs = newState.assistLabel,tmpString ='',importLis=[];
     for (let i = 0; i < tmpGroup.length; i++) {
       for (let k = 0; k < tmpGroup[i].pacsResultDTO.length; k++) {
         let tmpObj = {}
@@ -45,9 +47,12 @@ export default (state = initSearchList, action) => {
         tmpObj.name = tmpGroup[i].pacsResultDTO[k].checkItem
         tmpObj.value = tmpGroup[i].pacsResultDTO[k].imagingResults
         tmpObj.imagingDiagnose = tmpGroup[i].pacsResultDTO[k].imagingDiagnose
+        importLis.push(tmpObj)
         tempArrs.push(tmpObj)
       }
     }
+    tmpListImport.push(importLis)
+    newState.checkedListImport = [...tmpListImport]
     for (let j = 0; j < tempArrs.length; j++) {
       let tmpVal = tempArrs[j].value ? tempArrs[j].value.trim() : tempArrs[j].value;
       tmpString += (tempArrs[j].name + (tmpVal ? (':' + tmpVal) + ', ' : ': ') + (tempArrs[j].time ? '报告日期:' + tempArrs[j].time : '') + ';')
@@ -174,9 +179,6 @@ export default (state = initSearchList, action) => {
       newState.allCheck = true;
     } else {
       newState.allCheck = false;
-    }
-    for(let i = 0;i<tmpArr.length;i++){
-      
     }
     newState.hospitalPacObj = tmpArr
     return newState;

src/utils/tools.js

@@ -166,6 +166,7 @@ const getAllDataList =(baseList) =>{           //获取所有模块结构化的
     jsonData.checkBodyIsEmpty = baseList.checkBody.isEmpty;
     jsonData.lis.labelList = baseList.inspect.labelList;      //化验
     jsonData.lis.getExcelDataList =  baseList.inspect.getExcelDataList;      //化验导入
+    jsonData.checkedListImport = baseList.assistCheck.checkedListImport;     //辅检导入
     jsonData.pacs = baseList.assistCheck.assistLabel;     //辅检
     jsonData.diag = baseList.diagnosticList.diagnosticList;      //诊断
     jsonData.advice = baseList.pushMessage.advice;       //医嘱