Merge branch 'newVersion6.0' of http://192.168.2.236:10080/zhouna/newICSS into newVersion6.0

src/common/components/BlockInp/index.jsx

@@ -1,4 +1,4 @@
-import React, { Component } from "react";
+import React, { PureComponent } from "react";
 import style from "./index.less";
 import Notify from '../Notify';
 import config from '@config/index';
@@ -10,7 +10,7 @@ import $ from "jquery";
 import {SET_CURRENT_MODULE} from '@types/homePage';
 import {getMRAnalyse} from '@store/async-actions/pushMessage';
 
-class BlockInp extends Component {
+class BlockInp extends PureComponent {
   constructor(props) {
     super(props);
     this.state = {
@@ -82,7 +82,7 @@ class BlockInp extends Component {
     if(next.isRead != isRead){    //value对比解决复诊不显示bug,复诊对比解决关标跳到前面bug
       this.$dom.current.innerHTML = next.value||'';   //ff26下不支持innerText，但ref会自动加上innerText属性，所以上面的判断不为空
       this.setState({
-        inpText:''
+        inpText: next.value
       });
     }
   }

src/components/BlockEmrCont/MainSuit.jsx

@@ -2,6 +2,7 @@ import React,{Component} from 'react';
 import {connect} from 'react-redux';
 import BlockInp from '@containers/BlockInpContainer';
 
+
 class MainSuit extends Component{
   constructor(props){
     super(props)

src/components/BlockEmrCont/index.jsx

@@ -18,6 +18,7 @@ import MenstruationHistory from './MenstruationHistory'
 // import OtherHistory from './OtherHistory';
 import CheckBody from './CheckBody';
 import {getWindowInnerHeight,getWindowInnerWidth,windowEventHandler} from '@utils/tools';
+import store from '@store';
 
 class BlockEMRCont extends Component {
   constructor(props){

src/components/Operation/index.jsx

@@ -98,7 +98,7 @@ class Operation extends Component {
 
   saveAll(type) {
     let keepState = readyKeepHistory();
-    console.log(keepState,'keepState');
+    // console.log(keepState,'keepState');
     if(keepState == 1){
         Notify.info('主诉不能为空');
         return;

src/store/actions/checkBody.js

@@ -361,4 +361,11 @@ export const setTextModeValue = (state,action)=>{
   const res = Object.assign({},state);
   res.saveText[0] = action.text;
   return res;
-};
+};
+
+// 引用回显数据 
+export function reCheckBodyData(state, action) {
+  let res = Object.assign({}, state);
+  res.saveText = JSON.parse(action.params[7].content);
+  return res;
+}

src/store/actions/currentIll.js

@@ -772,4 +772,11 @@ export function delSingleLable(state,action){
   }
   res.update = Math.random();
   return res;
+}
+
+// 引用回显数据 
+export function reCurrentData(state, action) {
+  let res = Object.assign({}, state);
+  res.saveText = JSON.parse(action.params[1].content);
+  return res;
 }

src/store/actions/diagnosticList.js

@@ -122,4 +122,13 @@ export const addTreat = (state, action) => {
         }
     }
     return res;
+}
+
+// 引用回显数据 
+export function reDiagData(state, action) {
+    let res = Object.assign({}, state);
+    res.diagnosticStr = action.params[10].content;
+    res.diagnosticList = action.params[10].contentValue;
+    res.diagnosticStrNoType = action.params[10].contentJson;
+    return res;
 }

src/store/actions/familyHistory.js

@@ -8,4 +8,11 @@ export const setTextModeValue = (state, action) => {
   const res = Object.assign({}, state);
   res.saveText[0] = action.text;
   return res;
-};
+};
+
+// 引用回显数据 
+export function reFamilyData(state, action) {
+  let res = Object.assign({}, state);
+  res.saveText = JSON.parse(action.params[4].content);
+  return res;
+}

src/store/actions/inspect.js

@@ -81,3 +81,5 @@ export const checkOffOn = (item) => ({
     type:CHECK_ON_OFF,
     item
 })
+
+

src/store/actions/mainSuit.js

@@ -797,3 +797,11 @@ export function getSymptomFeature(state,action){
   res.update = Math.random();
   return res;
 }
+
+
+// 引用回显数据 
+export function reMainsuitData(state, action) {
+   let res = Object.assign({}, state);
+   res.saveText = JSON.parse(action.params[0].content);
+   return res
+}

src/store/actions/marriageHistory.js

@@ -8,4 +8,11 @@ export const setTextModeValue = (state, action) => {
   const res = Object.assign({}, state);
   res.saveText[0] = action.text;
   return res;
-};
+};
+
+// 引用回显数据 
+export function reMarriageData(state, action) {
+  let res = Object.assign({}, state);
+  res.saveText = JSON.parse(action.params[5].content);
+  return res;
+}

src/store/actions/menstruationHistory.js

@@ -8,4 +8,12 @@ export const setTextModeValue = (state, action) => {
   const res = Object.assign({}, state);
   res.saveText[0] = action.text;
   return res;
-};
+};
+
+
+// 引用回显数据 
+export function reMenstruationData(state, action) {
+  let res = Object.assign({}, state);
+  res.saveText = JSON.parse(action.params[6].content);
+  return res;
+}

src/store/actions/pastHistory.js

@@ -8,4 +8,12 @@ export const setTextModeValue = (state, action) => {
   const res = Object.assign({}, state);
   res.saveText[0] = action.text;
   return res;
-};
+};
+
+
+// 引用回显数据 
+export function rePastData(state, action) {
+    let res = Object.assign({}, state);
+    res.saveText = JSON.parse(action.params[2].content);
+    return res;
+  }

src/store/actions/patInfo.js

@@ -70,4 +70,18 @@ export const clearMedicalName = (state, action) => {
   const res = Object.assign({}, state);
   // res.medicalName = ''
   return res
-}
+}
+
+// reInitPatInfo
+export const reInitPatInfo = (state, action) => {
+  const res = Object.assign({}, state);
+  res.patInfoData[0].value = action.params && action.params.cardNo;
+  res.patInfoData[1].value = action.params && action.params.patName;
+  res.patInfoData[2].value = action.params && action.params.age;
+  res.patInfoData[3].value = action.params && action.params.sex;
+  res.patInfoData[4].value = action.params && action.params.gmtCreate;
+  res.patInfoData[5].value = action.params && action.params.deptName;
+  res.patInfoData[6].value = action.params && action.params.doctorName;
+  res.patInfoData[7].value = action.params && action.params.inquiryCode;
+  return res;
+};

src/store/actions/personalHistory.js

@@ -8,4 +8,12 @@ export const setTextModeValue = (state, action) => {
   const res = Object.assign({}, state);
   res.saveText[0] = action.text;
   return res;
-};
+};
+
+
+// 引用回显数据 
+export function rePersonalData(state, action) {
+  let res = Object.assign({}, state);
+  res.saveText = JSON.parse(action.params[3].content);
+  return res;
+}

src/store/async-actions/historyTemplates.js

@@ -35,7 +35,6 @@ export const getHistempDetail = (item) => {
             const data =res.data;
             if(data.code == 0){
                 let tmpData = data.data
-                console.log(tmpData,'============');
                 // pushAllDataList(item.sign,'push',tmpData,'history')       //引用
                 pushHistoryDataList(tmpData);       //引用
                 // if(didPushParamChange()) {

src/store/async-actions/print.js

@@ -62,88 +62,88 @@ function formatFormParmas(val,arr){
 // 保存病历_lcq_new_重写
 export const saveMedicalData = () =>{
     let baseList = store.getState();
-    // console.log(baseList,'======baseList========');
     const { patInfo: { patInfoData } } = baseList
     let inquiryDate = timestampToTime(new Date().getTime())  // 获取当前时间  
     let modeName = baseList.patInfo.medicalName   //病历名称
     let jsonData = getAllDataList(baseList);
-    // let preview = getAllDataList(preview);
     let tempPreview = formatTextInfo(baseList);
+    // console.log(tempPreview, 'tempPreview');
     let preview = [
-        {
-            "content": tempPreview.chief,
-            "contentValue": filterDataArr(JSON.parse(tempPreview.chief)),
-            "contentJson": '',
-            "type": 1
-        },
-        {
-            "content": tempPreview.present,
-            "contentValue": filterDataArr(JSON.parse(tempPreview.present)),
-            "contentJson": '',
-            "type": 2
-        },
-        {
-            "content": tempPreview.pastHistory,
-            "contentValue": filterDataArr(JSON.parse(tempPreview.pastHistory)),
-            "contentJson": '',
-            "type": 3
-        },
-        {
-            "content": tempPreview.personalHistory,
-            "contentValue": filterDataArr(JSON.parse(tempPreview.personalHistory)),
-            "contentJson": '',
-            "type": 4
-        },
-        {
-            "content": tempPreview.familyHistory,
-            "contentValue": filterDataArr(JSON.parse(tempPreview.familyHistory)),
-            "contentJson": '',
-            "type": 5
-        },
-        {
-            "content": tempPreview.marriageHistory,
-            "contentValue": filterDataArr(JSON.parse(tempPreview.marriageHistory)),
-            "contentJson": '',
-            "type": 6
-        },
-        {
-            "content": tempPreview.menstruationHistory,
-            "contentValue": filterDataArr(JSON.parse(tempPreview.menstruationHistory)),
-            "contentJson": '',
-            "type": 7
-        },
-        {
-            "content": tempPreview.vital,
-            "contentValue": filterDataArr(JSON.parse(tempPreview.vital)),
-            "contentJson": '',
-            "type": 8
-        },
-        // 检验
-        {
-            "content": tempPreview.lis,
-            "contentValue": tempPreview.lis,
-            "contentJson": JSON.stringify(tempPreview.lis),
-            "type": 9
-        },
-        {
-            "content": tempPreview.pacs,
-            "contentValue": tempPreview.pacs,
-            "contentJson": JSON.stringify(tempPreview.pacs),
-            "type": 10
-        },
-        {
-            "content": tempPreview.diag,
-            "contentValue": tempPreview.diag,
-            "contentJson": '',
-            "type": 11
-        },
-        {
-            "content": tempPreview.advice,
-            "contentValue": tempPreview.advice,
-            "contentJson": JSON.stringify(tempPreview.advice),
-            "type": 12
-        }
-    ]
+      {
+        content: tempPreview.chief,
+        contentValue: filterDataArr(JSON.parse(tempPreview.chief)),
+        contentJson: '',
+        type: 1,
+      },
+      {
+        content: tempPreview.present,
+        contentValue: filterDataArr(JSON.parse(tempPreview.present)),
+        contentJson: '',
+        type: 2,
+      },
+      {
+        content: tempPreview.pastHistory,
+        contentValue: filterDataArr(JSON.parse(tempPreview.pastHistory)),
+        contentJson: '',
+        type: 3,
+      },
+      {
+        content: tempPreview.personalHistory,
+        contentValue: filterDataArr(JSON.parse(tempPreview.personalHistory)),
+        contentJson: '',
+        type: 4,
+      },
+      {
+        content: tempPreview.familyHistory,
+        contentValue: filterDataArr(JSON.parse(tempPreview.familyHistory)),
+        contentJson: '',
+        type: 5,
+      },
+      {
+        content: tempPreview.marriageHistory,
+        contentValue: filterDataArr(JSON.parse(tempPreview.marriageHistory)),
+        contentJson: '',
+        type: 6,
+      },
+      {
+        content: tempPreview.menstruationHistory,
+        contentValue: filterDataArr(JSON.parse(tempPreview.menstruationHistory)),
+        contentJson: '',
+        type: 7,
+      },
+      {
+        content: tempPreview.vital,
+        contentValue: filterDataArr(JSON.parse(tempPreview.vital)),
+        contentJson: '',
+        type: 8,
+      },
+      // 化验
+      {
+        content: tempPreview.lis,
+        contentValue: tempPreview.lis,
+        contentJson: JSON.stringify(tempPreview.lis),
+        type: 9,
+      },
+      {
+        content: tempPreview.pacs.dataString,
+        contentValue: tempPreview.pacs.assistLabel,
+        contentJson: JSON.stringify(tempPreview.pacs.dataString),
+        type: 10,
+      },
+      {
+        content: tempPreview.diag.diagnosticStr,
+        contentValue: tempPreview.diag.diagnosticList,
+        contentJson: tempPreview.diag.diagnosticStrNoType,
+        type: 11,
+      },
+      {
+        content: tempPreview.advice,
+        contentValue: tempPreview.advice,
+        contentJson: JSON.stringify(tempPreview.advice),
+        type: 12,
+      },
+    ];
+    let sex = formatFormParmas('patientSex', patInfoData) === '男' ? 1 : 0
     let params = {
         "age": formatFormParmas('patientAge', patInfoData),
         "cardNo": formatFormParmas('patientIdNo', patInfoData),
@@ -155,8 +155,9 @@ export const saveMedicalData = () =>{
         "modeName": modeName,
         "patName": formatFormParmas('patientName', patInfoData),
         "preview": JSON.stringify(preview),  // 左侧病历预览信息
-        "sex": formatFormParmas('patientSex', patInfoData),
+        "sex": sex,
     }
+    console.log(params,'=============发送的params');
     json('/demo/templateInfo/saveTemplateInfo', params).then(res=>{
         let data = res.data
         if (data.code == 0) {            

src/store/reducers/assistCheck.js

@@ -7,6 +7,7 @@ import {
   CLEAR_ASSIST_DATA,
   ADD_ASSIST_LABEL,
   CHECK_OFF_ON,
+  REASSISTCHECKDATA,
 } from '../types/assistCheck';
 import store from '@store';
 const initSearchList = {
@@ -149,5 +150,15 @@ export default (state = initSearchList, action) => {
     }
     return newState;
   }
+  if (action.type == REASSISTCHECKDATA) {
+    const newState = Object.assign({}, state);
+    // console.log(action, '=====action==========');
+    // console.log(newState, '====newState===========');
+    // newState.labelListBig = action.params[8].content.labelListBig;
+    newState.assistLabel = action.params[9].contentValue;
+    newState.dataArr = action.params[9].contentValue;
+    newState.dataString = action.params[9].content;
+    return newState;
+  }
   return state;
 }

src/store/reducers/checkBody.js

@@ -1,10 +1,48 @@
-import {RECOVER_TAG_CHECK,SET,SETNUMBER4,SETSELECTED4,SETCHECKBOX,ADDLABELITEM,SETCHECKTEXT,SETSEARCHDATA,
-  SELECTSEARCHDATA,CHANGECHECKTEXTLABEL,CLEARCHECKBODY,CHECK_FOCUS_INDEX,CHECKBODY_CLEAR,
-  SETCHECKINPUT,DEL_CHECKBODY,CHECKCONFIRMSELECTED, CHECKBODY_MUL,DEL_CHECKBODY_LABLE,SET_CK_RADIO_INPUT_VAL,
-  SET_IMPORT_CHECKBODY_LABEL,PRESET,REPUSH_CHECK_LABELS,DELETE_CHECK_SELECTED_TAGS,SETCHECKTEXTMODEVALUE} from '../types/checkBody.js';
-import {recoveTag,set,setCheckBoxValue,
-  setSearchData,insertLabelData,changeLabelVal,clearCheckBody,backspaceText
-  ,confirm,multipleComfirn,delSingleLable,setImportCheckbodyLabel,preSetCheckbody,reflashLabels,setTextModeValue} from '../actions/checkBody.js';
+import {
+  RECOVER_TAG_CHECK,
+  SET,
+  SETNUMBER4,
+  SETSELECTED4,
+  SETCHECKBOX,
+  ADDLABELITEM,
+  SETCHECKTEXT,
+  SETSEARCHDATA,
+  SELECTSEARCHDATA,
+  CHANGECHECKTEXTLABEL,
+  CLEARCHECKBODY,
+  CHECK_FOCUS_INDEX,
+  CHECKBODY_CLEAR,
+  SETCHECKINPUT,
+  DEL_CHECKBODY,
+  CHECKCONFIRMSELECTED,
+  CHECKBODY_MUL,
+  DEL_CHECKBODY_LABLE,
+  SET_CK_RADIO_INPUT_VAL,
+  SET_IMPORT_CHECKBODY_LABEL,
+  PRESET,
+  REPUSH_CHECK_LABELS,
+  DELETE_CHECK_SELECTED_TAGS,
+  SETCHECKTEXTMODEVALUE,
+  RECHECKBODYTEXTDATA,
+} from '../types/checkBody.js';
+import {
+  recoveTag,
+  set,
+  setCheckBoxValue,
+  setSearchData,
+  insertLabelData,
+  changeLabelVal,
+  clearCheckBody,
+  backspaceText,
+  confirm,
+  multipleComfirn,
+  delSingleLable,
+  setImportCheckbodyLabel,
+  preSetCheckbody,
+  reflashLabels,
+  setTextModeValue,
+  reCheckBodyData,
+} from '../actions/checkBody.js';
 import {setRadioInputValue,setRadioValue,setNumberValue,setCheckText,addLabelItem,setInputLabel,deleteSelectedLabels} from '@utils/utils';
 import config from '@config/index.js';
 
@@ -22,57 +60,59 @@ const initState = {
           };
 export default function(state=initState,action){
   let res = Object.assign({},state);
-  switch(action.type){
+  switch (action.type) {
     case PRESET:
-      return preSetCheckbody(state,action);
+      return preSetCheckbody(state, action);
     case SET:
-      return set(state,action);
+      return set(state, action);
     case SETNUMBER4:
-      return setNumberValue(state,action);
+      return setNumberValue(state, action);
     case SETSELECTED4:
-      return setRadioValue(state,action);
+      return setRadioValue(state, action);
     case ADDLABELITEM:
-      return addLabelItem(state,action,'4');
+      return addLabelItem(state, action, '4');
     case SETCHECKTEXT:
-      return setCheckText(state,action);
+      return setCheckText(state, action);
     case SETSEARCHDATA:
-      return setSearchData(state,action);
+      return setSearchData(state, action);
     case SETCHECKBOX:
-      return setCheckBoxValue(state,action);
+      return setCheckBoxValue(state, action);
     case SELECTSEARCHDATA:
-      return insertLabelData(state,action);
+      return insertLabelData(state, action);
     case CLEARCHECKBODY:
-      return clearCheckBody(state,action);
-    case CHANGECHECKTEXTLABEL://改变标签值
-      return changeLabelVal(state,action);
+      return clearCheckBody(state, action);
+    case CHANGECHECKTEXTLABEL: //改变标签值
+      return changeLabelVal(state, action);
     case CHECKCONFIRMSELECTED:
-      return confirm(state,action);
+      return confirm(state, action);
     case CHECK_FOCUS_INDEX:
       res.focusIndex = action.index;
       res.span = action.$span;
-	case CHECKBODY_CLEAR://失焦清空搜索值
+    case CHECKBODY_CLEAR: //失焦清空搜索值
       res.searchData = [];
       return res;
-  case SETCHECKINPUT:
-      return setInputLabel(state,action);
-  case DEL_CHECKBODY:
-      return backspaceText(state,action);
+    case SETCHECKINPUT:
+      return setInputLabel(state, action);
+    case DEL_CHECKBODY:
+      return backspaceText(state, action);
     case CHECKBODY_MUL:
-      return multipleComfirn(state,action);
+      return multipleComfirn(state, action);
     case DEL_CHECKBODY_LABLE:
-      return delSingleLable(state,action);
+      return delSingleLable(state, action);
     case SET_CK_RADIO_INPUT_VAL:
-      return setRadioInputValue(state,action);
+      return setRadioInputValue(state, action);
     case SET_IMPORT_CHECKBODY_LABEL:
-      return setImportCheckbodyLabel(state,action);
+      return setImportCheckbodyLabel(state, action);
     case RECOVER_TAG_CHECK:
-      return recoveTag(state,action);
+      return recoveTag(state, action);
     case DELETE_CHECK_SELECTED_TAGS:
-      return deleteSelectedLabels(state,action);
+      return deleteSelectedLabels(state, action);
     case REPUSH_CHECK_LABELS:
-      return reflashLabels(state,action);
+      return reflashLabels(state, action);
     case SETCHECKTEXTMODEVALUE:
-      return setTextModeValue(state,action);
+      return setTextModeValue(state, action);
+    case RECHECKBODYTEXTDATA:
+      return reCheckBodyData(state, action);
     default:
       return res;
   }

src/store/reducers/currentIll.js

@@ -1,12 +1,56 @@
 // 现病史
-import {RECOVER_TAG_CURRENT,SET_CURRENT,CURRENT_CONFIRM,INSERT_PROCESS,SET_CURRENT_DATA,SET_LABEL_MODULE,SETMAINCHECKBOX,
-  CURRENT_RADIO,CURRENT_NUMBER,CURRENT_TEXT_LABEL,CLEAR_CURRENT_ILL,SETCURRENTTEXTMODEVALUE,CURRENT_GET_BIGDATAPUSH,CURRENT_CLEAR,
-  SET_CURRENT_SEARCH,SETCURRENTTEXT,CURRENT_FOCUS_INDEX,SELECT_SEARCHDATA,CLEAR_CURRENT_EDIT,CURRENTADDLABELITEM,
-  SETCURRENTINPUT,DEL_CURRENT,REMOVE_CURR_ID,CURRENT_MUL,DEL_CURRENT_LABLE,SET_RADIO_INPUT_VALUE,CURRENT_CHRONIC,
-  SAVE_CURR_FREE,SHOW_COMMON_ON_CURRENT,DELETE_CURRENT_SELECTED_TAGS} from '../types/currentIll';
-import {confirm,insertProcess,setData,setCheckBox,changeLabelVal,clearCurrentIll,
-  setTextModeValue,setModule,bigDataSymptom,insertLabelData,clearCurrentEdit,
-  backspaceText,removeId,multipleComfirn,delSingleLable,fillChronicModule} from '../actions/currentIll';
+import {
+  RECOVER_TAG_CURRENT,
+  SET_CURRENT,
+  CURRENT_CONFIRM,
+  INSERT_PROCESS,
+  SET_CURRENT_DATA,
+  SET_LABEL_MODULE,
+  SETMAINCHECKBOX,
+  CURRENT_RADIO,
+  CURRENT_NUMBER,
+  CURRENT_TEXT_LABEL,
+  CLEAR_CURRENT_ILL,
+  SETCURRENTTEXTMODEVALUE,
+  CURRENT_GET_BIGDATAPUSH,
+  CURRENT_CLEAR,
+  SET_CURRENT_SEARCH,
+  SETCURRENTTEXT,
+  CURRENT_FOCUS_INDEX,
+  SELECT_SEARCHDATA,
+  CLEAR_CURRENT_EDIT,
+  CURRENTADDLABELITEM,
+  SETCURRENTINPUT,
+  DEL_CURRENT,
+  REMOVE_CURR_ID,
+  CURRENT_MUL,
+  DEL_CURRENT_LABLE,
+  SET_RADIO_INPUT_VALUE,
+  CURRENT_CHRONIC,
+  SAVE_CURR_FREE,
+  SHOW_COMMON_ON_CURRENT,
+  DELETE_CURRENT_SELECTED_TAGS,
+  RECURRENTDATA,
+} from '../types/currentIll';
+import {
+  confirm,
+  insertProcess,
+  setData,
+  setCheckBox,
+  changeLabelVal,
+  clearCurrentIll,
+  setTextModeValue,
+  setModule,
+  bigDataSymptom,
+  insertLabelData,
+  clearCurrentEdit,
+  backspaceText,
+  removeId,
+  multipleComfirn,
+  delSingleLable,
+  fillChronicModule,
+  reCurrentData,
+} from '../actions/currentIll';
 import {recoveTag,setRadioInputValue,setRadioValue,setNumberValue,setCheckText,addLabelItem,setInputLabel,deleteSelectedLabels} from '@utils/utils';
 
 const initState = {
@@ -23,76 +67,79 @@ const initState = {
 };
 export default function(state=initState,action){    
   const res = Object.assign({},state);
-  switch (action.type){
-    case SET_CURRENT://需要处理截取的模板
-      return setModule(state,action);
-    case SET_CURRENT_DATA://设置使用的模板数据
-      return setData(state,action);
-    case CURRENT_CONFIRM://展开多选确定
-      return confirm(state,action);
-    case SET_LABEL_MODULE://设置主诉选中的标签模板
+  switch (action.type) {
+    case SET_CURRENT: //需要处理截取的模板
+      return setModule(state, action);
+    case SET_CURRENT_DATA: //设置使用的模板数据
+      return setData(state, action);
+    case CURRENT_CONFIRM: //展开多选确定
+      return confirm(state, action);
+    case SET_LABEL_MODULE: //设置主诉选中的标签模板
       res.mainLabelModule = action.data;
       return res;
-    case INSERT_PROCESS://病程变化
-      return insertProcess(state,action);
-	case CLEAR_CURRENT_ILL://清除现病史数据
-      return clearCurrentIll(state,action);
+    case INSERT_PROCESS: //病程变化
+      return insertProcess(state, action);
+    case CLEAR_CURRENT_ILL: //清除现病史数据
+      return clearCurrentIll(state, action);
     case SETCURRENTTEXTMODEVALUE:
-      return setTextModeValue(state,action);
-    case SETMAINCHECKBOX://普通多选确定
-      return setCheckBox(state,action);
-    case CURRENT_RADIO://单选确定
-      return setRadioValue(state,action);
-    case CURRENT_NUMBER://数字确定
-      return setNumberValue(state,action);
-    case CURRENT_TEXT_LABEL://标签双击编辑
-      return changeLabelVal(state,action);
-    case CURRENT_GET_BIGDATAPUSH://标签双击编辑
-      return bigDataSymptom(state,action);
-    case SET_CURRENT_SEARCH://搜索结果
+      return setTextModeValue(state, action);
+    case SETMAINCHECKBOX: //普通多选确定
+      return setCheckBox(state, action);
+    case CURRENT_RADIO: //单选确定
+      return setRadioValue(state, action);
+    case CURRENT_NUMBER: //数字确定
+      return setNumberValue(state, action);
+    case CURRENT_TEXT_LABEL: //标签双击编辑
+      return changeLabelVal(state, action);
+    case CURRENT_GET_BIGDATAPUSH: //标签双击编辑
+      return bigDataSymptom(state, action);
+    case SET_CURRENT_SEARCH: //搜索结果
       res.searchDatas = action.data;
       res.searchStr = action.inpStr;
       return res;
     case CURRENT_CLEAR:
-      res.searchDatas = [];//清空搜索结果
+      res.searchDatas = []; //清空搜索结果
       return res;
     case SETCURRENTTEXT:
-      return setCheckText(state,action);
-    case CURRENT_FOCUS_INDEX://手动输入位置
+      return setCheckText(state, action);
+    case CURRENT_FOCUS_INDEX: //手动输入位置
       res.focusIndex = action.index;
       res.span = action.$span;
       return res;
     case SELECT_SEARCHDATA:
-      return insertLabelData(state,action);
-    case CLEAR_CURRENT_EDIT://清除数据
-      return clearCurrentEdit(state,action);
+      return insertLabelData(state, action);
+    case CLEAR_CURRENT_EDIT: //清除数据
+      return clearCurrentEdit(state, action);
     case CURRENTADDLABELITEM:
-      return addLabelItem(state,action);
+      return addLabelItem(state, action);
     case SETCURRENTINPUT:
-      return setInputLabel(state,action);
+      return setInputLabel(state, action);
     case DEL_CURRENT:
-      return backspaceText(state,action);
+      return backspaceText(state, action);
     case REMOVE_CURR_ID:
-      return removeId(state,action);
-    case CURRENT_MUL://单列多选
-      return multipleComfirn(state,action);
+      return removeId(state, action);
+    case CURRENT_MUL: //单列多选
+      return multipleComfirn(state, action);
     case DEL_CURRENT_LABLE:
-      return delSingleLable(state,action);
+      return delSingleLable(state, action);
     case SET_RADIO_INPUT_VALUE:
-      return setRadioInputValue(state,action);
+      return setRadioInputValue(state, action);
     case CURRENT_CHRONIC:
-      return fillChronicModule(state,action);
-    case SAVE_CURR_FREE://自由输入
+      return fillChronicModule(state, action);
+    case SAVE_CURR_FREE: //自由输入
       res.saveText[0] = action.data;
       res.update = Math.random();
       return res;
     case RECOVER_TAG_CURRENT:
-      return recoveTag(state,action);
+      return recoveTag(state, action);
     case DELETE_CURRENT_SELECTED_TAGS:
-      return deleteSelectedLabels(state,action);
+      return deleteSelectedLabels(state, action);
     case SHOW_COMMON_ON_CURRENT:
       res.showCommon = action.show;
       return res;
+    // 回显现病史
+    case RECURRENTDATA:
+      return reCurrentData(state, action);
     default:
       return state;
   }

src/store/reducers/diagnosticList.js

@@ -1,8 +1,43 @@
-import { ADD_DIAGNOSTIC,  DEL_DIAGNOSTIC, UP_DIAGNOSTIC, DOWN_DIAGNOSTIC, SET_TREAT, GET_DIAGNOSTIC_STR, SET_DIAG_TO_MAINSUIT, 
-            GET_IS_FIRST,CLEAR_ALL_DIAG, SET_CLICK_DIAG ,CLEAR_DIAGNOSE, SET_CHRONIC_MAG_ITEM, SHOW_REFER_RECORD, HIDE_REFER_RECORD, 
-            SHOW_HISTORY_CASE,  HIDE_HISTORY_CASE,SHOW_LOADING, ADD_TREAT} from '../types/diagnosticList';
-import { addDiagnostic,  delDiagnostic, upDiagnostic, downDiagnostic, setTreat, getDiagnosticStr, setDiagToMainSuit, 
-        getIsFirst,clearAllDiag, setClickDiag, setChronicMagItem, showReferRecord, hideReferRecord, showHistoryCase, hideHistoryCase, addTreat} from '../actions/diagnosticList';
+import {
+  ADD_DIAGNOSTIC,
+  DEL_DIAGNOSTIC,
+  UP_DIAGNOSTIC,
+  DOWN_DIAGNOSTIC,
+  SET_TREAT,
+  GET_DIAGNOSTIC_STR,
+  SET_DIAG_TO_MAINSUIT,
+  GET_IS_FIRST,
+  CLEAR_ALL_DIAG,
+  SET_CLICK_DIAG,
+  CLEAR_DIAGNOSE,
+  SET_CHRONIC_MAG_ITEM,
+  SHOW_REFER_RECORD,
+  HIDE_REFER_RECORD,
+  SHOW_HISTORY_CASE,
+  HIDE_HISTORY_CASE,
+  SHOW_LOADING,
+  ADD_TREAT,
+  REDIAGDATA,
+} from '../types/diagnosticList';
+import {
+  addDiagnostic,
+  delDiagnostic,
+  upDiagnostic,
+  downDiagnostic,
+  setTreat,
+  getDiagnosticStr,
+  setDiagToMainSuit,
+  getIsFirst,
+  clearAllDiag,
+  setClickDiag,
+  setChronicMagItem,
+  showReferRecord,
+  hideReferRecord,
+  showHistoryCase,
+  hideHistoryCase,
+  addTreat,
+  reDiagData,
+} from '../actions/diagnosticList';
 
 const initState = {
     isFirst: true,
@@ -17,46 +52,48 @@ const initState = {
 
 export default function (state=initState, action) {
     const res = Object.assign({},state);
-    switch(action.type) {
-        case ADD_DIAGNOSTIC:
-            return addDiagnostic(state, action);
-        case DEL_DIAGNOSTIC: 
-            return delDiagnostic(state, action);
-        case UP_DIAGNOSTIC: 
-            return upDiagnostic(state, action);
-        case DOWN_DIAGNOSTIC: 
-            return downDiagnostic(state, action);
-        case SET_TREAT: 
-            return setTreat(state, action);
-        case GET_DIAGNOSTIC_STR:
-            return getDiagnosticStr(state, action);
-        case SET_DIAG_TO_MAINSUIT:
-            return setDiagToMainSuit(state, action);
-        case GET_IS_FIRST:
-            return getIsFirst(state, action);
-        case CLEAR_ALL_DIAG:
-            return clearAllDiag(state, action);
-        case SET_CLICK_DIAG: 
-            return setClickDiag(state, action);
-        case SET_CHRONIC_MAG_ITEM:
-            return setChronicMagItem(state, action);
-        case SHOW_REFER_RECORD: 
-            return showReferRecord(state, action);
-        case HIDE_REFER_RECORD: 
+    switch (action.type) {
+      case ADD_DIAGNOSTIC:
+        return addDiagnostic(state, action);
+      case DEL_DIAGNOSTIC:
+        return delDiagnostic(state, action);
+      case UP_DIAGNOSTIC:
+        return upDiagnostic(state, action);
+      case DOWN_DIAGNOSTIC:
+        return downDiagnostic(state, action);
+      case SET_TREAT:
+        return setTreat(state, action);
+      case GET_DIAGNOSTIC_STR:
+        return getDiagnosticStr(state, action);
+      case SET_DIAG_TO_MAINSUIT:
+        return setDiagToMainSuit(state, action);
+      case GET_IS_FIRST:
+        return getIsFirst(state, action);
+      case CLEAR_ALL_DIAG:
+        return clearAllDiag(state, action);
+      case SET_CLICK_DIAG:
+        return setClickDiag(state, action);
+      case SET_CHRONIC_MAG_ITEM:
+        return setChronicMagItem(state, action);
+      case SHOW_REFER_RECORD:
+        return showReferRecord(state, action);
+      case HIDE_REFER_RECORD:
         return hideReferRecord(state, action);
-        case SHOW_HISTORY_CASE: 
-            return showHistoryCase(state, action);
-        case HIDE_HISTORY_CASE: 
+      case SHOW_HISTORY_CASE:
+        return showHistoryCase(state, action);
+      case HIDE_HISTORY_CASE:
         return hideHistoryCase(state, action);
-        case ADD_TREAT:
-                return addTreat(state, action);
-        case CLEAR_DIAGNOSE: 
-            res.mainSuitStr = "";
-            return res;
-        case SHOW_LOADING: 
-            res.loading = action.flag;
-            return res;
-        default:
-            return state;
+      case ADD_TREAT:
+        return addTreat(state, action);
+      case CLEAR_DIAGNOSE:
+        res.mainSuitStr = '';
+        return res;
+      case SHOW_LOADING:
+        res.loading = action.flag;
+        return res;
+      case REDIAGDATA:
+        return reDiagData(state, action);
+      default:
+        return state;
     }
 }

src/store/reducers/familyHistory.js

@@ -1,9 +1,5 @@
-import {
-  SETFAMILYTEXTMODEVALUE
-} from '../types/familyHistory';
-import {
-  setTextModeValue
-} from '../actions/familyHistory';
+import { SETFAMILYTEXTMODEVALUE, REFAMILYTEXTDATA } from '../types/familyHistory';
+import { setTextModeValue, reFamilyData } from '../actions/familyHistory';
 import config from '@config/index';
 const block = Object.assign(JSON.parse(config.textLabel), { full: true });//空白时保留一个自由文本标签
 const initState = {
@@ -20,6 +16,8 @@ export default function (state = initState, action) {//console.log(state)
   switch (action.type) {
     case SETFAMILYTEXTMODEVALUE:
       return setTextModeValue(state, action);
+    case REFAMILYTEXTDATA:
+      return reFamilyData(state, action);
     default:
       return res;
   }

src/store/reducers/inspect.js

@@ -1,20 +1,21 @@
 import {
-    SEARCH_LIST,
-    SET_LABEL,
-    FILL_ACTIVE,
-    GET_EXCEL,
-    CHECK_VALUE_IS_CHANGE,
-    CLEAR_LABEL,
-    RESET_LABEL,
-    CLEAR_ALL_LABEL,
-    DEL_PART_ITEM,
-    DEL_EXCEL_LIST,
-    ADD_LABEL,
-    SET_CONTEXT,
-    SET_TIP,
-    SEARCH_TYPE,
-    DEL_ONE_PIC,
-    CHECK_ON_OFF,
+  SEARCH_LIST,
+  SET_LABEL,
+  FILL_ACTIVE,
+  GET_EXCEL,
+  CHECK_VALUE_IS_CHANGE,
+  CLEAR_LABEL,
+  RESET_LABEL,
+  CLEAR_ALL_LABEL,
+  DEL_PART_ITEM,
+  DEL_EXCEL_LIST,
+  ADD_LABEL,
+  SET_CONTEXT,
+  SET_TIP,
+  SEARCH_TYPE,
+  DEL_ONE_PIC,
+  CHECK_ON_OFF,
+  REINSPECTDATA,
 } from '../types/inspect';
 import store from '@store';
 import { getStringPlus,  getPushLists,  getPushList,getCurrentDate} from '@utils/tools.js';
@@ -262,6 +263,13 @@ export default (state = initSearchList, action) => {
         newState.context = action.obj
         return newState;
     }
+    if (action.type == REINSPECTDATA) {
+      const newState = Object.assign({}, state);
+        newState.labelListBig = action.params[8].content.labelListBig
+        newState.labelListSmall = action.params[8].content.labelListSmall;       
+      return newState;
+
+    }
     return state;
 }
 
@@ -327,4 +335,4 @@ function getString(lists) {
 }
 function isNumber(obj) {  
     return typeof obj === 'number' && !isNaN(obj)  
-}
+}

src/store/reducers/mainSuit.js

@@ -1,12 +1,61 @@
-import {RECOVER_TAG_MAIN,COMM_SYMPTOMS,CLEAR_COMSYMPTOMS,SHOW_TAIL,INSERT_MAIN,
-  SET_SEARCH,CLEAR_SEARCH,GET_BIGDATAPUSH,SET_MAINSUIT,MIX_CONFIRM,NUMBER_SELECT,
-  RADIO_SELECT,COMM_CONFIRM,CHANGE_LABELVAL,SAVE_FREE,CLEAR_MAIN_SUIT,SET_DATA,
-  INSERT_SEARCH,MAIN_FOCUS_INDEX,SETTEXTMODEVALUE,SETMAINTEXT,MAINADDLABELITEM,SETMAININPUT,DEL_MAIN,
-  REMOVE_MAIN_ID,MAINSUIT_MUL,DEL_MAIN_LABLE,SET_FEATURE,SET_MS_RADIO_INPUT_VAL,SAVE_CHRONIC,MAIN_REMOVE_SPAN,SET_ADD_SEARCH,CLEAR_ADD_SEARCH,DELETE_MAIN_SELECTED_TAGS} from '../types/mainSuit'
-import {getCommSymptoms,handleTailClick,insertMain,setSearch,getBigSymptom,setMainMoudle,confirm,
-  commConfirm,changeLabelVal,saveFreeVal,clearMainSuit,insertSearch,setTextModeValue,
-  backspaceText,removeId,multipleComfirn,delSingleLable,
-  getSymptomFeature} from '../actions/mainSuit'
+import {
+  RECOVER_TAG_MAIN,
+  COMM_SYMPTOMS,
+  CLEAR_COMSYMPTOMS,
+  SHOW_TAIL,
+  INSERT_MAIN,
+  SET_SEARCH,
+  CLEAR_SEARCH,
+  GET_BIGDATAPUSH,
+  SET_MAINSUIT,
+  MIX_CONFIRM,
+  NUMBER_SELECT,
+  RADIO_SELECT,
+  COMM_CONFIRM,
+  CHANGE_LABELVAL,
+  SAVE_FREE,
+  CLEAR_MAIN_SUIT,
+  SET_DATA,
+  INSERT_SEARCH,
+  MAIN_FOCUS_INDEX,
+  SETTEXTMODEVALUE,
+  SETMAINTEXT,
+  MAINADDLABELITEM,
+  SETMAININPUT,
+  DEL_MAIN,
+  REMOVE_MAIN_ID,
+  MAINSUIT_MUL,
+  DEL_MAIN_LABLE,
+  SET_FEATURE,
+  SET_MS_RADIO_INPUT_VAL,
+  SAVE_CHRONIC,
+  MAIN_REMOVE_SPAN,
+  SET_ADD_SEARCH,
+  CLEAR_ADD_SEARCH,
+  DELETE_MAIN_SELECTED_TAGS,
+  REMAINSUITDATA,
+} from '../types/mainSuit';
+import {
+  getCommSymptoms,
+  handleTailClick,
+  insertMain,
+  setSearch,
+  getBigSymptom,
+  setMainMoudle,
+  confirm,
+  commConfirm,
+  changeLabelVal,
+  saveFreeVal,
+  clearMainSuit,
+  insertSearch,
+  setTextModeValue,
+  backspaceText,
+  removeId,
+  multipleComfirn,
+  delSingleLable,
+  getSymptomFeature,
+  reMainsuitData,
+} from '../actions/mainSuit';
 import {recoveTag,setRadioInputValue,setNumberValue,setRadioValue,setCheckText,addLabelItem,setInputLabel,deleteSelectedLabels} from '@utils/utils';
 
 const initState = {
@@ -34,82 +83,82 @@ const initState = {
 
 export default function(state=initState,action){
   const res = Object.assign({},state);
-  switch (action.type){
-    case SET_MAINSUIT://主诉模板
-      return setMainMoudle(state,action);
-    case SET_DATA://主诉使用模板
+  switch (action.type) {
+    case SET_MAINSUIT: //主诉模板
+      return setMainMoudle(state, action);
+    case SET_DATA: //主诉使用模板
       // res.data = res.moduleData.concat();
       res.data = JSON.parse(JSON.stringify(res.moduleData));
-      res.update=Math.random();
+      res.update = Math.random();
       return res;
-      // return setMainData(state,action);
+    // return setMainData(state,action);
     case COMM_SYMPTOMS:
-      return getCommSymptoms(state,action);
-    case CLEAR_COMSYMPTOMS://清空常见症状
+      return getCommSymptoms(state, action);
+    case CLEAR_COMSYMPTOMS: //清空常见症状
       // return clearCommSymptoms(state,action);
       res.CommonSymptoms = [];
       return res;
-    case GET_BIGDATAPUSH://大数据推送症状
-      return getBigSymptom(state,action);
-    case SHOW_TAIL://显示标签尾巴
-      return handleTailClick(state,action);
-    case INSERT_MAIN://插入选中的常见症状
-      return insertMain(state,action);
-    case COMM_CONFIRM://普通多选框确定事件
-      return commConfirm(state,action);
-    case MIX_CONFIRM://有伴 多选框确定事件
-      return confirm(state,action);
+    case GET_BIGDATAPUSH: //大数据推送症状
+      return getBigSymptom(state, action);
+    case SHOW_TAIL: //显示标签尾巴
+      return handleTailClick(state, action);
+    case INSERT_MAIN: //插入选中的常见症状
+      return insertMain(state, action);
+    case COMM_CONFIRM: //普通多选框确定事件
+      return commConfirm(state, action);
+    case MIX_CONFIRM: //有伴 多选框确定事件
+      return confirm(state, action);
     case SET_SEARCH:
-      return setSearch(state,action);
+      return setSearch(state, action);
     case INSERT_SEARCH:
-      return insertSearch(state,action);
-    case CLEAR_SEARCH://清空搜索结果
+      return insertSearch(state, action);
+    case CLEAR_SEARCH: //清空搜索结果
       res.searchDatas = [];
       return res;
-    case NUMBER_SELECT://数字键盘选中的值处理
-      return setNumberValue(state,action);
-    case RADIO_SELECT://单选选中的值处理
-      return setRadioValue(state,action);
-    case CHANGE_LABELVAL://改变标签值
-      return changeLabelVal(state,action);
-    case SAVE_FREE://自由输入
-      return saveFreeVal(state,action);
+    case NUMBER_SELECT: //数字键盘选中的值处理
+      return setNumberValue(state, action);
+    case RADIO_SELECT: //单选选中的值处理
+      return setRadioValue(state, action);
+    case CHANGE_LABELVAL: //改变标签值
+      return changeLabelVal(state, action);
+    case SAVE_FREE: //自由输入
+      return saveFreeVal(state, action);
     case MAIN_FOCUS_INDEX:
       res.focusIndex = action.index;
       res.span = action.$span;
       return res;
-    case CLEAR_MAIN_SUIT://清除数据
-      return clearMainSuit(state,action);
+    case CLEAR_MAIN_SUIT: //清除数据
+      return clearMainSuit(state, action);
     case SETTEXTMODEVALUE:
-      return setTextModeValue(state,action);
+      return setTextModeValue(state, action);
     case SETMAINTEXT:
-      return setCheckText(state,action);
+      return setCheckText(state, action);
     case MAINADDLABELITEM:
-      return addLabelItem(state,action);
+      return addLabelItem(state, action);
     case SETMAININPUT:
-      return setInputLabel(state,action);
+      return setInputLabel(state, action);
     case DEL_MAIN:
-      return backspaceText(state,action);
+      return backspaceText(state, action);
     case REMOVE_MAIN_ID:
-      return removeId(state,action);
-    case MAINSUIT_MUL://单列多选
-      return multipleComfirn(state,action);
-    case DEL_MAIN_LABLE://单独删除标签
-      return delSingleLable(state,action);
-    case SET_FEATURE://主诉分词
-      return getSymptomFeature(state,action);
+      return removeId(state, action);
+    case MAINSUIT_MUL: //单列多选
+      return multipleComfirn(state, action);
+    case DEL_MAIN_LABLE: //单独删除标签
+      return delSingleLable(state, action);
+    case SET_FEATURE: //主诉分词
+      return getSymptomFeature(state, action);
     case SET_MS_RADIO_INPUT_VAL:
-      return setRadioInputValue(state,action);
-    case SAVE_CHRONIC://存慢病信息，说明走慢病流程，慢病没有主诉模板，故要清掉
+      return setRadioInputValue(state, action);
+    case SAVE_CHRONIC: //存慢病信息，说明走慢病流程，慢病没有主诉模板，故要清掉
       res.chronicDesease = action.data;
       res.moduleData = [];
       res.addSmoduleData = [];
       return res;
     case RECOVER_TAG_MAIN:
-      return recoveTag(state,action);
+      return recoveTag(state, action);
     case MAIN_REMOVE_SPAN:
       // 只剩最后一个空标签时才移除
-      if(res.data.length == 1){
+      if (res.data.length == 1) {
         res.data = [];
         res.saveText = [];
         res.mainIds = [];
@@ -119,14 +168,17 @@ export default function(state=initState,action){
     case SET_ADD_SEARCH: //添加症状-搜索
       res.addSearchData = action.data;
       return res;
-    case CLEAR_ADD_SEARCH://清空症状搜索结果
+    case CLEAR_ADD_SEARCH: //清空症状搜索结果
       //非必要是不要重复赋值[],造成searchBox componentWillReceiveProps循环调用导致内存泄漏
-      if(res.addSearchData&&res.addSearchData.length>0){
+      if (res.addSearchData && res.addSearchData.length > 0) {
         res.addSearchData = [];
       }
       return res;
     case DELETE_MAIN_SELECTED_TAGS:
-      return deleteSelectedLabels(state,action);
+      return deleteSelectedLabels(state, action);
+    // 回显主述
+    case REMAINSUITDATA:
+      return reMainsuitData(state, action);
     default:
       return state;
   }

src/store/reducers/marriageHistory.js

@@ -1,9 +1,5 @@
-import {
-  SETMARRIAGETEXTMODEVALUE
-} from '../types/marriageHistory';
-import {
-  setTextModeValue
-} from '../actions/marriageHistory';
+import { SETMARRIAGETEXTMODEVALUE, REMARRIAGETEXTDATA } from '../types/marriageHistory';
+import { setTextModeValue, reMarriageData } from '../actions/marriageHistory';
 import config from '@config/index';
 const block = Object.assign(JSON.parse(config.textLabel), { full: true });//空白时保留一个自由文本标签
 const initState = {
@@ -20,6 +16,8 @@ export default function (state = initState, action) {//console.log(state)
   switch (action.type) {
     case SETMARRIAGETEXTMODEVALUE:
       return setTextModeValue(state, action);
+    case REMARRIAGETEXTDATA:
+      return reMarriageData(state, action);
     default:
       return res;
   }

src/store/reducers/menstruationHistory.js

@@ -1,9 +1,5 @@
-import {
-  SETMENSTRUATIONTEXTMODEVALUE
-} from '../types/menstruationHistory';
-import {
-  setTextModeValue
-} from '../actions/menstruationHistory';
+import { SETMENSTRUATIONTEXTMODEVALUE, REMENSTRUATIONTEXTDATA } from '../types/menstruationHistory';
+import { setTextModeValue, reMenstruationData } from '../actions/menstruationHistory';
 import config from '@config/index';
 const block = Object.assign(JSON.parse(config.textLabel), { full: true });//空白时保留一个自由文本标签
 const initState = {
@@ -20,6 +16,8 @@ export default function (state = initState, action) {//console.log(state)
   switch (action.type) {
     case SETMENSTRUATIONTEXTMODEVALUE:
       return setTextModeValue(state, action);
+    case REMENSTRUATIONTEXTDATA:
+      return reMenstruationData(state, action);
     default:
       return res;
   }

src/store/reducers/newAdvice.js

@@ -1,20 +1,21 @@
 import {
-    SEARCH_LIST,
-    SET_LABEL,
-    FILL_ACTIVE,
-    GET_EXCEL,
-    CHECK_VALUE_IS_CHANGE,
-    CLEAR_LABEL,
-    RESET_LABEL_NEW,
-    CLEAR_ALL_LABEL,
-    DEL_PART_ITEM_NEW,
-    DEL_EXCEL_LIST,
-    ADD_LABEL,
-    SET_CONTEXT,
-    SET_TIP,
-    DEL_ONE_PIC,
-    SEARCH_TYPE_NEW,
-    CHECK_OFF_ON,
+  SEARCH_LIST,
+  SET_LABEL,
+  FILL_ACTIVE,
+  GET_EXCEL,
+  CHECK_VALUE_IS_CHANGE,
+  CLEAR_LABEL,
+  RESET_LABEL_NEW,
+  CLEAR_ALL_LABEL,
+  DEL_PART_ITEM_NEW,
+  DEL_EXCEL_LIST,
+  ADD_LABEL,
+  SET_CONTEXT,
+  SET_TIP,
+  DEL_ONE_PIC,
+  SEARCH_TYPE_NEW,
+  CHECK_OFF_ON,
+  RENEWADVICEDATA,
 } from '../types/newAdvice';
 import store from '@store';
 import { getStringPlus,  getPushLists,  getPushList,getCurrentDate} from '@utils/tools.js';
@@ -258,6 +259,12 @@ export default (state = initSearchList, action) => {
         newState.context = action.obj
         return newState;
     }
+    if (action.type == RENEWADVICEDATA) {
+      const newState = Object.assign({}, state);
+      newState.labelListBig = action.params[11].content.labelListBig;
+      newState.labelListSmall = action.params[11].content.labelListSmall;
+      return newState;
+    }
     return state;
 }
 

src/store/reducers/pastHistory.js

@@ -1,9 +1,5 @@
-import {
-  SETPASTTEXTMODEVALUE
-} from '../types/pastHistory';
-import {
-  setTextModeValue
-} from '../actions/pastHistory';
+import { SETPASTTEXTMODEVALUE, REPASTTEXTDATA } from '../types/pastHistory';
+import { setTextModeValue, rePastData } from '../actions/pastHistory';
 import config from '@config/index';
 const block = Object.assign(JSON.parse(config.textLabel), { full: true });//空白时保留一个自由文本标签
 const initState = {
@@ -20,6 +16,8 @@ export default function (state = initState, action) {//console.log(state)
   switch (action.type) {     
     case SETPASTTEXTMODEVALUE:
       return setTextModeValue(state, action);
+    case REPASTTEXTDATA: 
+      return rePastData(state, action);
     default:
       return res;
   }

src/store/reducers/patInfo.js

@@ -1,5 +1,19 @@
-import { GET_PATIENT_MESSAGE, GET_HOSPITAL_MESSAGE, SETINITPATINFO, SETMEDICALNAME, CLEARMEDICALNAME} from '../types/patInfo';
-import { updatePatientMessage, updateHospitalMessage, setPatInfo, setMedicalName, clearMedicalName} from '../actions/patInfo';
+import {
+  GET_PATIENT_MESSAGE,
+  GET_HOSPITAL_MESSAGE,
+  SETINITPATINFO,
+  SETMEDICALNAME,
+  CLEARMEDICALNAME,
+  REINITPATINFO,
+} from '../types/patInfo';
+import {
+  updatePatientMessage,
+  updateHospitalMessage,
+  setPatInfo,
+  setMedicalName,
+  clearMedicalName,
+  reInitPatInfo,
+} from '../actions/patInfo';
 
 const initState = {
     message: {},
@@ -8,17 +22,19 @@ const initState = {
     medicalName: '' //病历名称
 };
 export default function(state = initState,action){
-  switch(action.type){
+  switch (action.type) {
     case GET_PATIENT_MESSAGE:
-      return updatePatientMessage(state,action);
+      return updatePatientMessage(state, action);
     case GET_HOSPITAL_MESSAGE:
-      return updateHospitalMessage(state,action);
+      return updateHospitalMessage(state, action);
     case SETINITPATINFO:
       return setPatInfo(state, action);
     case SETMEDICALNAME:
       return setMedicalName(state, action);
     case CLEARMEDICALNAME:
       return clearMedicalName(state, action);
+    case REINITPATINFO:
+      return reInitPatInfo(state, action);
     default:
       return state;
   }

src/store/reducers/personalHistory.js

@@ -1,9 +1,5 @@
-import {
-  SETPERSONALTEXTMODEVALUE
-} from '../types/personalHistory';
-import {
-  setTextModeValue
-} from '../actions/personalHistory';
+import { SETPERSONALTEXTMODEVALUE, REPERSONTEXTDATA } from '../types/personalHistory';
+import { setTextModeValue, rePersonalData } from '../actions/personalHistory';
 import config from '@config/index';
 const block = Object.assign(JSON.parse(config.textLabel), { full: true });//空白时保留一个自由文本标签
 const initState = {
@@ -20,6 +16,8 @@ export default function (state = initState, action) {//console.log(state)
   switch (action.type) {
     case SETPERSONALTEXTMODEVALUE:
       return setTextModeValue(state, action);
+    case REPERSONTEXTDATA:
+      return rePersonalData(state, action);
     default:
       return res;
   }

src/store/types/assistCheck.js

@@ -6,3 +6,6 @@ export const CHANGE_DATE = 'CHANGE_DATE';
 export const CLEAR_ASSIST_DATA = 'CLEAR_ASSIST_DATA';
 export const ADD_ASSIST_LABEL = 'ADD_ASSIST_LABEL';
 export const CHECK_OFF_ON = 'CHECK_OFF_ON';
+
+
+export const REASSISTCHECKDATA = 'REASSISTCHECKDATA';

src/store/types/checkBody.js

@@ -23,3 +23,5 @@ export const RECOVER_TAG_CHECK = 'RECOVER_TAG_CHECK';     //恢复已删除标
 export const DELETE_CHECK_SELECTED_TAGS='DELETE_CHECK_SELECTED_TAGS';
 export const REPUSH_CHECK_LABELS = 'REPUSH_CHECK_LABELS';   //重新获取查体
 export const SETCHECKTEXTMODEVALUE = 'SET_CHECK_TEXT_MODE_VALUE';  //文本模式下输入值
+
+export const RECHECKBODYTEXTDATA = 'RECHECKBODYTEXTDATA';

src/store/types/currentIll.js

@@ -32,3 +32,4 @@ export const RECOVER_TAG_CURRENT = 'RECOVER_TAG_CURRENT';     //恢复已删除
 export const SHOW_COMMON_ON_CURRENT = 'SHOW_COMMON_ON_CURRENT';     //现病史中显示常用症状
 export const DELETE_CURRENT_SELECTED_TAGS='DELETE_CURRENT_SELECTED_TAGS';
 
+export const RECURRENTDATA = 'RECURRENTDATA';

src/store/types/diagnosticList.js

@@ -19,3 +19,4 @@ export const SHOW_LOADING = 'SHOW_LOADING';    //显示loading
 export const ADD_TREAT = Symbol('ADD_TREAT') ;   //设置治疗
 
 
+export const REDIAGDATA = 'REDIAGDATA';

src/store/types/familyHistory.js

@@ -1 +1,5 @@
 export const SETFAMILYTEXTMODEVALUE = 'SET_FAMILY_TEXT_MODE_VALUE';  //文本模式下输入值
+
+
+
+export const REFAMILYTEXTDATA = 'REFAMILYTEXTDATA';

src/store/types/inspect.js

@@ -16,3 +16,6 @@ export const SET_TIP = 'SET_TIP';
 export const SEARCH_TYPE = 'SEARCH_TYPE';
 export const DEL_ONE_PIC = 'DEL_ONE_PIC';
 export const CHECK_ON_OFF = 'CHECK_ON_OFF';
+
+
+export const REINSPECTDATA = 'REINSPECTDATA';

src/store/types/mainSuit.js

@@ -33,3 +33,6 @@ export const MAIN_REMOVE_SPAN = 'MAIN_REMOVE_SPAN';   //删除最后一个空spa
 export const SET_ADD_SEARCH = 'SET_ADD_SEARCH';   //添加症状-搜索
 export const CLEAR_ADD_SEARCH = 'CLEAR_ADD_SEARCH';   //添加症状-搜索
 export const DELETE_MAIN_SELECTED_TAGS='DELETE_MAIN_SELECTED_TAGS';
+
+
+export const REMAINSUITDATA = 'REMAINSUITDATA';

src/store/types/marriageHistory.js

@@ -1 +1,5 @@
-export const SETMARRIAGETEXTMODEVALUE = 'SET_MARRIAGE_TEXT_MODE_VALUE';  //文本模式下输入值 
+export const SETMARRIAGETEXTMODEVALUE = 'SET_MARRIAGE_TEXT_MODE_VALUE';  //文本模式下输入值 
+
+
+
+export const REMARRIAGETEXTDATA = 'REMARRIAGETEXTDATA';

src/store/types/menstruationHistory.js

@@ -1 +1,4 @@
-export const SETMENSTRUATIONTEXTMODEVALUE = 'SET_MENSTRUATION_TEXT_MODE_VALUE';  //文本模式下输入值
+export const SETMENSTRUATIONTEXTMODEVALUE = 'SET_MENSTRUATION_TEXT_MODE_VALUE';  //文本模式下输入值
+
+
+export const REMENSTRUATIONTEXTDATA = 'REMENSTRUATIONTEXTDATA';

src/store/types/newAdvice.js

@@ -16,3 +16,6 @@ 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 RENEWADVICEDATA = 'RENEWADVICEDATA';

src/store/types/pastHistory.js

@@ -1 +1,3 @@
-export const SETPASTTEXTMODEVALUE = 'SET_PAST_TEXT_MODE_VALUE';  //文本模式下输入值
+export const SETPASTTEXTMODEVALUE = 'SET_PAST_TEXT_MODE_VALUE';  //文本模式下输入值
+
+export const REPASTTEXTDATA = 'REPASTTEXTDATA';

src/store/types/patInfo.js

@@ -2,4 +2,5 @@ export const GET_PATIENT_MESSAGE = 'GET_PATIENT_MESSAGE'
 export const GET_HOSPITAL_MESSAGE = 'GET_HOSPITAL_MESSAGE'
 export const SETINITPATINFO = 'SET_INITPAT_INFO'
 export const SETMEDICALNAME = 'SET_MEDICAL_NAME'
-export const CLEARMEDICALNAME = 'CLEAR_MEDICAL_NAME'
+export const CLEARMEDICALNAME = 'CLEAR_MEDICAL_NAME'
+export const REINITPATINFO = 'REINITPATINFO';

src/store/types/personalHistory.js

@@ -1 +1,3 @@
-export const SETPERSONALTEXTMODEVALUE = 'SET_PERSONAL_TEXT_MODE_VALUE';  //文本模式下输入值
+export const SETPERSONALTEXTMODEVALUE = 'SET_PERSONAL_TEXT_MODE_VALUE';  //文本模式下输入值
+
+export const REPERSONTEXTDATA = 'REPERSONTEXTDATA';

src/utils/tools.js

@@ -1,11 +1,20 @@
 import store from '@store';
-import {CLEAR_MAIN_SUIT,CLEAR_SEARCH} from '@store/types/mainSuit';
-import {CLEAR_CURRENT_ILL,CURRENT_CLEAR} from '@store/types/currentIll';
+import { REINITPATINFO } from '@store/types/patInfo';
+import { CLEAR_MAIN_SUIT, CLEAR_SEARCH, REMAINSUITDATA } from '@store/types/mainSuit';
+import { CLEAR_CURRENT_ILL, CURRENT_CLEAR, RECURRENTDATA } from '@store/types/currentIll';
+import { REPASTTEXTDATA } from '@store/types/pastHistory';
+import { REPERSONTEXTDATA } from '@store/types/personalHistory';
+import { REFAMILYTEXTDATA } from '@store/types/familyHistory';
+import { REMARRIAGETEXTDATA } from '@store/types/marriageHistory';
+import { REMENSTRUATIONTEXTDATA } from '@store/types/menstruationHistory';
+import { REINSPECTDATA } from '@store/types/inspect';
+import { REASSISTCHECKDATA } from '@store/types/assistCheck';
+import { RENEWADVICEDATA } from '@store/types/newAdvice';
 import {CLEAROTHERHISTORY,OTHERHIS_CLEAR} from '@store/types/otherHistory';
-import {CLEARCHECKBODY,SET,CHECKBODY_CLEAR} from '@store/types/checkBody';
+import { CLEARCHECKBODY, SET, CHECKBODY_CLEAR, RECHECKBODYTEXTDATA } from '@store/types/checkBody';
 import {clearAssistData,addAssistLabel} from '@store/actions/assistCheck';
-import {clearAllLabel,addLabel} from '@store/actions/inspect';
-import {CLEAR_ALL_DIAG} from '@store/types/diagnosticList';
+import { clearAllLabel, addLabel} from '@store/actions/inspect';
+import { CLEAR_ALL_DIAG, REDIAGDATA } from '@store/types/diagnosticList';
 import {CLEAR_ALL_PUSH_MESSAGE, SET_TIPS,BILLING_ADVICE,PUSHCHANGE,SET_MR_ANALYSE} from '@store/types/pushMessage';
 import {ISREAD, SETREADDITEMS,SET_SELECTED_AREA,SET_CURRENT_MODULE} from "../store/types/homePage";
 import {CLEAR_FIRST_MAIN_DIAG, CLEAR_ALL_TREAT} from "../store/types/treat";
@@ -18,6 +27,7 @@ import down from '@images/down.png';
 import $ from 'jquery';
 import {CLEAR_SEARCH_PARAM} from "../store/types/print";
 
+
 /***
  * 工具函数
  *
@@ -173,6 +183,17 @@ const formatTextInfo = (baseList) =>{
   labelList.labelListBig = baseList.inspect.labelListBig;
   console.log(labelList, 'labelList========');
 
+  let assistLabelList = {
+    dataString: baseList.assistCheck.dataString,
+    assistLabel: baseList.assistCheck.assistLabel,
+  };
+
+  let diagnosticList = {
+    diagnosticList: baseList.diagnosticList.diagnosticList,
+    diagnosticStrNoType: baseList.diagnosticList.diagnosticStrNoType,
+    diagnosticStr: baseList.diagnosticList.diagnosticStr,
+  };
+
   return {
     chief: JSON.stringify(baseList.mainSuit.saveText),
     present: JSON.stringify(baseList.currentIll.saveText),
@@ -182,14 +203,86 @@ const formatTextInfo = (baseList) =>{
     marriageHistory: JSON.stringify(baseList.marriageHistory.saveText),
     menstruationHistory: JSON.stringify(baseList.menstruationHistory.saveText),
     vital: JSON.stringify(baseList.checkBody.saveText),
-    //  'lis': baseList.inspect.labelListSmall,  // 化验
-    lis: labelList, // 化验
-    pacs: baseList.assistCheck.dataString,
-    diag: baseList.diagnosticList.diagnosticStr,
-    advice: baseList.newAdvice.labelListSmall,
+    lis: inspectLabelList, // 化验
+    pacs: assistLabelList,
+    diag: diagnosticList,
+    advice: newAdviceLabelList,
   };
 }
 
+// 回读数据_lcq_2020.08.17
+const pushHistoryDataList = (reData) =>{
+ store.getState().inspect.context.scrollArea&&store.getState().inspect.context.scrollArea.scrollTop()
+ let dataJson = JSON.parse(reData.preview)
+  // console.log(dataJson, '=dataJson');
+ // 回显头部表单数据 
+ store.dispatch({
+   type: REINITPATINFO,
+   params: reData,
+ });
+ // 回显 主诉数据
+  store.dispatch({
+    type: REMAINSUITDATA,
+    params: dataJson,
+  });
+
+  // 回显 现病史数据
+  store.dispatch({
+    type: RECURRENTDATA,
+    params: dataJson,
+  });
+
+  // 回显 既往史数据
+  store.dispatch({
+    type: REPASTTEXTDATA,
+    params: dataJson,
+  }); 
+  store.dispatch({
+    type: REPERSONTEXTDATA,
+    params: dataJson,
+  }); 
+  store.dispatch({
+    type: REFAMILYTEXTDATA,
+    params: dataJson,
+  }); 
+  store.dispatch({
+    type: REMARRIAGETEXTDATA,
+    params: dataJson,
+  }); 
+  store.dispatch({
+    type: REMENSTRUATIONTEXTDATA,
+    params: dataJson,
+  }); 
+  store.dispatch({
+    type: RECHECKBODYTEXTDATA,
+    params: dataJson,
+  }); 
+  store.dispatch({
+    type: REINSPECTDATA,
+    params: dataJson,
+  }); 
+  store.dispatch({
+    type: REASSISTCHECKDATA,
+    params: dataJson,
+  }); 
+  store.dispatch({
+    type: REDIAGDATA,
+    params: dataJson,
+  }); 
+  store.dispatch({
+    type: RENEWADVICEDATA,
+    params: dataJson,
+  }); 
+
+  store.dispatch({
+    type: ISREAD,
+  });
+
+}
+
+
+
+
 
 /**
  *