清除的时候清除保存的回访时间和不良反应

src/store/actions/treat.js

@@ -11,7 +11,21 @@ export const hideTreat = (state, action) => {
     return res
 }
 
+//关闭弹窗时清除部分治疗方案
 export const clearTreat = (state, action) => {
+    const res = Object.assign({}, state);
+    res.generalTreat = '';
+    res.surgeryTreat = '';
+    res.drugHistory = {};
+    res.treatment = [];
+    res.adversReactionList=[];
+    res.hasFollowUp = false;
+    res.followUp = '';
+    return res
+}
+
+//清除全部治疗方案
+export const clearAllTreat = (state, action) => {
     const res = Object.assign({}, state);
     res.generalTreat = '';
     res.surgeryTreat = '';
@@ -21,9 +35,12 @@ export const clearTreat = (state, action) => {
     res.hasFollowUp = false;
     res.followUp = '';
     res.followUpList = [];
+    res.adversReactionList = [];
+    res.allAdversReactionList = [];
     return res
 }
 
+
 export const setTreatment = (state, action) => {
     const res = Object.assign({}, state);
     res.treatment = action.treatment;

src/store/async-actions/treat.js

@@ -390,7 +390,6 @@ export const commonTreatAddToAdvice = () => {
                 type: SET_COMMONTREATMENT,
                 commontreatment: state.treat.treatItem.treat.commonTreatment.text
             })
-            console.log('state.treat.followUp', state.treat.followUp)
             dispatch({
                 type: SAVE_FOLLOW_UP,
                 followUp: state.treat.followUp

src/store/reducers/treat.js

@@ -1,5 +1,12 @@
-import { SELECT_DRUG, SET_TREAT_INFO, SET_OTHER_DRUG, SET_DRUG_INFO, CLEAR_DRUG_INFO,SHOW_TREAT, HIDE_TREAT, CLEAR_TREAT, SHOW_DRUG_INFO, HIDE_DRUG_INFO, SET_GENERAL_TREAT, SET_TREATMENT, SET_SURGERY_TREAT, SET_RECOMMEND_BASIC, SET_DRUG_INFO_LIST,IS_FIRST_MAIN_DIAG,CLEAR_FIRST_MAIN_DIAG ,SET_ADVERSE_REACTIONS, SET_ALL_ADVERSE_REACTIONS,CHANGE_REACT, DEL_REACT, SET_FOLLOW_UP, DEL_FOLLOW_UP, SET_ALL_FOLLOW_UP } from '../types/treat'
-import { selectDrug, setTreatInfo, setOtherDrug, setDrugInfo, clearDrugInfo, showTreat, hideTreat, clearTreat, showDrugInfo, hideDrugInfo, setTreatment, setGeneralTreat, setSurgeryTreat, setRecommendBasic, setDrugInfoList, isFirstMainDiag, clearFirstMainDiag, setAdverseReactions, setALLAdverseReactions, changeReact ,delReact, setFollwUp, delFollowUp, setAllFollowUp } from '../actions/treat'
+import { SELECT_DRUG, SET_TREAT_INFO, SET_OTHER_DRUG, SET_DRUG_INFO, CLEAR_DRUG_INFO,SHOW_TREAT, 
+        HIDE_TREAT, CLEAR_TREAT, SHOW_DRUG_INFO, HIDE_DRUG_INFO, SET_GENERAL_TREAT, SET_TREATMENT, 
+        SET_SURGERY_TREAT, SET_RECOMMEND_BASIC, SET_DRUG_INFO_LIST,IS_FIRST_MAIN_DIAG,CLEAR_FIRST_MAIN_DIAG ,
+        SET_ADVERSE_REACTIONS, SET_ALL_ADVERSE_REACTIONS,CHANGE_REACT, DEL_REACT, SET_FOLLOW_UP, 
+        DEL_FOLLOW_UP, SET_ALL_FOLLOW_UP, CLEAR_ALL_TREAT } from '../types/treat'
+import { selectDrug, setTreatInfo, setOtherDrug, setDrugInfo, clearDrugInfo, showTreat, hideTreat, 
+        clearTreat, showDrugInfo, hideDrugInfo, setTreatment, setGeneralTreat, setSurgeryTreat, 
+        setRecommendBasic, setDrugInfoList, isFirstMainDiag, clearFirstMainDiag, setAdverseReactions, 
+        setALLAdverseReactions, changeReact ,delReact, setFollwUp, delFollowUp, setAllFollowUp, clearAllTreat } from '../actions/treat'
 const initState = {
     show: false, //治疗方案显示隐藏
     showDrugInfo: false, //药品信息显示隐藏
@@ -319,6 +326,8 @@ export default function(state=initState, action){
             return delFollowUp(state, action);
         case SET_ALL_FOLLOW_UP: 
             return setAllFollowUp(state, action);
+        case CLEAR_ALL_TREAT: 
+            return clearAllTreat(state, action);
         default:
             return state
     }

src/store/types/treat.js

@@ -4,7 +4,8 @@ export const SET_DRUG_INFO = 'SET_DRUG_INFO'; //设置药品说明
 export const CLEAR_DRUG_INFO = 'CLEAR_DRUG_INFO'; //清除药品说明
 export const SHOW_TREAT = 'SHOW_TREAT';
 export const HIDE_TREAT = 'HIDE_TREAT';
-export const CLEAR_TREAT = 'CLEAR_TREAT'; //清除治疗方案内容
+export const CLEAR_TREAT = 'CLEAR_TREAT'; //关闭时清除推送过来治疗方案内容
+export const CLEAR_ALL_TREAT = 'CLEAR_ALL_TREAT'; //关闭时清除推送过来治疗方案内容
 export const SHOW_DRUG_INFO = 'SHOW_DRUG_INFO';
 export const HIDE_DRUG_INFO = 'HIDE_DRUG_INFO';
 export const SET_GENERAL_TREAT = 'SET_GENERAL_TREAT'; //设置一般治疗

src/utils/tools.js

@@ -8,7 +8,7 @@ import {clearAllLabel,addLabel} from '@store/actions/inspect';
 import {CLEAR_ALL_DIAG} from '@store/types/diagnosticList';
 import {CLEAR_ALL_PUSH_MESSAGE, SET_TIPS} from '@store/types/pushMessage';
 import {ISREAD, SETREADDITEMS} from "../store/types/homePage";
-import {CLEAR_FIRST_MAIN_DIAG} from "../store/types/treat";
+import {CLEAR_FIRST_MAIN_DIAG, CLEAR_ALL_TREAT} from "../store/types/treat";
 import {tabChange} from '@store/actions/tabTemplate';
 import config from '@config/index.js';
 
@@ -269,6 +269,9 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
           type:CLEAR_FIRST_MAIN_DIAG,
           flag:true
         });
+        store.dispatch({
+          type: CLEAR_ALL_TREAT,
+        })
         storageLocal.remove('emrParam');
        // Notify.success('页面已清空')
     }else{