化验辅检导入的弹窗数据单独提出来

src/components/AssistCheck/index.jsx

@@ -6,7 +6,7 @@ import Notify from '@commonComp/Notify';
 import $ from 'jquery';
 import { isIE, getUrlArgObject } from '@utils/tools.js';
 import { dragBox } from '@utils/drag';
-import WrapModalBodyPac from '../WrapModalBodyPac';
+import WrapModalBodyPac from '@containers/WrapModalBodyPac';
 import { getExcelList } from '@store/actions/inspect';
 import store from '@store';
 import { host, prefix } from '@utils/config.js';
@@ -50,7 +50,7 @@ class AssistCheck extends React.Component {
         this.showSlideImport=this.showSlideImport.bind(this)
         // this.handleBindFileApi=this.handleBindFileApi.bind(this)
         this.checkSystemIpt=this.checkSystemIpt.bind(this)
-        this.showInIcss=this.showInIcss.bind(this)
+        this.closeInIcss=this.closeInIcss.bind(this)
         this.onClose=this.onClose.bind(this)
         this.handleImportExcel=this.handleImportExcel.bind(this)
     } 
@@ -155,17 +155,14 @@ class AssistCheck extends React.Component {
         hide: true
       })
     }
-    showInIcss(){
-      const {showInIcss} = this.props
+    closeInIcss(){
       this.setState({
         hide: false
       })
-      showInIcss&&showInIcss();
-      dragBox('previewWrapper', 'previewStatic', 'del')
     }
     render(){
-        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 {checkedListImport,list,getInfomation,windowHeight,hospitalMsg,assistLabel,assistVal,handleChangeValue,handleSign,fetchPushInfos,handleDelAssist,handleChangeAssistValue,handleChangeDate,isRead,winWidth,assistList} = this.props;
+        const {showSlideImport,checkSystemIpt,onClose,closeInIcss} = this;
         const {importLis,ieVersion,hide} = this.state;
         // if(JSON.stringify(hospitalMsg) != {} && document.getElementById("choose")){//动态绑定只绑定一次
         //   ++numFlg
@@ -200,18 +197,7 @@ class AssistCheck extends React.Component {
                     {
                       hide ? <WrapModalContainer hide={hide} title={'导入辅检数据'} width={1000} height={650} onClose={onClose}>
                         <WrapModalBodyPac
-                          hospitalSonInspect={hospitalSonInspect}
-                          hospitalPac={hospitalPac}
-                          handleGetSonList={handleGetSonList}
-                          handleSearch={handleSearchs}
-                          allCheckImport={allCheckImport}
-                          allCheck={allCheck}
-                          selectGroupList={selectGroupList}
-                          checkedList={checkedList}
-                          selectOneCheck={selectOneCheck}
-                          showInIcss={showInIcss}
-                          message={message}
-                          msgObj={msgObj}
+                          closeInIcss={closeInIcss}
                           height={650}
                         ></WrapModalBodyPac>
                       </WrapModalContainer> : null

src/components/EmergencyProcedure/EmergencyModal/index.jsx

@@ -44,8 +44,8 @@ class EmergencyModal extends React.Component{
     this.setState({imgShow:flg})
   }
   render(){
-    const {data,handleShow,setDataIdx,idx} = this.props;
-    return <div className={styles.emergencyProdure}>
+    const {data,handleShow,setDataIdx,idx,show} = this.props;
+    return <div className={styles.emergencyProdure} style={{display:show?'block':'none'}}>
       <div className={`${styles.modalTop} clearfix`}>
           <div className={styles.modalTopL}>
             <img onClick={()=>handleShow(false)} src={small} alt=""/>

src/components/EmergencyProcedure/index.jsx

@@ -39,10 +39,10 @@ class EmergencyProcedure extends React.Component {
         <span id="emergency" className={`${styles.emergency}`} onClick={()=>this.slideToggle(0)}>急</span>
         <span id="emergencys" onClick={()=>this.slideToggle(1)} className={styles.emergency}>急</span>
         <div id="emergencyName" className={styles.emergencyName} onClick={()=>this.handleShow(true)}>{data.emergencyname}</div>
-        <i  onClick={()=>this.slideToggle(0)} id="emergencyPic"><img src={right} alt=""/></i>
+        <i onClick={()=>this.slideToggle(0)} id="emergencyPic"><img src={right} alt=""/></i>
       </div>
       {
-        this.state.show?<EmergencyModal idx={idx} handleShow={()=>this.handleShow()} setDataIdx={setDataIdx} data={data}></EmergencyModal>:null
+        <EmergencyModal idx={idx} handleShow={()=>this.handleShow()} setDataIdx={setDataIdx} show={this.state.show} data={data}></EmergencyModal>
       }
     </div>
   }

src/components/Inspect/index.jsx

@@ -9,7 +9,7 @@ import $ from 'jquery';
 import { host, prefix } from '@utils/config.js';
 import { isIE, getUrlArgObject,getCurrentDate } from '@utils/tools.js';
 import { dragBox } from '@utils/drag';
-import WrapModalBody from '../WrapModalBody';
+import WrapModalBody from '@containers/WrapModalBody';
 
 
 (function ($) {
@@ -30,7 +30,7 @@ import "./dists/FileAPI.js";
 
 const isLocal = window.location.hostname.indexOf('localhost') != -1;
 const qhost = isLocal ? host + prefix : prefix;
-const api = {
+const api = { 
   upload: qhost + '/lisExcelRes/lisExcelAnalysis'
 };
 let numFlg = 0;
@@ -54,7 +54,7 @@ class Inspect extends React.Component {
     this.checkSystemIpt = this.checkSystemIpt.bind(this)
     this.onClose = this.onClose.bind(this)
     this.handleBindFileApi = this.handleBindFileApi.bind(this)
-    this.showInIcss = this.showInIcss.bind(this)
+    this.closeInIcss = this.closeInIcss.bind(this)
     this.showSlideImport = this.showSlideImport.bind(this)
   }  
   componentDidMount() {
@@ -187,13 +187,10 @@ class Inspect extends React.Component {
     })
     dragBox('previewWrapper', 'previewStatic', 'del')
   }
-  showInIcss(){
-    const {showInIcss} = this.props
+  closeInIcss(){
     this.setState({
       hide: false
     })
-    showInIcss&&showInIcss();
-    dragBox('previewWrapper', 'previewStatic', 'del')
   }
   showSlideImport(){
     let flg = this.state.importLis
@@ -202,9 +199,9 @@ class Inspect extends React.Component {
     })
   }
   render() {
-    const { fetchPushInfos, hospitalSonInspect, checkedList,selectWaring,message, selectOneCheck, selectGroupList, allCheckImport, allCheck, hospitalInspect, handleGetSonList, getInfomation, hospitalMsg, inspectVal, handleSearch, windowHeight, handleCloseExcel, handleChangeValue, labelListActive, list, handleSign, labelList, handleLabelSub, handleClear, handleConfirm, fillActive, changeActivePart, getExcelDataList, delPartItem, inspectList } = this.props;
+    const { fetchPushInfos, getInfomation, hospitalMsg, inspectVal, windowHeight, handleCloseExcel, handleChangeValue, labelListActive, list, handleSign, labelList, handleLabelSub, handleClear, handleConfirm, fillActive, changeActivePart, getExcelDataList, delPartItem, inspectList } = this.props;
     const { ieVersion, isIE, hide,importLis } = this.state;
-    const { checkSystemIpt, onClose,handleBindFileApi,showInIcss,showSlideImport } = this;
+    const { checkSystemIpt, onClose,handleBindFileApi,closeInIcss,showSlideImport } = this;
     if(JSON.stringify(hospitalMsg) != {} && document.getElementById("choose")){//动态绑定只绑定一次
       ++numFlg
       numFlg == 1?handleBindFileApi():null
@@ -243,19 +240,8 @@ class Inspect extends React.Component {
             {
               hide ? <WrapModalContainer title={'导入化验数据'} width={1000} height={650} onClose={onClose}>
                 <WrapModalBody
-                  hospitalSonInspect={hospitalSonInspect}
-                  hospitalInspect={hospitalInspect}
-                  handleGetSonList={handleGetSonList}
-                  handleSearch={handleSearch}
-                  allCheckImport={allCheckImport}
-                  allCheck={allCheck}
-                  selectGroupList={selectGroupList}
-                  checkedList={checkedList}
-                  selectOneCheck={selectOneCheck}
-                  selectWaring={selectWaring}
-                  showInIcss={showInIcss}
-                  message={message}
                   height={650}
+                  closeInIcss={closeInIcss}
                 ></WrapModalBody>
               </WrapModalContainer> : null
             }

src/components/WrapModalBody/WrapModalTableSon/index.jsx

@@ -25,7 +25,7 @@ class WrapModalTableSon extends React.Component {
     }
   }
   render() {
-    const { hospitalSonInspect,allCheckImport,allCheck,selectWaring } = this.props;
+    const { hospitalSonInspect,allCheckImportIns,allCheck,selectWaring } = this.props;
     return <div className={style['modalTable']}>
       <div className={style.sonTitle}>
         <span>组名称 : {hospitalSonInspect.groupName}</span><span className={style.btn} onClick={selectWaring}>选中异常值数据</span>
@@ -33,7 +33,7 @@ class WrapModalTableSon extends React.Component {
       <div className={`${style.SonTable}`}>
         <table>
           <tr className={style.head}>
-            <td className={`${style.fst}`} onClick={allCheckImport}><img className={style.check} src={allCheck?check_right:check_circle} alt="" />全选</td>
+            <td className={`${style.fst}`} onClick={allCheckImportIns}><img className={style.check} src={allCheck?check_right:check_circle} alt="" />全选</td>
             <td className={`${style.sec}`}>编号</td>
             <td className={`${style.trd}`}>项目名称</td>
             <td className={`${style.four}`}>结果</td>

src/components/WrapModalBody/index.jsx

@@ -4,14 +4,21 @@ import WrapModalTitle from "./WrapModalTitle";
 import WrapModalTable from "./WrapModalTable";
 import WrapModalTableSon from "./WrapModalTableSon";
 import WrapModalRight from "./WrapModalRight";
+import { dragBox } from '@utils/drag';
 
 class WrapModalBody extends React.Component {
   constructor(props) {
     super(props)
   }
 
+  showInIcss(){
+    const {showInIcss,closeInIcss} = this.props
+    closeInIcss&&closeInIcss()
+    showInIcss&&showInIcss();
+    dragBox('previewWrapper', 'previewStatic', 'del')
+  }
   render() {
-    const { handleSearch, hospitalInspect,height,selectOneCheck,showInIcss, handleGetSonList,selectWaring,message, hospitalSonInspect,allCheckImport,allCheck,checkedList,selectGroupList } = this.props;
+    const { handleSearch, hospitalInspect,height,selectOneCheck, handleGetSonList,selectWaring,message, hospitalSonInspect,allCheckImportIns,allCheck,checkedList,selectGroupList } = this.props;
     return <div className={style['container']}>
       <div className={`${style.left}`}>
         <WrapModalTitle handleSearch={handleSearch} message={message}></WrapModalTitle>
@@ -25,7 +32,7 @@ class WrapModalBody extends React.Component {
             allCheck={allCheck}
             checkedList={checkedList}
             selectWaring={selectWaring}
-            allCheckImport={allCheckImport}
+            allCheckImportIns={allCheckImportIns}
             selectOneCheck={selectOneCheck}
             selectGroupList={selectGroupList}
             hospitalSonInspect={hospitalSonInspect}
@@ -33,7 +40,7 @@ class WrapModalBody extends React.Component {
         }
       </div>
       <div className={`${style.right}`}>
-        <WrapModalRight showInIcss={showInIcss} height={height} selectGroupList={selectGroupList}></WrapModalRight>
+        <WrapModalRight showInIcss={this.showInIcss.bind(this)} height={height} selectGroupList={selectGroupList}></WrapModalRight>
       </div>
     </div>
   }

src/components/WrapModalBodyPac/index.jsx

@@ -4,34 +4,46 @@ import WrapModalTitle from "./WrapModalTitle";
 import WrapModalTable from "./WrapModalTable";
 import WrapModalTableSon from "./WrapModalTableSon";
 import WrapModalRight from "./WrapModalRight";
+import { dragBox } from '@utils/drag';
 
-const WrapModalBody =(props)=>{
-  const { handleSearch,msgObj, hospitalPac,height,selectOneCheck,showInIcss, handleGetSonList,selectWaring,message, hospitalSonInspect,allCheckImport,allCheck,checkedList,selectGroupList } = props;
-  return <div className={style['container']}>
-    <div className={`${style.left}`}>
-      <WrapModalTitle handleSearch={handleSearch} message={message}></WrapModalTitle>
-      <WrapModalTable
-        hospitalPac={hospitalPac}
-        msgObj={msgObj}
-        handleGetSonList={handleGetSonList}
-      ></WrapModalTable>
-      {
-        hospitalSonInspect && hospitalSonInspect.pacsResultDTO?
-        <WrapModalTableSon
-          allCheckImport={allCheckImport}
-          allCheck={allCheck}
-          hospitalSonInspect={hospitalSonInspect}
-          selectGroupList={selectGroupList}
-          checkedList={checkedList}
-          selectOneCheck={selectOneCheck}
-          selectWaring={selectWaring}
-        ></WrapModalTableSon>:null
-      }
+class WrapModalBody extends React.Component {
+  constructor(props) {
+    super(props)
+  }
+  showInIcss(){
+    const {showInIcss,closeInIcss} = this.props;
+    closeInIcss&&closeInIcss();
+    showInIcss&&showInIcss();
+    dragBox('previewWrapper', 'previewStatic', 'del')
+  }
+  render(){
+    const { handleSearchs,msgObj,hospitalPac,height,selectOneCheck, handleGetSonList,selectWaring,message, hospitalSonInspect,allCheckImport,allCheck,checkedList,selectGroupList } = this.props;
+    return <div className={style['container']}>
+      <div className={`${style.left}`}>
+        <WrapModalTitle handleSearch={handleSearchs} message={message}></WrapModalTitle>
+        <WrapModalTable
+          hospitalPac={hospitalPac}
+          msgObj={msgObj}
+          handleGetSonList={handleGetSonList}
+        ></WrapModalTable>
+        {
+          hospitalSonInspect && hospitalSonInspect.pacsResultDTO?
+          <WrapModalTableSon
+            allCheckImport={allCheckImport}
+            allCheck={allCheck}
+            hospitalSonInspect={hospitalSonInspect}
+            selectGroupList={selectGroupList}
+            checkedList={checkedList}
+            selectOneCheck={selectOneCheck}
+            selectWaring={selectWaring}
+          ></WrapModalTableSon>:null
+        }
+      </div>
+      <div className={`${style.right}`}>
+        <WrapModalRight showInIcss={this.showInIcss.bind(this)} height={height} selectGroupList={selectGroupList}></WrapModalRight>
+      </div>
     </div>
-    <div className={`${style.right}`}>
-      <WrapModalRight showInIcss={showInIcss} height={height} selectGroupList={selectGroupList}></WrapModalRight>
-    </div>
-  </div>
+  }
 }
 
 export default WrapModalBody;

src/containers/Inspect.js

@@ -6,8 +6,6 @@ import Inspect from '@components/Inspect';
 import {
   getSearchList,
   getSublableList,
-  getImportList,
-  getSonDetailLists
 } from '@store/async-actions/inspect';
 import {
   setLabel,
@@ -17,14 +15,10 @@ import {
   delExcelLis,
   clearLabel,
   delPartItem,
-  allCheckImport,
-  selectOneCheck,
-  selectWaring,
-  showInIcss
 } from '@store/actions/inspect';
 import {
   billing,
-  getConceptDetail
+  getConceptDetail,
 } from '@store/async-actions/pushMessage';
 
 function mapStateToProps(state) {//console.log(state)
@@ -38,36 +32,12 @@ function mapStateToProps(state) {//console.log(state)
     windowHeight: state.homePage.windowHeight,
     inspectVal: state.inspect.inspectVal,
     message: state.patInfo.message,
-
     hospitalMsg: state.homePage.sysConfig || {},
-    hospitalInspect: state.inspect.hospitalInspect,
-    hospitalSonInspect: state.inspect.hospitalInspectObj,
-    allCheck: state.inspect.allCheck,
-    selectGroupList: state.inspect.selectGroupList,
-    checkedList: state.inspect.checkedList,
   }
 }
 
 function mapDispatchToProps(dispatch, store) {
   return {
-    showInIcss(){
-      dispatch(showInIcss())
-    },
-    selectWaring(){
-      dispatch(selectWaring())
-    },
-    selectOneCheck(name,groupName,item){
-      dispatch(selectOneCheck(name,groupName,item))
-    },
-    allCheckImport(data) {
-      dispatch(allCheckImport(data))
-    },
-    handleSearch(data) {
-      dispatch(getImportList(data))
-    },
-    handleGetSonList(name,time) {
-      dispatch(getSonDetailLists(name,time))
-    },
     handleChangeValue(val) {
       dispatch(getSearchList(val))
     },

src/containers/WrapModalBody.js

@@ -0,0 +1,58 @@
+import React from 'react';
+import {
+  connect
+} from 'react-redux';
+import WrapModalBody from '@components/WrapModalBody';
+import {
+  getSearchList,
+  getImportList,
+  getSonDetailLists
+} from '@store/async-actions/wrapModalBody';
+import {
+  allCheckImportIns,
+  selectOneCheck,
+  selectWaring,
+  showInIcss
+} from '@store/actions/wrapModalBody';
+
+function mapStateToProps(state) {
+  return {
+    message: state.patInfo.message,
+    hospitalMsg: state.homePage.sysConfig || {},
+    hospitalInspect: state.wrapModalBody.hospitalInspect || [],
+    hospitalSonInspect: state.wrapModalBody.hospitalInspectObj || [],
+    allCheck: state.wrapModalBody.allCheck,
+    selectGroupList: state.wrapModalBody.selectGroupList,
+    checkedList: state.wrapModalBody.checkedList,
+  }
+}
+
+function mapDispatchToProps(dispatch, store) {
+  return {
+    showInIcss(){
+      dispatch(showInIcss())
+    },
+    selectWaring(){
+      dispatch(selectWaring())
+    },
+    selectOneCheck(name,groupName,item){
+      dispatch(selectOneCheck(name,groupName,item))
+    },
+    allCheckImportIns(data) {
+      dispatch(allCheckImportIns(data))
+    },
+    handleSearch(data) {
+      dispatch(getImportList(data))
+    },
+    handleGetSonList(name,time) {
+      dispatch(getSonDetailLists(name,time))
+    },
+    handleChangeValue(val) {
+      dispatch(getSearchList(val))
+    }
+  }
+}
+
+const WrapModalBodyAction = connect(mapStateToProps, mapDispatchToProps)(WrapModalBody);
+
+export default WrapModalBodyAction;

src/containers/WrapModalBodyPac.js

@@ -0,0 +1,43 @@
+import React from 'react';
+import {
+    connect
+} from 'react-redux';
+import WrapModalBodyPac from '@components/WrapModalBodyPac';
+import { allCheckImports,selectOneChecks,showInIcsss } from '@store/actions/wrapModalBodyPac';
+import {getImportLists,getSonDetailList} from '@store/async-actions/wrapModalBodyPac';
+
+function mapStateToProps(state) {
+    return {
+        message: state.patInfo.message,
+        hospitalPac: state.wrapModalBodyPac.hospitalPac,
+        hospitalSonInspect: state.wrapModalBodyPac.hospitalPacObj,
+        selectGroupList: state.wrapModalBodyPac.selectGroupList,
+        allCheck: state.wrapModalBodyPac.allCheck,
+        msgObj: state.wrapModalBodyPac.msgObj,
+        checkedList: state.wrapModalBodyPac.checkedList,
+    }
+}
+
+function mapDispatchToProps(dispatch, store) {
+    return {
+        showInIcss(){
+          dispatch(showInIcsss())
+        },
+        selectOneCheck(name,checkItem,item){
+          dispatch(selectOneChecks(name,checkItem,item))
+        },
+        allCheckImport() {
+          dispatch(allCheckImports())
+        },
+        handleSearchs(data) {
+          dispatch(getImportLists(data))
+        },
+        handleGetSonList(name,time) {
+          dispatch(getSonDetailList(name,time))
+        }
+    }
+}
+
+const WrapModalBodyPacAction = connect(mapStateToProps, mapDispatchToProps)(WrapModalBodyPac);
+
+export default WrapModalBodyPacAction;

src/modules/HomePage/index.jsx

@@ -72,7 +72,8 @@ class HomePage extends Component {
 const mapStateToProps = function (state) {
   return {
     flag:state.homePage.loadingFlag,
-    setPushEmergencyIdx: state.pushMessage.setPushEmergencyIdx || '',  
+    setPushEmergencyIdx: 1,  
+    // setPushEmergencyIdx: state.pushMessage.setPushEmergencyIdx || '',  
     sysConfig:state.homePage.sysConfig
   }
 };

src/store/actions/assistCheck.js

@@ -1,27 +1,6 @@
-import {SET_ALLCHECKS,SHOW_IN_ICSSS,SELECT_ONE_CHECKS,GET_ASSIST_SEARCH_LIST,SEARCH_HOSPITAL_PAC_SON,SEARCH_HOSPITAL_PAC,GET_ASSIST_LABEL,DEL_ASSIST_LABEL,CHANGE_ASSIST_VAL,CHANGE_DATE,CLEAR_ASSIST_DATA,ADD_ASSIST_LABEL} from '../types/assistCheck';
+import {GET_ASSIST_SEARCH_LIST,GET_ASSIST_LABEL,DEL_ASSIST_LABEL,CHANGE_ASSIST_VAL,CHANGE_DATE,CLEAR_ASSIST_DATA,ADD_ASSIST_LABEL} from '../types/assistCheck';
 
-export const showInIcsss = () => ({         //确认选择显示到页面
-  type:SHOW_IN_ICSSS
-})
-export const selectOneChecks = (name,checkItem,item) => ({         //选一个
-  type:SELECT_ONE_CHECKS,
-  name,
-  checkItem,
-  item
-})
-export const allCheckImports = () => ({         //全选反选
-  type:SET_ALLCHECKS
-})
-export const getHospitalPacDetailList = (list,name) => ({         //检索医院辅检项
-  type:SEARCH_HOSPITAL_PAC_SON,
-  list,
-  name
-})
-export const getHospitalPacList = (list,msg) => ({         //检索医院辅检项
-  type:SEARCH_HOSPITAL_PAC,
-  list,msg
-})
-export const searchList = (list,val) => ({         //获取搜索数据
+export const searchList = (list,val) => ({         //右侧到左侧
     type:GET_ASSIST_SEARCH_LIST,
     list,
     val

src/store/actions/inspect.js

@@ -1,35 +1,4 @@
-import {ADD_LABEL,SHOW_IN_ICSS,SET_ALLCHECK,SELECT_ONE_CHECK,SELECT_WARING,SEARCH_HOSPITAL_INSPECT_SON,SEARCH_HOSPITAL_INSPECT,SEARCH_LIST,SET_LABEL,FILL_ACTIVE,FILL_ACTIVE_DETAIL,GET_EXCEL,CHECK_VALUE_IS_CHANGE,CLEAR_LABEL,RESET_LABEL,CLEAR_ALL_LABEL,DEL_PART_ITEM,DEL_EXCEL_LIST} from '../types/inspect';
-
-export const showInIcss = () => ({         //确认选择显示到页面
-    type:SHOW_IN_ICSS
-})
-export const selectWaring = () => ({         //选择异常值
-    type:SELECT_WARING
-})
-export const selectOneCheck = (name,groupName,item) => ({         //选一个
-    type:SELECT_ONE_CHECK,
-    name,
-    groupName,
-    item
-})
-export const allCheckImport = () => ({         //全选反选
-    type:SET_ALLCHECK
-})
-export const searchList = (list,val) => ({         //初始化数据
-    type:SEARCH_LIST,
-    list,
-    val
-})
-export const getHospitalInspectList = (list) => ({         //检索医院化验项
-    type:SEARCH_HOSPITAL_INSPECT,
-    list
-})
-export const getHospitalInspectDetailList = (list,name,time) => ({         //检索医院化验项
-    type:SEARCH_HOSPITAL_INSPECT_SON,
-    list,
-    name,
-    time
-})
+import {ADD_LABEL,SEARCH_LIST,SET_LABEL,FILL_ACTIVE,FILL_ACTIVE_DETAIL,GET_EXCEL,CHECK_VALUE_IS_CHANGE,CLEAR_LABEL,RESET_LABEL,CLEAR_ALL_LABEL,DEL_PART_ITEM,DEL_EXCEL_LIST} from '../types/inspect';
 
 export const setLabel = (idx,sign) => ({          //搜索后点击选中的结果
     type:SET_LABEL,
@@ -67,6 +36,11 @@ export const checkValueIsChange = (idx,time,arr) => ({                 //检查
     time,
     arr
 })
+export const searchList = (list,val) => ({         //检索数据
+  type:SEARCH_LIST,
+  list,
+  val
+})
 export const clearLabel = (idx) => ({                  //清空
     type:CLEAR_LABEL,
     idx

src/store/actions/wrapModalBody.js

@@ -0,0 +1,30 @@
+import {SHOW_IN_ICSS_INS,SET_ALLCHECK_INS,SELECT_ONNY_CHECK,SELECT_WARING,SEARCH_HOSPITAL_INSPECT_SON,SEARCH_HOSPITAL_INSPECT} from '../types/wrapModalBody';
+
+export const showInIcss = () => ({         //确认选择显示到页面
+    type:SHOW_IN_ICSS_INS
+})
+export const selectWaring = () => ({         //选择异常值
+    type:SELECT_WARING
+})
+export const selectOneCheck = (name,groupName,item) => ({ //选一个
+    type:SELECT_ONNY_CHECK,
+    name,
+    groupName,
+    item
+})
+export const allCheckImportIns = () => ({         //全选反选
+    type:SET_ALLCHECK_INS
+})
+
+export const getHospitalInspectList = (list) => ({         //检索医院化验项
+    type:SEARCH_HOSPITAL_INSPECT, 
+    list
+})
+export const getHospitalInspectDetailList = (list,name,time) => ({         //检索医院化验项
+    type:SEARCH_HOSPITAL_INSPECT_SON,
+    list,
+    name,
+    time
+})
+
+

src/store/actions/wrapModalBodyPac.js

@@ -0,0 +1,23 @@
+import {SET_ALLCHECKS,SHOW_IN_ICSSS,SELECT_ONE_CHECKS,SEARCH_HOSPITAL_PAC_SON,SEARCH_HOSPITAL_PAC} from '../types/wrapModalBodyPac';
+
+export const showInIcsss = () => ({         //确认选择显示到页面
+  type:SHOW_IN_ICSSS
+})
+export const selectOneChecks = (name,checkItem,item) => ({         //选一个
+  type:SELECT_ONE_CHECKS,
+  name,
+  checkItem,
+  item
+})
+export const allCheckImports = () => ({         //全选反选
+  type:SET_ALLCHECKS
+})
+export const getHospitalPacDetailList = (list,name) => ({         //检索医院辅检项
+  type:SEARCH_HOSPITAL_PAC_SON,
+  list,
+  name
+})
+export const getHospitalPacList = (list,msg) => ({         //检索医院辅检项
+  type:SEARCH_HOSPITAL_PAC,
+  list,msg
+})

src/store/async-actions/assistCheck.js

@@ -1,8 +1,6 @@
 import axios from '@utils/ajax';
 import store from '@store';
-import { searchList,getHospitalPacList,getHospitalPacDetailList } from '../actions/assistCheck';
-import { SET_TIPS } from '../types/pushMessage';
-import { Notify} from '@commonComp';
+import { searchList } from '../actions/assistCheck';
 
 export const getSearchList = (val) => {
     if(val.trim() == ''){
@@ -24,34 +22,3 @@ export const getSearchList = (val) => {
         })
     }
 };
-export const getImportLists = (data) => {
-  const state = store.getState();
-  const patientInfo = state.patInfo.message;
-    let param = {
-      "endTime": data.endTime,
-      "startTime": data.startTime,
-      "hospitalCode": patientInfo.hospitalCode,
-      "inquiryCode": patientInfo.recordId,
-      "patientId": patientInfo.patientId,
-    }
-    return (dispatch) => {
-        axios.json('/dockingImport/pacsDockingImport',param)
-        .then((res)=>{
-            const data = res.data.data;
-            let tmpObj = {}
-            tmpObj.name = data.name
-            tmpObj.patientNum = data.patientNum
-            dispatch(getHospitalPacList(data.pacsRetrieveData,tmpObj))
-        })
-    }
-};
-export const getSonDetailList = (name,time) => {
-  return (dispatch) => {
-      axios.json('/dockingImport/getByCheckItemPacsData',{checkItem:name})
-      .then((res)=>{
-          const data = res.data.data;
-          data.Rtime = time
-          dispatch(getHospitalPacDetailList(data,name))
-      })
-  }
-};

src/store/async-actions/inspect.js

@@ -1,9 +1,7 @@
 import axios from '@utils/ajax';
 import store from '@store';
 
-import { searchList,resetLabel,getHospitalInspectList,getHospitalInspectDetailList } from '../actions/inspect';
-import { SET_TIPS } from '../types/pushMessage';
-import { Notify} from '@commonComp';
+import { searchList,resetLabel } from '../actions/inspect';
 
 export const getSearchList = (val) => {
     if(val.trim() == ''){
@@ -50,30 +48,3 @@ export const getSublableList = (id,idx) => {
         })
     }
 };
-export const getImportList = (data) => {
-  const state = store.getState();
-  const patientInfo = state.patInfo.message;
-    let param = {
-      "endTime": data.endTime,
-      "startTime": data.startTime,
-      "hospitalCode": patientInfo.hospitalCode,
-      "inquiryCode": patientInfo.recordId,
-      "patientId": patientInfo.patientId,
-    }
-    return (dispatch) => {
-        axios.json('/dockingImport/lisDockingImports',param)
-        .then((res)=>{
-            const data = res.data.data;
-            dispatch(getHospitalInspectList(data.lisRetrieveData))
-        })
-    }
-};
-export const getSonDetailLists = (name,time) => {
-    return (dispatch) => {
-        axios.json('/dockingImport/getByGroupNameLisData',{groupName:name})
-        .then((res)=>{
-            const data = res.data.data;
-            dispatch(getHospitalInspectDetailList(data,name,time))
-        })
-    }
-};

src/store/async-actions/wrapModalBody.js

@@ -0,0 +1,31 @@
+import axios from '@utils/ajax';
+import store from '@store';
+
+import { getHospitalInspectList,getHospitalInspectDetailList } from '../actions/wrapModalBody';
+export const getImportList = (data) => {
+  const state = store.getState();
+  const patientInfo = state.patInfo.message;
+    let param = {
+      "endTime": data.endTime,
+      "startTime": data.startTime,
+      "hospitalCode": patientInfo.hospitalCode,
+      "inquiryCode": patientInfo.recordId,
+      "patientId": patientInfo.patientId,
+    }
+    return (dispatch) => {
+        axios.json('/dockingImport/lisDockingImports',param)
+        .then((res)=>{
+            const data = res.data.data;
+            dispatch(getHospitalInspectList(data.lisRetrieveData))
+        })
+    }
+};
+export const getSonDetailLists = (name,time) => {
+    return (dispatch) => {
+        axios.json('/dockingImport/getByGroupNameLisData',{groupName:name})
+        .then((res)=>{
+            const data = res.data.data;
+            dispatch(getHospitalInspectDetailList(data,name,time))
+        })
+    }
+};

src/store/async-actions/wrapModalBodyPac.js

@@ -0,0 +1,34 @@
+import axios from '@utils/ajax';
+import store from '@store';
+import { getHospitalPacList,getHospitalPacDetailList } from '../actions/wrapModalBodyPac';
+export const getImportLists = (data) => {
+  const state = store.getState();
+  const patientInfo = state.patInfo.message;
+    let param = {
+      "endTime": data.endTime,
+      "startTime": data.startTime,
+      "hospitalCode": patientInfo.hospitalCode,
+      "inquiryCode": patientInfo.recordId,
+      "patientId": patientInfo.patientId,
+    }
+    return (dispatch) => {
+        axios.json('/dockingImport/pacsDockingImport',param)
+        .then((res)=>{
+            const data = res.data.data;
+            let tmpObj = {}
+            tmpObj.name = data.name
+            tmpObj.patientNum = data.patientNum
+            dispatch(getHospitalPacList(data.pacsRetrieveData,tmpObj))
+        })
+    }
+};
+export const getSonDetailList = (name,time) => {
+  return (dispatch) => {
+      axios.json('/dockingImport/getByCheckItemPacsData',{checkItem:name})
+      .then((res)=>{
+          const data = res.data.data;
+          data.Rtime = time
+          dispatch(getHospitalPacDetailList(data,name))
+      })
+  }
+};

src/store/index.js

@@ -30,6 +30,8 @@ import assessResultHis from './reducers/assessResultHis';
 import medicalInfo from './reducers/medicalInfo';
 import scaleSearch from './reducers/scaleSearch';
 import emergencyHis from './reducers/emergencyHis';
+import wrapModalBody from './reducers/wrapModalBody';
+import wrapModalBodyPac from './reducers/wrapModalBodyPac';
 
 
 const composeEnhancers =
@@ -65,7 +67,9 @@ const rootReducer = combineReducers({
     assessResult,
     assessResultHis,
     medicalInfo,
-  emergencyHis
+    emergencyHis,
+    wrapModalBody,
+    wrapModalBodyPac,
 });
 
 export default createStore(rootReducer, enhancer);

src/store/reducers/assistCheck.js

@@ -5,12 +5,7 @@ import {
   CHANGE_ASSIST_VAL,
   CHANGE_DATE,
   CLEAR_ASSIST_DATA,
-  ADD_ASSIST_LABEL,
-  SEARCH_HOSPITAL_PAC,
-  SEARCH_HOSPITAL_PAC_SON,
-  SET_ALLCHECKS,
-  SELECT_ONE_CHECKS,
-  SHOW_IN_ICSSS
+  ADD_ASSIST_LABEL
 } from '../types/assistCheck';
 import store from '@store';
 const initSearchList = {
@@ -31,163 +26,9 @@ const initSearchList = {
     patientNum:''
   }
 }
-import { getCurrentDate} from '@utils/tools';
+import { getCurrentDate,getAllString} from '@utils/tools';
 
 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 tmpListImport = JSON.parse(JSON.stringify(newState.checkedListImport))
-    let tempArrs = JSON.parse(JSON.stringify(newState.assistLabel)),importLis=[];
-    for (let i = 0; i < tmpGroup.length; i++) {
-      for (let k = 0; k < tmpGroup[i].pacsResultDTO.length; k++) {
-        let tmpObj = {}
-        tmpObj.time = tmpGroup[i].Rtime
-        tmpObj.disabled = true
-        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]
-    newState.allCheckLis = [...tempArrs]
-    newState.dataString = getAllString(newState.checkedListImport,newState.assistLabel)
-
-    newState.hospitalPac = [] //医院检索到的
-    newState.hospitalPacObj = {} //组对应的明细（单选多选全选）
-    newState.selectGroupList = [] //选的组的明细可能有多个组
-    newState.allCheck = false //全选反选
-    newState.checkedList = [] //选中的小项
-    newState.msgObj={name:'',patientNum:''}
-
-    return newState;
-  }
-  if (action.type == SELECT_ONE_CHECKS) {
-    const newState = Object.assign({}, state);
-    let listWrap = JSON.parse(JSON.stringify(newState.hospitalPacObj))
-    let tmpGroup = JSON.parse(JSON.stringify(newState.selectGroupList))
-    let tmpLen = listWrap.pacsResultDTO.length;
-    let tmpCheckedLis = JSON.parse(JSON.stringify(newState.checkedList))
-    let numS = 0;
-    if (tmpCheckedLis.indexOf(action.name) == -1) { //添加选中
-      let tempArr = newState.checkedList;
-      tempArr.push(action.name);
-      newState.checkedList = [...tempArr]
-
-      for (let m = 0; m < tmpGroup.length; m++) {
-        if (tmpGroup[m].checkItem == action.checkItem) { //右侧有选中相同组的明细
-          tmpGroup[m].pacsResultDTO.push(action.item)
-        } else {
-          ++numS
-        }
-      }
-      if (numS == tmpGroup.length) { //直接添加到右侧
-        listWrap.pacsResultDTO = []
-        listWrap.pacsResultDTO.push(action.item)
-        tmpGroup.push(listWrap)
-      }
-
-      newState.selectGroupList = [...tmpGroup] //右侧已选中的项目
-      if (tempArr.length == tmpLen) {
-        newState.allCheck = true;
-      } else {
-        newState.allCheck = false;
-      }
-    } else { //去除选中
-      let tempArr = newState.checkedList;
-      tempArr.splice(tempArr.findIndex(item => item === action.name), 1)
-      newState.checkedList = [...tempArr]
-      for (let i = 0; i < tmpGroup.length; i++) {
-        if (tmpGroup[i].checkItem == action.checkItem) { //右侧肯定有相同组的
-          let tmpArr = []
-          for (let k = 0; k < tmpGroup[i].pacsResultDTO.length; k++) {
-            if (action.name != tmpGroup[i].pacsResultDTO[k].checkItem) {
-              tmpArr.push(tmpGroup[i].pacsResultDTO[k])
-            }
-          }
-          if(tmpArr.length == 0){
-            tmpGroup.splice(i,1)
-          }else{
-            tmpGroup[i].pacsResultDTO = [...tmpArr]
-          }
-        }
-      }
-      newState.selectGroupList = tmpGroup //右侧已选中的项目
-      if (tempArr.length == listWrap.pacsResultDTO.length) {
-        newState.allCheck = true;
-      } else {
-        newState.allCheck = false;
-      }
-    }
-    return newState;
-  }
-  if (action.type == SET_ALLCHECKS) {
-    const newState = Object.assign({}, state);
-    let flg = newState.allCheck
-    let listWrap = newState.hospitalPacObj
-    let tmpGroup = newState.selectGroupList
-    let tmpCheckedLis = []
-    newState.allCheck = !flg
-    if (!flg) { //全选
-      let numFst = 0
-      for (let i = 0; i < tmpGroup.length; i++) {
-        if (listWrap.checkItem == tmpGroup[i].checkItem) {
-          ++numFst
-          tmpGroup[i].pacsResultDTO = listWrap.pacsResultDTO
-        }
-      }
-      for (let m = 0; m < listWrap.pacsResultDTO.length; m++) {
-        tmpCheckedLis.push(listWrap.pacsResultDTO[m].checkItem)
-      }
-      if (numFst == 0) {
-        tmpGroup.push(listWrap)
-      }
-      newState.checkedList = [...tmpCheckedLis]
-      newState.selectGroupList = [...tmpGroup]
-    } else { //反选
-      for (let j = 0; j < tmpGroup.length; j++) {
-        if (listWrap.checkItem == tmpGroup[j].checkItem) {
-          tmpGroup.splice(j, 1)
-        }
-      }
-      newState.checkedList = []
-      newState.selectGroupList = [...tmpGroup]
-    }
-    return newState;
-  }
-  if (action.type == SEARCH_HOSPITAL_PAC_SON) {
-    const newState = Object.assign({}, state);
-    let tmpArr = action.list
-    let tmpSelect = newState.selectGroupList
-    let tmpSelectSon = []
-    for (let i = 0; i < tmpSelect.length; i++) {
-      if (tmpSelect[i].checkItem == action.name) {
-        for (let k = 0; k < tmpSelect[i].pacsResultDTO.length; k++) {
-          tmpSelectSon.push(tmpSelect[i].pacsResultDTO[k].checkItem)
-        }
-      }
-    }
-    newState.checkedList = [...tmpSelectSon]
-    if (tmpSelectSon.length == tmpArr.pacsResultDTO.length) {
-      newState.allCheck = true;
-    } else {
-      newState.allCheck = false;
-    }
-    newState.hospitalPacObj = tmpArr
-    return newState;
-  }
-  if (action.type == SEARCH_HOSPITAL_PAC) {
-    const newState = Object.assign({}, state);
-    newState.hospitalPac = action.list
-    newState.msgObj = action.msg
-    newState.allCheck = false
-    newState.hospitalPacObj = {}
-    return newState;
-  }
   if (action.type == ADD_ASSIST_LABEL) {
     const newState = Object.assign({}, state);
     let tempArr = newState.assistLabel;
@@ -282,19 +123,3 @@ export default (state = initSearchList, action) => {
   }
   return state;
 }
-
-
-function getAllString(checkedListImport,assistLabel){
-  let tmpImportLis = [],tmpString='';
-  for(let i = 0;i < checkedListImport.length;i++){
-    for(let j = 0;j < checkedListImport[i].length;j++){
-      tmpImportLis.push(checkedListImport[i][j])
-    }
-  }
-  let tempArr = tmpImportLis.concat(assistLabel)
-  for (let i = 0; i < tempArr.length; i++) {
-    let tmpVal = tempArr[i].value ? tempArr[i].value.trim() : tempArr[i].value;
-    tmpString += (tempArr[i].name + (tmpVal ? (':' + tmpVal) + ', ' : ': ') + (tempArr[i].time ? '报告日期:' + tempArr[i].time : '') + ';')
-  }
-  return tmpString;
-}

src/store/reducers/inspect.js

@@ -9,16 +9,10 @@ import {
     CLEAR_ALL_LABEL,
     DEL_PART_ITEM,
     DEL_EXCEL_LIST,
-    ADD_LABEL,
-    SEARCH_HOSPITAL_INSPECT,
-    SEARCH_HOSPITAL_INSPECT_SON,
-    SET_ALLCHECK,
-    SELECT_ONE_CHECK,
-    SELECT_WARING,
-    SHOW_IN_ICSS
+    ADD_LABEL
 } from '../types/inspect';
 import store from '@store';
-import {dateParser} from '@utils/tools.js';
+import { getStringPlus,  getPushLists,  getPushList} from '@utils/tools.js';
 
 const initSearchList = {
     list: [], //搜索的结果
@@ -33,209 +27,9 @@ const initSearchList = {
     pushItem:[],    //推送的数据
     pushItems:[],    //右侧模板预览的数据
     inspectVal:'',
-
-    hospitalInspect:[],//医院检索到的
-    hospitalInspectObj:{},//组对应的明细（单选多选全选）
-    selectGroupList:[],//选的组的明细可能有多个组
-    allCheck:false,//全选反选
-    checkedList:[],//选中的小项
 }
 
 export default (state = initSearchList, action) => {
-    if (action.type == SHOW_IN_ICSS) {
-        const newState = Object.assign({}, state);
-        let tmpGroup = JSON.parse(JSON.stringify(newState.selectGroupList))
-        let tmpArr = newState.getExcelDataList;
-        let tmpArr2 = newState.labelList;
-        let excelDataLis = {
-          lisExcelRes:[],
-          messages:[]
-        }
-        for(let i = 0;i < tmpGroup.length;i++){
-          let tmpObj = {//excelDataLis.lisExcelRes[0]
-            menus:'',
-            lisExcelItem:[]
-          }
-          for(let k = 0;k < tmpGroup[i].lisExcelWrapper.length;k++){
-            tmpGroup[i].lisExcelWrapper[k].time = tmpGroup[i].Rtime
-          }
-          tmpObj.menus = tmpGroup[i].groupName
-          tmpObj.lisExcelItem = tmpGroup[i].lisExcelWrapper
-          excelDataLis.lisExcelRes.push(tmpObj)
-        }
-        newState.getExcelData = excelDataLis
-        tmpArr.push(excelDataLis)
-        newState.getExcelDataList = [...tmpArr]
-        newState.pushItem = getPushList(tmpArr,tmpArr2);
-        newState.pushItems = getPushLists(tmpArr,tmpArr2);
-        newState.inspectStrPlus = getStringPlus(newState.pushItems)
-
-        newState.hospitalInspect = [] //医院检索到的
-        newState.hospitalInspectObj = {} //组对应的明细（单选多选全选）
-        newState.selectGroupList = [] //选的组的明细可能有多个组
-        newState.allCheck = false //全选反选
-        newState.checkedList = [] //选中的小项
-
-        return newState;
-    }
-    if (action.type == SELECT_WARING) {
-        const newState = Object.assign({}, state);
-        let listWrap = JSON.parse(JSON.stringify(newState.hospitalInspectObj))
-        let tmpGroup = JSON.parse(JSON.stringify(newState.selectGroupList))
-        let tmpCheckedLis = JSON.parse(JSON.stringify(newState.checkedList))
-        let warArr = [],checked = [],numS=0
-        for(let m =0;m < listWrap.lisExcelWrapper.length;m++){
-          for(let n = 0;n < tmpCheckedLis.length;n++){
-            if(listWrap.lisExcelWrapper[m].type == 0 && listWrap.lisExcelWrapper[m].itemName == tmpCheckedLis[n]){
-              warArr.push(listWrap.lisExcelWrapper[m])
-              checked.push(listWrap.lisExcelWrapper[m].itemName)
-            }
-          }
-          if(listWrap.lisExcelWrapper[m].type != 0){
-            warArr.push(listWrap.lisExcelWrapper[m])
-            checked.push(listWrap.lisExcelWrapper[m].itemName)
-          }
-        }
-        for(let i = 0;i < tmpGroup.length;i++){
-          if(tmpGroup[i].groupName == listWrap.groupName){//右侧有选中相同组的明细
-            tmpGroup[i].lisExcelWrapper = warArr
-          }else{//右侧没有选中相同组的明细
-            ++numS
-          }
-        }
-        if(numS == tmpGroup.length){//直接添加到右侧
-          listWrap.lisExcelWrapper = warArr
-          tmpGroup.push(listWrap)
-        }
-        if(checked.length == listWrap.lisExcelWrapper.length){
-          newState.allCheck = true;            
-        }else{
-          newState.allCheck = false;
-        }
-        newState.selectGroupList = [...tmpGroup]//右侧已选中的项目
-        newState.checkedList = [...checked]
-        return newState;
-    }
-    if (action.type == SELECT_ONE_CHECK) {
-        const newState = Object.assign({}, state);
-        let listWrap = JSON.parse(JSON.stringify(newState.hospitalInspectObj))
-        let tmpLen = listWrap.lisExcelWrapper.length;
-        let tmpGroup = JSON.parse(JSON.stringify(newState.selectGroupList))
-        let tmpCheckedLis = JSON.parse(JSON.stringify(newState.checkedList))
-        let numS = 0;
-        if (tmpCheckedLis.indexOf(action.name) == -1) {//添加选中
-          let tempArr = newState.checkedList;
-          tempArr.push(action.name);
-          newState.checkedList = [...tempArr]
-          for(let m = 0;m < tmpGroup.length;m++){
-            if(tmpGroup[m].groupName == action.groupName){//右侧有选中相同组的明细
-              tmpGroup[m].lisExcelWrapper.push(action.item)
-            }else{
-              ++numS
-            }
-          }
-          if(numS == tmpGroup.length){//直接添加到右侧
-            listWrap.lisExcelWrapper = []
-            listWrap.lisExcelWrapper.push(action.item)
-            tmpGroup.push(listWrap)
-          }
-          newState.selectGroupList = [...tmpGroup]//右侧已选中的项目
-          if(tempArr.length == tmpLen){
-            newState.allCheck = true;            
-          }else{
-            newState.allCheck = false;
-          }
-        } else {//去除选中
-          let tempArr = newState.checkedList;
-          tempArr.splice(tempArr.findIndex(item => item === action.name), 1)
-          newState.checkedList = [...tempArr]
-          for(let i = 0;i < tmpGroup.length;i++){
-            if(tmpGroup[i].groupName == action.groupName){//右侧肯定有相同组的
-              let tmpArr = []
-              for(let k = 0;k < tmpGroup[i].lisExcelWrapper.length;k++){
-                if(action.name != tmpGroup[i].lisExcelWrapper[k].itemName){
-                  tmpArr.push(tmpGroup[i].lisExcelWrapper[k])
-                }
-              }
-              if(tmpArr.length == 0){
-                tmpGroup.splice(i,1)
-              }else{
-                tmpGroup[i].lisExcelWrapper = [...tmpArr]
-              }
-            }
-          }
-          newState.selectGroupList = tmpGroup//右侧已选中的项目
-          if(tempArr.length == listWrap.lisExcelWrapper.length){
-            newState.allCheck = true;            
-          }else{
-            newState.allCheck = false;
-          }
-        }
-        return newState;
-    }
-    if (action.type == SET_ALLCHECK) {
-        const newState = Object.assign({}, state);
-        let flg = newState.allCheck
-        let listWrap = newState.hospitalInspectObj
-        let tmpGroup = newState.selectGroupList
-        let tmpCheckedLis = []
-        newState.allCheck = !flg
-        if(!flg){//全选
-          let numFst=0
-          for(let i = 0;i < tmpGroup.length;i++){
-            if(listWrap.groupName == tmpGroup[i].groupName){
-              ++numFst
-              tmpGroup[i].lisExcelWrapper = listWrap.lisExcelWrapper
-            }
-          }
-          for(let m =0;m < listWrap.lisExcelWrapper.length;m++){
-            tmpCheckedLis.push(listWrap.lisExcelWrapper[m].itemName)
-          }
-          if(numFst==0){
-            tmpGroup.push(listWrap)
-          }
-          newState.checkedList=[...tmpCheckedLis]
-          newState.selectGroupList = [...tmpGroup]
-        }else{//反选
-          for(let j = 0;j < tmpGroup.length;j++){
-            if(listWrap.groupName == tmpGroup[j].groupName){
-              tmpGroup.splice(j,1)
-            }
-          }
-          newState.checkedList=[]
-          newState.selectGroupList = [...tmpGroup]
-        }
-        return newState;
-    }
-    if (action.type == SEARCH_HOSPITAL_INSPECT) {
-        const newState = Object.assign({}, state);
-        newState.hospitalInspect = action.list
-        newState.allCheck = false
-        newState.hospitalInspectObj={}
-        return newState;
-    }
-    if (action.type == SEARCH_HOSPITAL_INSPECT_SON) {
-        const newState = Object.assign({}, state);
-        let tmpArr = action.list
-        let tmpSelect = newState.selectGroupList
-        let tmpSelectSon = []
-        for(let i = 0;i < tmpSelect.length;i++){
-          if(tmpSelect[i].groupName == action.name){
-            for(let k = 0;k < tmpSelect[i].lisExcelWrapper.length;k++){
-              tmpSelectSon.push(tmpSelect[i].lisExcelWrapper[k].itemName)
-            }
-          }
-        }
-        newState.checkedList = [...tmpSelectSon]
-        if(tmpSelectSon.length == tmpArr.lisExcelWrapper.length){
-          newState.allCheck = true;            
-        }else{
-          newState.allCheck = false;
-        }
-        tmpArr.Rtime = action.time
-        newState.hospitalInspectObj = tmpArr
-        return newState;
-    }
     if (action.type == SEARCH_LIST) {
         const newState = Object.assign({}, state);
         newState.list = action.list
@@ -437,114 +231,3 @@ function getString(lists) {
     })
     return tmpString;
 }
-
-function getStringPlus(dataList){
-  let strPlus = '';
-  dataList && dataList.map((item)=>{
-    if(item.detailName){
-      let strTmp = item.name + ',' + item.detailName + ',' + (item.otherValue ? item.otherValue : (item.value + item.units)) +';'
-      strPlus += strTmp;
-    }else{
-      let strTmp = item.name+';'
-      strPlus += strTmp;
-    }
-  })
-  return strPlus;
-}
-/**
- * 
- * @param {data1}  excel导入的数据 getExcelDataList
- * @param {data2}  填写单数据 labelList
- */
-function getPushList(data1,data2){     //推送数据
-    let tmpArr1 = [];
-    let tmpArr2 = [];
-    let totalTmpArr = [];
-    const now = dateParser(new Date());
-    data1.length>0 && data1.map((items)=>{    //excel导入的数据拼接
-        items.lisExcelRes.map((item)=>{
-            item.lisExcelItem.map((part)=>{
-                let tmpObj = {};
-                tmpObj.name = part.mealName || '';//套餐名
-                tmpObj.detailName = part.itemName || '';//化验项名
-                tmpObj.uniqueName = part.uniqueName || '';//公表名称
-                tmpObj.source = '1';//数据来源
-                tmpObj.maxValue = part.max || ''; 
-                tmpObj.minValue = part.min || '';
-                tmpObj.time = part.time ||now;
-                tmpObj.units = part.unit || '';//单位
-                tmpObj.value = (part.value-0) === (part.value-0) ? part.value:'';//值
-                tmpObj.otherValue = (part.value-0) === (part.value-0) ?'':part.value; //阴性阳性
-                tmpArr1.push(tmpObj);
-            })
-        })
-    })
-    data2.length>0 && data2.map((item)=>{        //填写单数据拼接
-      item.details && item.details.map((val)=>{
-            if(val.value != undefined && val.value != ''){
-                let tmpObj = {};
-                tmpObj.name = item.name || '';
-                tmpObj.detailName = val.name || '';
-                tmpObj.uniqueName = val.uniqueName || '';//公表名称
-                tmpObj.source = '0';     //数据来源
-                tmpObj.maxValue = val.maxValue ? val.maxValue : '';
-                tmpObj.minValue = val.minValue ? val.minValue : '';
-                tmpObj.time = val.time || now;
-                tmpObj.units = val.labelSuffix || '';
-                tmpObj.value = (val.value-0) === (val.value-0) ? val.value:'';
-                tmpObj.otherValue = (val.value-0) === (val.value-0) ?'':val.value;
-                tmpArr2.push(tmpObj);
-            }
-        })
-    })
-    totalTmpArr = tmpArr1.concat(tmpArr2);
-    return totalTmpArr;
-}
-function getPushLists(data1,data2){     //推送数据
-    let tmpArr1 = [];
-    let tmpArr2 = [];
-    let totalTmpArr = [];
-    data1.length>0 && data1.map((items)=>{    //excel导入的数据拼接
-        items.lisExcelRes.map((item)=>{
-            item.lisExcelItem.map((part)=>{
-                let tmpObj = {};
-                tmpObj.name = part.mealName || '';//套餐名
-                tmpObj.detailName = part.itemName || '';//化验项名
-                tmpObj.uniqueName = part.uniqueName || '';//公表名称
-                tmpObj.source = '1';//数据来源
-                tmpObj.maxValue = part.max || ''; 
-                tmpObj.minValue = part.min || '';
-                tmpObj.units = part.unit || '';//单位
-                tmpObj.value = (part.value-0) === (part.value-0) ? part.value:'';//值
-                tmpObj.otherValue = (part.value-0) === (part.value-0) ?'':part.value; //阴性阳性
-                tmpArr1.push(tmpObj);
-            })
-        })
-    })
-    data2.length>0 && data2.map((item)=>{        //填写单数据拼接
-      if(item.show){
-          item.details.map((val)=>{
-            if(val.value != undefined && val.value != ''){
-                let tmpObj = {};
-                tmpObj.name = item.name || '';
-                tmpObj.detailName = val.name || '';
-                tmpObj.uniqueName = val.uniqueName || '';//公表名称
-                tmpObj.source = '0';     //数据来源
-                tmpObj.maxValue = val.maxValue ? val.maxValue : '';
-                tmpObj.minValue = val.minValue ? val.minValue : '';
-                tmpObj.units = val.labelSuffix || '';
-                tmpObj.value = (val.value-0) === (val.value-0) ? val.value:'';
-                tmpObj.otherValue = (val.value-0) === (val.value-0) ?'':val.value;
-                tmpArr2.push(tmpObj);
-            }
-        })
-      }else{
-        let tmpObj = {};
-        tmpObj.name = item.name;
-        tmpArr2.push(tmpObj);
-      }
-    })
-    totalTmpArr = tmpArr1.concat(tmpArr2);
-    return totalTmpArr;
-}
-

src/store/reducers/wrapModalBody.js

@@ -0,0 +1,222 @@
+import {
+  SEARCH_HOSPITAL_INSPECT,
+  SEARCH_HOSPITAL_INSPECT_SON,
+  SET_ALLCHECK_INS,
+  SELECT_ONNY_CHECK,
+  SELECT_WARING,
+  SHOW_IN_ICSS_INS
+} from '../types/wrapModalBody';
+import store from '@store';
+import { getStringPlus,  getPushLists,  getPushList} from '@utils/tools.js';
+
+const initWrapModal = {
+  list: [], //搜索的结果
+
+  getExcelData: {}, //导入的数据
+
+  hospitalInspect:[],//医院检索到的
+
+  hospitalInspectObj:{},//组对应的明细（单选多选全选）
+  selectGroupList:[],//选的组的明细可能有多个组
+  allCheck:false,//全选反选
+  checkedList:[],//选中的小项
+}
+
+export default (state = initWrapModal, action) => {
+  if (action.type == SHOW_IN_ICSS_INS) {
+      let allState = store.getState().inspect
+      const newState = Object.assign({}, state);
+      let tmpGroup = JSON.parse(JSON.stringify(newState.selectGroupList))
+      let tmpArr = JSON.parse(JSON.stringify(allState.getExcelDataList));
+      let tmpArr2 = allState.labelList;
+      let excelDataLis = {
+        lisExcelRes:[],
+        messages:[]
+      }
+      for(let i = 0;i < tmpGroup.length;i++){
+        let tmpObj = {//excelDataLis.lisExcelRes[0]
+          menus:'',
+          lisExcelItem:[]
+        }
+        for(let k = 0;k < tmpGroup[i].lisExcelWrapper.length;k++){
+          tmpGroup[i].lisExcelWrapper[k].time = tmpGroup[i].Rtime
+        }
+        tmpObj.menus = tmpGroup[i].groupName
+        tmpObj.lisExcelItem = tmpGroup[i].lisExcelWrapper
+        excelDataLis.lisExcelRes.push(tmpObj)
+      }
+      newState.getExcelData = excelDataLis
+      tmpArr.push(excelDataLis)
+
+      newState.hospitalInspect = [] //医院检索到的
+      newState.hospitalInspectObj = {} //组对应的明细（单选多选全选）
+      newState.selectGroupList = [] //选的组的明细可能有多个组
+      newState.allCheck = false //全选反选
+      newState.checkedList = [] //选中的小项
+      allState.getExcelDataList = [...tmpArr]
+      allState.pushItem = getPushList(tmpArr,tmpArr2);
+      allState.pushItems = getPushLists(tmpArr,tmpArr2);
+      allState.inspectStrPlus = getStringPlus(getPushLists(tmpArr,tmpArr2))
+
+      return newState;
+  }
+  if (action.type == SELECT_WARING) {
+      const newState = Object.assign({}, state);
+      let listWrap = JSON.parse(JSON.stringify(newState.hospitalInspectObj))
+      let tmpGroup = JSON.parse(JSON.stringify(newState.selectGroupList))
+      let tmpCheckedLis = JSON.parse(JSON.stringify(newState.checkedList))
+      let warArr = [],checked = [],numS=0
+      for(let m =0;m < listWrap.lisExcelWrapper.length;m++){
+        for(let n = 0;n < tmpCheckedLis.length;n++){
+          if(listWrap.lisExcelWrapper[m].type == 0 && listWrap.lisExcelWrapper[m].itemName == tmpCheckedLis[n]){
+            warArr.push(listWrap.lisExcelWrapper[m])
+            checked.push(listWrap.lisExcelWrapper[m].itemName)
+          }
+        }
+        if(listWrap.lisExcelWrapper[m].type != 0){
+          warArr.push(listWrap.lisExcelWrapper[m])
+          checked.push(listWrap.lisExcelWrapper[m].itemName)
+        }
+      }
+      for(let i = 0;i < tmpGroup.length;i++){
+        if(tmpGroup[i].groupName == listWrap.groupName){//右侧有选中相同组的明细
+          tmpGroup[i].lisExcelWrapper = warArr
+        }else{//右侧没有选中相同组的明细
+          ++numS
+        }
+      }
+      if(numS == tmpGroup.length){//直接添加到右侧
+        listWrap.lisExcelWrapper = warArr
+        tmpGroup.push(listWrap)
+      }
+      if(checked.length == listWrap.lisExcelWrapper.length){
+        newState.allCheck = true;            
+      }else{
+        newState.allCheck = false;
+      }
+      newState.selectGroupList = [...tmpGroup]//右侧已选中的项目
+      newState.checkedList = [...checked]
+      return newState;
+  }
+  if (action.type == SELECT_ONNY_CHECK) {
+      const newState = Object.assign({}, state);
+      let listWrap = JSON.parse(JSON.stringify(newState.hospitalInspectObj))
+      let tmpLen = listWrap.lisExcelWrapper.length;
+      let tmpGroup = JSON.parse(JSON.stringify(newState.selectGroupList))
+      let tmpCheckedLis = JSON.parse(JSON.stringify(newState.checkedList))
+      let numS = 0;
+      if (tmpCheckedLis.indexOf(action.name) == -1) {//添加选中
+        let tempArr = newState.checkedList;
+        tempArr.push(action.name);
+        newState.checkedList = [...tempArr]
+        for(let m = 0;m < tmpGroup.length;m++){
+          if(tmpGroup[m].groupName == action.groupName){//右侧有选中相同组的明细
+            tmpGroup[m].lisExcelWrapper.push(action.item)
+          }else{
+            ++numS
+          }
+        }
+        if(numS == tmpGroup.length){//直接添加到右侧
+          listWrap.lisExcelWrapper = []
+          listWrap.lisExcelWrapper.push(action.item)
+          tmpGroup.push(listWrap)
+        }
+        newState.selectGroupList = [...tmpGroup]//右侧已选中的项目
+        if(tempArr.length == tmpLen){
+          newState.allCheck = true;            
+        }else{
+          newState.allCheck = false;
+        }
+      } else {//去除选中
+        let tempArr = newState.checkedList;
+        tempArr.splice(tempArr.findIndex(item => item === action.name), 1)
+        newState.checkedList = [...tempArr]
+        for(let i = 0;i < tmpGroup.length;i++){
+          if(tmpGroup[i].groupName == action.groupName){//右侧肯定有相同组的
+            let tmpArr = []
+            for(let k = 0;k < tmpGroup[i].lisExcelWrapper.length;k++){
+              if(action.name != tmpGroup[i].lisExcelWrapper[k].itemName){
+                tmpArr.push(tmpGroup[i].lisExcelWrapper[k])
+              }
+            }
+            if(tmpArr.length == 0){
+              tmpGroup.splice(i,1)
+            }else{
+              tmpGroup[i].lisExcelWrapper = [...tmpArr]
+            }
+          }
+        }
+        newState.selectGroupList = tmpGroup//右侧已选中的项目
+        if(tempArr.length == listWrap.lisExcelWrapper.length){
+          newState.allCheck = true;            
+        }else{
+          newState.allCheck = false;
+        }
+      }
+      return newState;
+  }
+  if (action.type == SET_ALLCHECK_INS) {
+      const newState = Object.assign({}, state);
+      let flg = newState.allCheck
+      let listWrap = newState.hospitalInspectObj
+      let tmpGroup = newState.selectGroupList
+      let tmpCheckedLis = []
+      newState.allCheck = !flg
+      if(!flg){//全选
+        let numFst=0
+        for(let i = 0;i < tmpGroup.length;i++){
+          if(listWrap.groupName == tmpGroup[i].groupName){
+            ++numFst
+            tmpGroup[i].lisExcelWrapper = listWrap.lisExcelWrapper
+          }
+        }
+        for(let m =0;m < listWrap.lisExcelWrapper.length;m++){
+          tmpCheckedLis.push(listWrap.lisExcelWrapper[m].itemName)
+        }
+        if(numFst==0){
+          tmpGroup.push(listWrap)
+        }
+        newState.checkedList=[...tmpCheckedLis]
+        newState.selectGroupList = [...tmpGroup]
+      }else{//反选
+        for(let j = 0;j < tmpGroup.length;j++){
+          if(listWrap.groupName == tmpGroup[j].groupName){
+            tmpGroup.splice(j,1)
+          }
+        }
+        newState.checkedList=[]
+        newState.selectGroupList = [...tmpGroup]
+      }
+      return newState;
+  }
+  if (action.type == SEARCH_HOSPITAL_INSPECT) {
+      const newState = Object.assign({}, state);
+      newState.hospitalInspect = action.list
+      newState.allCheck = false
+      newState.hospitalInspectObj={}
+      return newState;
+  }
+  if (action.type == SEARCH_HOSPITAL_INSPECT_SON) {
+      const newState = Object.assign({}, state);
+      let tmpArr = action.list
+      let tmpSelect = newState.selectGroupList
+      let tmpSelectSon = []
+      for(let i = 0;i < tmpSelect.length;i++){
+        if(tmpSelect[i].groupName == action.name){
+          for(let k = 0;k < tmpSelect[i].lisExcelWrapper.length;k++){
+            tmpSelectSon.push(tmpSelect[i].lisExcelWrapper[k].itemName)
+          }
+        }
+      }
+      newState.checkedList = [...tmpSelectSon]
+      if(tmpSelectSon.length == tmpArr.lisExcelWrapper.length){
+        newState.allCheck = true;            
+      }else{
+        newState.allCheck = false;
+      }
+      tmpArr.Rtime = action.time
+      newState.hospitalInspectObj = tmpArr
+      return newState;
+  }
+  return state;
+}

src/store/reducers/wrapModalBodyPac.js

@@ -0,0 +1,188 @@
+import {
+  SEARCH_HOSPITAL_PAC,
+  SEARCH_HOSPITAL_PAC_SON,
+  SET_ALLCHECKS,
+  SELECT_ONE_CHECKS,
+  SHOW_IN_ICSSS
+} from '../types/wrapModalBodyPac';
+import {getAllString} from '@utils/tools.js';
+import store from '@store';
+
+const initSearchList = {
+  list: [], //点击的结果
+  assistLabel: [], //搜索的结果
+  dataString: '', //结果拼接
+  assistVal: '',
+
+  checkedListImport: [], //辅检导入
+  hospitalPac: [], //医院检索到的
+  hospitalPacObj: {}, //组对应的明细（单选多选全选）
+  selectGroupList: [], //选的组的明细可能有多个组
+  allCheck: false, //全选反选
+  checkedList: [], //选中的小项
+  allCheckLis:[],//所有导入数据
+  msgObj:{
+    name:'',
+    patientNum:''
+  }
+}
+
+export default (state = initSearchList, action) => {
+  if (action.type == SHOW_IN_ICSSS) {
+    let allState = store.getState().assistCheck;
+    const newState = Object.assign({}, state);
+    let tmpGroup = JSON.parse(JSON.stringify(newState.selectGroupList))
+    let tmpListImport = JSON.parse(JSON.stringify(allState.checkedListImport))
+    let tempArrs = JSON.parse(JSON.stringify(allState.assistLabel)),importLis=[];
+    for (let i = 0; i < tmpGroup.length; i++) {
+      for (let k = 0; k < tmpGroup[i].pacsResultDTO.length; k++) {
+        let tmpObj = {}
+        tmpObj.time = tmpGroup[i].Rtime
+        tmpObj.disabled = true
+        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)
+
+    allState.checkedListImport = [...tmpListImport]
+    allState.allCheckLis = [...tempArrs]
+    allState.dataString = getAllString(tmpListImport,allState.assistLabel)
+
+    newState.hospitalPac = [] //医院检索到的
+    newState.hospitalPacObj = {} //组对应的明细（单选多选全选）
+    newState.selectGroupList = [] //选的组的明细可能有多个组
+    newState.allCheck = false //全选反选
+    newState.checkedList = [] //选中的小项
+    newState.msgObj={name:'',patientNum:''}
+
+    return newState;
+  }
+  if (action.type == SELECT_ONE_CHECKS) {
+    const newState = Object.assign({}, state);
+    let listWrap = JSON.parse(JSON.stringify(newState.hospitalPacObj))
+    let tmpGroup = JSON.parse(JSON.stringify(newState.selectGroupList))
+    let tmpLen = listWrap.pacsResultDTO.length;
+    let tmpCheckedLis = JSON.parse(JSON.stringify(newState.checkedList))
+    let numS = 0;
+    if (tmpCheckedLis.indexOf(action.name) == -1) { //添加选中
+      let tempArr = newState.checkedList;
+      tempArr.push(action.name);
+      newState.checkedList = [...tempArr]
+
+      for (let m = 0; m < tmpGroup.length; m++) {
+        if (tmpGroup[m].checkItem == action.checkItem) { //右侧有选中相同组的明细
+          tmpGroup[m].pacsResultDTO.push(action.item)
+        } else {
+          ++numS
+        }
+      }
+      if (numS == tmpGroup.length) { //直接添加到右侧
+        listWrap.pacsResultDTO = []
+        listWrap.pacsResultDTO.push(action.item)
+        tmpGroup.push(listWrap)
+      }
+
+      newState.selectGroupList = [...tmpGroup] //右侧已选中的项目
+      if (tempArr.length == tmpLen) {
+        newState.allCheck = true;
+      } else {
+        newState.allCheck = false;
+      }
+    } else { //去除选中
+      let tempArr = newState.checkedList;
+      tempArr.splice(tempArr.findIndex(item => item === action.name), 1)
+      newState.checkedList = [...tempArr]
+      for (let i = 0; i < tmpGroup.length; i++) {
+        if (tmpGroup[i].checkItem == action.checkItem) { //右侧肯定有相同组的
+          let tmpArr = []
+          for (let k = 0; k < tmpGroup[i].pacsResultDTO.length; k++) {
+            if (action.name != tmpGroup[i].pacsResultDTO[k].checkItem) {
+              tmpArr.push(tmpGroup[i].pacsResultDTO[k])
+            }
+          }
+          if(tmpArr.length == 0){
+            tmpGroup.splice(i,1)
+          }else{
+            tmpGroup[i].pacsResultDTO = [...tmpArr]
+          }
+        }
+      }
+      newState.selectGroupList = tmpGroup //右侧已选中的项目
+      if (tempArr.length == listWrap.pacsResultDTO.length) {
+        newState.allCheck = true;
+      } else {
+        newState.allCheck = false;
+      }
+    }
+    return newState;
+  }
+  if (action.type == SET_ALLCHECKS) {
+    const newState = Object.assign({}, state);
+    let flg = newState.allCheck
+    let listWrap = newState.hospitalPacObj
+    let tmpGroup = newState.selectGroupList
+    let tmpCheckedLis = []
+    newState.allCheck = !flg
+    if (!flg) { //全选
+      let numFst = 0
+      for (let i = 0; i < tmpGroup.length; i++) {
+        if (listWrap.checkItem == tmpGroup[i].checkItem) {
+          ++numFst
+          tmpGroup[i].pacsResultDTO = listWrap.pacsResultDTO
+        }
+      }
+      for (let m = 0; m < listWrap.pacsResultDTO.length; m++) {
+        tmpCheckedLis.push(listWrap.pacsResultDTO[m].checkItem)
+      }
+      if (numFst == 0) {
+        tmpGroup.push(listWrap)
+      }
+      newState.checkedList = [...tmpCheckedLis]
+      newState.selectGroupList = [...tmpGroup]
+    } else { //反选
+      for (let j = 0; j < tmpGroup.length; j++) {
+        if (listWrap.checkItem == tmpGroup[j].checkItem) {
+          tmpGroup.splice(j, 1)
+        }
+      }
+      newState.checkedList = []
+      newState.selectGroupList = [...tmpGroup]
+    }
+    return newState;
+  }
+  if (action.type == SEARCH_HOSPITAL_PAC_SON) {
+    const newState = Object.assign({}, state);
+    let tmpArr = action.list
+    let tmpSelect = newState.selectGroupList
+    let tmpSelectSon = []
+    for (let i = 0; i < tmpSelect.length; i++) {
+      if (tmpSelect[i].checkItem == action.name) {
+        for (let k = 0; k < tmpSelect[i].pacsResultDTO.length; k++) {
+          tmpSelectSon.push(tmpSelect[i].pacsResultDTO[k].checkItem)
+        }
+      }
+    }
+    newState.checkedList = [...tmpSelectSon]
+    if (tmpSelectSon.length == tmpArr.pacsResultDTO.length) {
+      newState.allCheck = true;
+    } else {
+      newState.allCheck = false;
+    }
+    newState.hospitalPacObj = tmpArr
+    return newState;
+  }
+  if (action.type == SEARCH_HOSPITAL_PAC) {
+    const newState = Object.assign({}, state);
+    newState.hospitalPac = action.list
+    newState.msgObj = action.msg
+    newState.allCheck = false
+    newState.hospitalPacObj = {}
+    return newState;
+  }
+  return state;
+}
+

src/store/types/assistCheck.js

@@ -5,8 +5,3 @@ export const CHANGE_ASSIST_VAL = 'CHANGE_ASSIST_VAL';
 export const CHANGE_DATE = 'CHANGE_DATE';
 export const CLEAR_ASSIST_DATA = 'CLEAR_ASSIST_DATA';
 export const ADD_ASSIST_LABEL = 'ADD_ASSIST_LABEL';
-export const SEARCH_HOSPITAL_PAC = 'SEARCH_HOSPITAL_PAC';
-export const SEARCH_HOSPITAL_PAC_SON = 'SEARCH_HOSPITAL_PAC_SON';
-export const SET_ALLCHECKS= 'SET_ALLCHECKS';
-export const SELECT_ONE_CHECKS= 'SELECT_ONE_CHECKS';
-export const SHOW_IN_ICSSS= 'SHOW_IN_ICSSS';

src/store/types/inspect.js

@@ -11,9 +11,3 @@ export const CLEAR_ALL_LABEL = 'CLEAR_ALL_LABEL';
 export const DEL_PART_ITEM = 'DEL_PART_ITEM';
 export const DEL_EXCEL_LIST = 'DEL_EXCEL_LIST';
 export const ADD_LABEL = 'ADD_LABEL';
-export const SEARCH_HOSPITAL_INSPECT = 'SEARCH_HOSPITAL_INSPECT';
-export const SEARCH_HOSPITAL_INSPECT_SON = 'SEARCH_HOSPITAL_INSPECT_SON';
-export const SET_ALLCHECK = 'SET_ALLCHECK';
-export const SELECT_ONE_CHECK = 'SELECT_ONE_CHECK';
-export const SELECT_WARING = 'SELECT_WARING';
-export const SHOW_IN_ICSS = 'SHOW_IN_ICSS';

src/store/types/wrapModalBody.js

@@ -0,0 +1,6 @@
+export const SEARCH_HOSPITAL_INSPECT = 'SEARCH_HOSPITAL_INSPECT';
+export const SEARCH_HOSPITAL_INSPECT_SON = 'SEARCH_HOSPITAL_INSPECT_SON';
+export const SET_ALLCHECK_INS = 'SET_ALLCHECK_INS';
+export const SELECT_ONNY_CHECK = 'SELECT_ONNY_CHECK';
+export const SELECT_WARING = 'SELECT_WARING';
+export const SHOW_IN_ICSS_INS = 'SHOW_IN_ICSS_INS';

src/store/types/wrapModalBodyPac.js

@@ -0,0 +1,6 @@
+
+export const SEARCH_HOSPITAL_PAC = 'SEARCH_HOSPITAL_PAC';
+export const SEARCH_HOSPITAL_PAC_SON = 'SEARCH_HOSPITAL_PAC_SON';
+export const SET_ALLCHECKS= 'SET_ALLCHECKS';
+export const SELECT_ONE_CHECKS= 'SELECT_ONE_CHECKS';
+export const SHOW_IN_ICSSS= 'SHOW_IN_ICSSS';

src/utils/tools.js

@@ -1193,7 +1193,131 @@ function parseNameVal(arr){
   });
   return obj;
 }
+//化验数据处理
+function getStringPlus(dataList){
+  let strPlus = '';
+  dataList && dataList.map((item)=>{
+    if(item.detailName){
+      let strTmp = item.name + ',' + item.detailName + ',' + (item.otherValue ? item.otherValue : (item.value + item.units)) +';'
+      strPlus += strTmp;
+    }else{
+      let strTmp = item.name+';'
+      strPlus += strTmp;
+    }
+  })
+  return strPlus;
+}
+/**
+ * 
+ * @param {data1}  excel导入的数据 getExcelDataList
+ * @param {data2}  填写单数据 labelList
+ */
+function getPushList(data1,data2){     //推送数据
+    let tmpArr1 = [];
+    let tmpArr2 = [];
+    let totalTmpArr = [];
+    const now = dateParser(new Date());
+    data1.length>0 && data1.map((items)=>{    //excel导入的数据拼接
+        items.lisExcelRes.map((item)=>{
+            item.lisExcelItem.map((part)=>{
+                let tmpObj = {};
+                tmpObj.name = part.mealName || '';//套餐名
+                tmpObj.detailName = part.itemName || '';//化验项名
+                tmpObj.uniqueName = part.uniqueName || '';//公表名称
+                tmpObj.source = '1';//数据来源
+                tmpObj.maxValue = part.max || ''; 
+                tmpObj.minValue = part.min || '';
+                tmpObj.time = part.time ||now;
+                tmpObj.units = part.unit || '';//单位
+                tmpObj.value = (part.value-0) === (part.value-0) ? part.value:'';//值
+                tmpObj.otherValue = (part.value-0) === (part.value-0) ?'':part.value; //阴性阳性
+                tmpArr1.push(tmpObj);
+            })
+        })
+    })
+    data2.length>0 && data2.map((item)=>{        //填写单数据拼接
+      item.details && item.details.map((val)=>{
+            if(val.value != undefined && val.value != ''){
+                let tmpObj = {};
+                tmpObj.name = item.name || '';
+                tmpObj.detailName = val.name || '';
+                tmpObj.uniqueName = val.uniqueName || '';//公表名称
+                tmpObj.source = '0';     //数据来源
+                tmpObj.maxValue = val.maxValue ? val.maxValue : '';
+                tmpObj.minValue = val.minValue ? val.minValue : '';
+                tmpObj.time = val.time || now;
+                tmpObj.units = val.labelSuffix || '';
+                tmpObj.value = (val.value-0) === (val.value-0) ? val.value:'';
+                tmpObj.otherValue = (val.value-0) === (val.value-0) ?'':val.value;
+                tmpArr2.push(tmpObj);
+            }
+        })
+    })
+    totalTmpArr = tmpArr1.concat(tmpArr2);
+    return totalTmpArr;
+}
+function getPushLists(data1,data2){     //推送数据
+    let tmpArr1 = [];
+    let tmpArr2 = [];
+    let totalTmpArr = [];
+    data1.length>0 && data1.map((items)=>{    //excel导入的数据拼接
+        items.lisExcelRes.map((item)=>{
+            item.lisExcelItem.map((part)=>{
+                let tmpObj = {};
+                tmpObj.name = part.mealName || '';//套餐名
+                tmpObj.detailName = part.itemName || '';//化验项名
+                tmpObj.uniqueName = part.uniqueName || '';//公表名称
+                tmpObj.source = '1';//数据来源
+                tmpObj.maxValue = part.max || ''; 
+                tmpObj.minValue = part.min || '';
+                tmpObj.units = part.unit || '';//单位
+                tmpObj.value = (part.value-0) === (part.value-0) ? part.value:'';//值
+                tmpObj.otherValue = (part.value-0) === (part.value-0) ?'':part.value; //阴性阳性
+                tmpArr1.push(tmpObj);
+            })
+        })
+    })
+    data2.length>0 && data2.map((item)=>{        //填写单数据拼接
+      if(item.show){
+          item.details.map((val)=>{
+            if(val.value != undefined && val.value != ''){
+                let tmpObj = {};
+                tmpObj.name = item.name || '';
+                tmpObj.detailName = val.name || '';
+                tmpObj.uniqueName = val.uniqueName || '';//公表名称
+                tmpObj.source = '0';     //数据来源
+                tmpObj.maxValue = val.maxValue ? val.maxValue : '';
+                tmpObj.minValue = val.minValue ? val.minValue : '';
+                tmpObj.units = val.labelSuffix || '';
+                tmpObj.value = (val.value-0) === (val.value-0) ? val.value:'';
+                tmpObj.otherValue = (val.value-0) === (val.value-0) ?'':val.value;
+                tmpArr2.push(tmpObj);
+            }
+        })
+      }else{
+        let tmpObj = {};
+        tmpObj.name = item.name;
+        tmpArr2.push(tmpObj);
+      }
+    })
+    totalTmpArr = tmpArr1.concat(tmpArr2);
+    return totalTmpArr;
+}
 
+function getAllString(checkedListImport,assistLabel){
+  let tmpImportLis = [],tmpString='';
+  for(let i = 0;i < checkedListImport.length;i++){
+    for(let j = 0;j < checkedListImport[i].length;j++){
+      tmpImportLis.push(checkedListImport[i][j])
+    }
+  }
+  let tempArr = tmpImportLis.concat(assistLabel)
+  for (let i = 0; i < tempArr.length; i++) {
+    let tmpVal = tempArr[i].value ? tempArr[i].value.trim() : tempArr[i].value;
+    tmpString += (tempArr[i].name + (tmpVal ? (':' + tmpVal) + ', ' : ': ') + (tempArr[i].time ? '报告日期:' + tempArr[i].time : '') + ';')
+  }
+  return tmpString;
+}
 module.exports = {
     checkType: Type.checkType,
     getIds,
@@ -1241,5 +1365,9 @@ module.exports = {
     getCalendarDate,
     downloadExportedData,
     getStatusImg,
-    parseNameVal
+    parseNameVal,
+    getStringPlus,
+    getPushLists,
+    getPushList,
+    getAllString
 };