参数修改

src/components/AddNewInspect/SlidePic/index.jsx

@@ -141,8 +141,8 @@ class SlidePic extends Component {
   }
   checkOnOff(item){
     const {checkOnOff,handlePush} = this.props
-    handlePush && handlePush({mode:8});       //右侧推送
     checkOnOff(item)
+    handlePush && handlePush({mode:8});       //右侧推送
   }
   render() {
     const {item,time} = this.props;

src/store/actions/newAdvice.js

@@ -1,4 +1,4 @@
-import {SET_CONTEXT,CHECK_OFF_ON,DEL_ONE_PIC,ADD_LABEL,SEARCH_LIST,SET_LABEL,SET_TIP,FILL_ACTIVE,FILL_ACTIVE_DETAIL,GET_EXCEL,CHECK_VALUE_IS_CHANGE,CLEAR_LABEL,RESET_LABEL_NEW,CLEAR_ALL_LABEL,DEL_PART_ITEM_NEW,DEL_EXCEL_LIST,SEARCH_TYPE_NEW} from '../types/newAdvice';
+import {SET_CONTEXT,CHECK_OFF_ON_NEW,DEL_ONE_PIC,ADD_LABEL,SEARCH_LIST,SET_LABEL,SET_TIP,FILL_ACTIVE,FILL_ACTIVE_DETAIL,GET_EXCEL,CHECK_VALUE_IS_CHANGE,CLEAR_LABEL,RESET_LABEL_NEW,CLEAR_ALL_LABEL,DEL_PART_ITEM_NEW,DEL_EXCEL_LIST,SEARCH_TYPE_NEW} from '../types/newAdvice';
 
 export const setLabel = (idx,sign) => ({          //搜索后点击选中的结果
     type:SET_LABEL,
@@ -78,6 +78,6 @@ export const delOnePic = (item) => ({
     item
 })
 export const checkOffOn = (item) => ({
-    type:CHECK_OFF_ON,
+    type:CHECK_OFF_ON_NEW,
     item
 })

src/store/reducers/newAdvice.js

@@ -14,7 +14,7 @@ import {
   SET_TIP,
   DEL_ONE_PIC,
   SEARCH_TYPE_NEW,
-  CHECK_OFF_ON,
+  CHECK_OFF_ON_NEW,
   RENEWADVICEDATA,
   CLEARNEWADVICEDATA,
 } from '../types/newAdvice';
@@ -43,7 +43,7 @@ const initSearchList = {
 }
 
 export default (state = initSearchList, action) => {
-    if (action.type == CHECK_OFF_ON) {
+    if (action.type == CHECK_OFF_ON_NEW) {
         const newState = Object.assign({}, state);
         let tempArr = newState.labelListBig;
         let tempArrs = newState.labelListSmall;
@@ -68,6 +68,7 @@ export default (state = initSearchList, action) => {
         tempBigOrder = tempArr.filter((item)=>item.check)
         tempSmallOrder = tempArrs.filter((item)=>item.check)
         newState.drugOrder=[...tempBigOrder]
+        console.log(newState.drugOrder,77777,tempBigOrder,1111)
         newState.operationOrder=[...tempSmallOrder]
         return newState;
     }

src/store/types/newAdvice.js

@@ -15,7 +15,7 @@ export const SET_CONTEXT = 'SET_CONTEXT';
 export const SET_TIP = 'SET_TIP';
 export const SEARCH_TYPE_NEW = 'SEARCH_TYPE_NEW';
 export const DEL_ONE_PIC = 'DEL_ONE_PIC';
-export const CHECK_OFF_ON = 'CHECK_OFF_ON';
+export const CHECK_OFF_ON_NEW = 'CHECK_OFF_ON_NEW';
 
 
 export const RENEWADVICEDATA = 'RENEWADVICEDATA';

src/utils/tools.js

@@ -902,11 +902,11 @@ function handleEnter(event){
 // };
 function getEMRParams(){
   const state = store.getState();
-  // console.log(state,676766767)
   const {id} =  state.historyTemplates && state.historyTemplates.HospitalInfo 
   const {message} = state.patInfo;
   const {mainSuit,currentIll,otherHistory,checkBody,newAdvice,inspect,assistCheck,diagnosticList} = state;
   const diag = [];
+  console.log(state,7777777)
   for(let i = 0; i < diagnosticList.diagnosticList.length; i++) {
     diag.push({"dateValue": "","name": "","uniqueName": diagnosticList.diagnosticList[i].name})
   }