|
@@ -157,7 +157,7 @@ const pushAllDataList =(whichSign,action,reData,type) =>{ //回读清
|
|
|
const block = Object.assign(JSON.parse(config.textLabel),{full:true});//空白时保留一个自由文本标签
|
|
|
//清除已删除标签记录
|
|
|
localStorage.removeItem('deletedTags');
|
|
|
- store.dispatch({type: SET_READ_MODE, readMode: -1}); //清除回读模式值
|
|
|
+ store.dispatch({type: SET_READ_MODE, readMode: -1,readConfig:-1}); //清除回读模式值
|
|
|
store.dispatch({type: CLEAR_MAIN_SUIT,data:[],saveText:[],editClear:true,mainIds:[],mainTailIds:[],clearAction:true,symptomFeature:[],chronicDesease:null,mainReadSonM:[]});
|
|
|
store.dispatch({type: CLEAR_CURRENT_ILL,data:[],saveText:[],editClear:true,symptomIds:[],currReadSonM:[]});
|
|
|
store.dispatch({type: CLEAROTHERHISTORY,data:[block],isEmpty:true,saveText:[],editClear:true,yjs_1:'',yjs_2:'',yjs_3:'',yjs_4:''});
|
|
@@ -231,10 +231,11 @@ const pushAllDataList =(whichSign,action,reData,type) =>{ //回读清
|
|
|
isText:true, //查体只显示文本
|
|
|
});
|
|
|
}else{
|
|
|
+ let dataJson = JSON.parse(reData.dataJson);
|
|
|
+ const docConfig = dataJson.docConfigs;
|
|
|
//回读/引用设置回读模式值(主诉-其他史使用)
|
|
|
- store.dispatch({type: SET_READ_MODE, readMode: whichSign});
|
|
|
+ store.dispatch({type: SET_READ_MODE, readMode: whichSign,readConfig:docConfig});
|
|
|
if (whichSign == 0) {
|
|
|
- let dataJson = JSON.parse(reData.dataJson);
|
|
|
//其他史data
|
|
|
const oData = dataJson.other;
|
|
|
const onlyOneText = oData.length==1&&oData[0].tagType==8&&!(oData[0].name||oData[0].value);
|
|
@@ -368,7 +369,7 @@ const pushAllDataList =(whichSign,action,reData,type) =>{ //回读清
|
|
|
}
|
|
|
} else {
|
|
|
if(type == 'template'){ //纯文本模板回读
|
|
|
- let dataJson = JSON.parse(reData.dataJson);
|
|
|
+ //let dataJson = JSON.parse(reData.dataJson);
|
|
|
let dataJsonStr = JSON.parse(reData.preview);
|
|
|
// console.log(dataJson,dataJsonStr,'纯文本模板引用')
|
|
|
store.dispatch({ //主诉文本框
|
|
@@ -422,7 +423,7 @@ const pushAllDataList =(whichSign,action,reData,type) =>{ //回读清
|
|
|
//tab跳回辅助信息
|
|
|
store.dispatch(tabChange('0'));
|
|
|
}else{ //纯文本历史病历回读
|
|
|
- let dataJson = JSON.parse(reData.dataJson);
|
|
|
+ //let dataJson = JSON.parse(reData.dataJson);
|
|
|
let dataJsonStr = reData.detailList;
|
|
|
// console.log(dataJson,dataJsonStr,'纯文本历史病历回读')
|
|
|
if(!dataJson && !dataJsonStr && !reData.sign){
|
|
@@ -764,7 +765,7 @@ function getCurrentDate(flg,con){
|
|
|
}
|
|
|
function inspectAndAssist(){
|
|
|
const state = store.getState();
|
|
|
- let mainType = state.typeConfig.typeConfig
|
|
|
+ let mainType = state.typeConfig.mode
|
|
|
if(mainType == 1){return}//文本模式不放化验辅检的模板
|
|
|
let tmpAll = state.homePage.allModules;
|
|
|
let tmpInspected = state.inspect.labelList;
|