医嘱的回访时间放在医嘱字段中

src/components/Advice/index.jsx

@@ -93,6 +93,7 @@ class Advice extends Component{
             {/* {advice.commontreatment && <div className={style['treat-input']}  onInput={this.handleComTreatInput}  contentEditable={true} style = {{outline: 'none'}}></div>} */}
             {<Textarea value={advice.commontreatment} isRead={isRead} handleChangeAssistValue={this.handleComTreatInput} ></Textarea>}
         </div>}
+        {console.log('followUp',followUp)}
         {!isFirstMainDiag && <FollowUp  noTitle="true"   setFollowUp={setFollowUp} followUp = {followUp} isRead={isRead}></FollowUp>}
         {advice.scheme && advice.scheme.length > 0 &&<div contentEditable='false' className={style['scheme']}>
           {advice.scheme && advice.scheme.length > 0  && <h1>治疗方案</h1>}

src/containers/AdviceContainer.js

@@ -5,12 +5,13 @@ import { SET_CHANGE_ADVICE_TREATMENT, SET_CHANGE_ADVICE_ASSAY, SET_CHANGE_ADVICE
 import { SET_FOLLOW_UP } from '@store/types/treat.js';
 
 function mapStateToProps(state) {
+    console.log('state', state)
     return ({
         pushMessage: state.pushMessage,
         isRead:state.homePage.isRead,
         adviceInput: state.pushMessage.advice.adviceInput,
         isFirstMainDiag:  state.treat.isFirstMainDiag,
-        followUp: state.treat.followUp,
+        followUp: state.pushMessage.advice.followUp,
         hasFollowUp: state.treat.hasFollowUp
     })
 }

src/store/actions/pushMessage.js

@@ -134,7 +134,9 @@ export const addScheme = (state, action) => {
      
   }
 	res.AdviceStr = getAdviceStr(res.advice)
-	res.advice.drugList = getDrugList(res.advice.scheme)
+	if (res.advice.scheme) {
+		res.advice.drugList = getDrugList(res.advice.scheme)
+	}
   return res;
 }
 
@@ -269,4 +271,19 @@ export const setAdviceInput = (state, action) => {
 	res.advice.adviceInput = action.adviceInput;
 	res.AdviceStr = getAdviceStr(res.advice)
 	return res;
+}
+
+//保存回访时间
+export const saveFollowUp = (state, action) => {
+	const res = JSON.parse(JSON.stringify(state));
+	res.advice.followUp = action.followUp;
+	return res;
+}
+
+
+//删除回访时间
+export const delFollowUp = (state, action) => {
+	const res = JSON.parse(JSON.stringify(state));
+	res.advice.follow = '';
+	return res;
 }

src/store/async-actions/treat.js

@@ -5,6 +5,7 @@ import { SET_COMMONTREATMENT } from '@store/types/pushMessage'
 import { SET_DRUG_INFO, SET_TREATMENT, SET_TREAT_INFO, SET_RECOMMEND_BASIC, SET_DRUG_INFO_LIST, IS_FIRST_MAIN_DIAG, SET_ADVERSE_REACTIONS, SET_ALL_ADVERSE_REACTIONS, SET_FOLLOW_UP, DEL_FOLLOW_UP, SET_ALL_FOLLOW_UP } from '@store/types/treat';
 import {storageLocal,getEMRParams} from '@utils/tools';
 import { isAddMainSuit } from '@store/async-actions/diagnosticList';
+import { SAVE_FOLLOW_UP } from "@store/types/pushMessage";
 
 const api={
     push:'/push/pushInner',
@@ -372,6 +373,11 @@ 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
+            })
         } else {
             return
         }

src/store/reducers/pushMessage.js

@@ -1,5 +1,11 @@
-import {CHANGE_ASSAY, CHANGE_CHECK, BILLING_ADVICE, ADD_SCHEME, SET_TIPS,  SET_TIPS_DETAILS, SET_CHANGE_ADVICE_TREATMENT, SET_CHANGE_ADVICE_ASSAY, SET_CHANGE_ADVICE_CHECK, ADD_BILLING,CLEAR_ALL_PUSH_MESSAGE,SHOW_TIPS_DETAILS, HIDE_TIPS_DETAILS, SET_COMMONTREATMENT, IS_FIRST_MAIN_DIAG, SET_ADVICE_INPUT ,SET_CHRONIC_TABLELIST,SHOW_TABLE_LIST,HIDE_TABLE_LIST,SET_SCALE_INFO,SET_CHRONIC_PUSHS,SAVE_TABLE_RESULT} from '../types/pushMessage';
-import {changeAssay, changeCheck, setAdvice, addScheme, setTips, setTipsDetails, setChangeAdviceTreatment, setChangeAdviceAssay, setChangeAdviceCheck, addBilling, clearAllPushMessage, showTipsDetails, hideTipsDetails, setCommontreatment, isFirstMainDiag, setAdviceInput } from '../actions/pushMessage';
+import {CHANGE_ASSAY, CHANGE_CHECK, BILLING_ADVICE, ADD_SCHEME, SET_TIPS,  SET_TIPS_DETAILS, 
+        SET_CHANGE_ADVICE_TREATMENT, SET_CHANGE_ADVICE_ASSAY, SET_CHANGE_ADVICE_CHECK, ADD_BILLING,
+        CLEAR_ALL_PUSH_MESSAGE,SHOW_TIPS_DETAILS, HIDE_TIPS_DETAILS, SET_COMMONTREATMENT, IS_FIRST_MAIN_DIAG, 
+        SET_ADVICE_INPUT ,SET_CHRONIC_TABLELIST,SHOW_TABLE_LIST,HIDE_TABLE_LIST,SET_SCALE_INFO,SET_CHRONIC_PUSHS,
+        SAVE_TABLE_RESULT, SAVE_FOLLOW_UP, DEL_FOLLOW_UP} from '../types/pushMessage';
+import {changeAssay, changeCheck, setAdvice, addScheme, setTips, setTipsDetails, setChangeAdviceTreatment, 
+        setChangeAdviceAssay, setChangeAdviceCheck, addBilling, clearAllPushMessage, showTipsDetails, hideTipsDetails, 
+        setCommontreatment, isFirstMainDiag, setAdviceInput, saveFollowUp, delFollowUp } from '../actions/pushMessage';
 
 const initState = {
   vigilant: [],
@@ -57,6 +63,10 @@ export default function(state = initState, action) {
       return isFirstMainDiag(state, action);
     case SET_ADVICE_INPUT:
       return setAdviceInput(state, action);
+    case SAVE_FOLLOW_UP: 
+      return saveFollowUp(state, action);
+    case DEL_FOLLOW_UP: 
+      return delFollowUp(state, action);
     case SET_CHRONIC_TABLELIST://量表列表数据
       res.tableList = action.data;
       return res;

src/store/types/pushMessage.js

@@ -21,5 +21,7 @@ export const HIDE_TABLE_LIST = 'HIDE_TABLE_LIST' ; //隐藏量表列表
 export const SET_CHRONIC_PUSHS ='SET_CHRONIC_PUSHS'; //右侧慢病量表评估推送模块数据
 export const SET_SCALE_INFO = 'SET_SCALE_INFO' ; //量表明细
 export const SAVE_TABLE_RESULT = 'SAVE_TABLE_RESULT' ; //量表计算结果
+export const SAVE_FOLLOW_UP = 'SAVE_FOLLOW_UP'  //保存回访时间
+export const DEL_FOLLOW_UP = 'DEL_FOLLOW_UP'  //保存回访时间