辅检导入修改

src/components/AddAssistCheck/index.jsx

@@ -146,59 +146,86 @@ 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;
+    console.log(checkedListImport)
     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/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/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;       //医嘱