morphone1995 4 years atrás
parent
commit
6c7cbb0811

+ 0 - 1
src/components/BodyContainer/index.jsx

@@ -6,7 +6,6 @@ import PushContainer from '../PushContainer';
 import style from './index.less';
 
 const BodyContainer = (props) =>{
-  console.log(props,'===');
   const { saveDateAll,mode } = props;
   return <div className={style['container'] + ' clearfix'}>
       <BlockEMRCont />

+ 2 - 1
src/components/HistoryCaseContainer/HistoryList/index.jsx

@@ -18,6 +18,7 @@ import {showHistory} from "@store/actions/historyTemplates";
 import { SET_READ_MODE } from "@store/types/typeConfig";
 import {billing} from '@store/async-actions/pushMessage';
 import { getHistempDetail, asyncUpdateByIdUsNames, asyncCancelTemplateInfos} from '@store/async-actions/historyTemplates';
+import { embedPush } from '../../../store/async-actions/pushMessage'
 import edit from '../../../common/images/icon_edit_default@2x.png';
 import editHover from '../../../common/images/icon_edit_hover@2x.png';
 import del from '../../../common/images/icon_del_default@2x.png';
@@ -228,7 +229,7 @@ class HistoryCaseContainer extends React.Component {
       this.setState({
         visible:true,
         activeId:idx,
-        // activeHis:val,
+        activeHis:val,
         // dataStr: JSON.parse(val.preview) || [],
       })
       document.body.scrollTop = document.documentElement.scrollTop = 0

+ 12 - 2
src/components/Operation/index.jsx

@@ -13,7 +13,8 @@ import FolderName from '@components/FolderName';
 import FolderOrder from '@components/FolderOrder';
 import check_circle from './img/check-circle.png';
 import check_right from './img/check-right.png';
-import {getAllDataList,getAllDataStringList,isAllPartClear,isAllClear,filterDataArr,readyKeepHistory,checkDeptContent} from '@utils/tools';
+import { getAllDataList, getAllDataStringList, isAllPartClear, isAllClear, filterDataArr, readyKeepHistory, checkDeptContent } from '@utils/tools';
+import { embedPush } from '../../store/async-actions/pushMessage'
 import pinyin from '@utils/Convert_Pinyin.js';
 import { saveMessage } from  '@store/async-actions/print'
 import {dragBox} from '@utils/drag';
@@ -86,12 +87,21 @@ class Operation extends Component {
     // clearmedicalName && clearmedicalName()
     // diagShowTmp(false)
     // this.setState({ title: '' })
-   
+    // store.dispatch(embedPush({
+    //   action: "patientia",
+    //   mode: 1
+    // }))
     store.dispatch(saveMessage()).then(res => {
       this.setState({
         medicalName: '',
         saveVisible: false,
       })
+      store.dispatch(embedPush({
+        action: "patientia",
+        mode: 1
+      }))
+      // console.log('保存成功之后推送');
+    
     }).catch(err => {
       if (err === '00020001'){
 

+ 8 - 7
src/store/async-actions/historyTemplates.js

@@ -7,6 +7,7 @@ import {
 } from '@utils/tools';
 import { initHistory } from '@store/actions/historyTemplates';
 import { HISTORY_GETHOSPITALINFO } from '@store/types/historyTemplates';
+import { embedPush } from '@store/async-actions/pushMessage';
 import Notify from '@commonComp/Notify';
 import store from '@store';
 import { billing, getMRAnalyse} from '@store/async-actions/pushMessage';
@@ -36,14 +37,14 @@ export const getHistempDetail = (item) => {
             const data =res.data;
             if(data.code == 0){
                 let tmpData = data.data
-                // console.log(tmpData, 'tmpData');
-                // pushAllDataList(item.sign,'push',tmpData,'history')       //引用
                 pushHistoryDataList(tmpData);       //引用
-                // if(didPushParamChange()) {
-                //   dispatch(billing());
-                // }
-                // dispatch(getMRAnalyse())
-                
+                // 引用成功后默认推送
+                store.dispatch(
+                  embedPush({
+                    action: 'patientia',
+                    mode: 1,
+                  })
+                );
                 
             }else{
                 Notify.error(data.msg);