|
@@ -241,7 +241,7 @@ const pushAllDataList =(whichSign,action,reData,type) =>{ //回读清
|
|
const block = Object.assign(JSON.parse(config.textLabel),{full:true});//空白时保留一个自由文本标签
|
|
const block = Object.assign(JSON.parse(config.textLabel),{full:true});//空白时保留一个自由文本标签
|
|
store.dispatch({type: CLEAR_MAIN_SUIT,data:[],saveText:[],selecteds:[],editClear:true,mainIds:[]});
|
|
store.dispatch({type: CLEAR_MAIN_SUIT,data:[],saveText:[],selecteds:[],editClear:true,mainIds:[]});
|
|
store.dispatch({type: CLEAR_CURRENT_ILL,data:[],saveText:[],selecteds:[],editClear:true,symptomIds:[]});
|
|
store.dispatch({type: CLEAR_CURRENT_ILL,data:[],saveText:[],selecteds:[],editClear:true,symptomIds:[]});
|
|
- store.dispatch({type: CLEAROTHERHISTORY,data:[block],isEmpty:true,saveText:[],selecteds:[],editClear:true});
|
|
|
|
|
|
+ store.dispatch({type: CLEAROTHERHISTORY,data:[block],isEmpty:true,saveText:[],selecteds:[],editClear:true,yjs_1:'',yjs_2:'',yjs_3:'',yjs_4:''});
|
|
store.dispatch({type: CLEARCHECKBODY,data:[block],isEmpty:true,saveText:[],selecteds:[]});
|
|
store.dispatch({type: CLEARCHECKBODY,data:[block],isEmpty:true,saveText:[],selecteds:[]});
|
|
store.dispatch(clearAssistData([],''));
|
|
store.dispatch(clearAssistData([],''));
|
|
store.dispatch(clearAllLabel([],[],''));
|
|
store.dispatch(clearAllLabel([],[],''));
|
|
@@ -538,6 +538,9 @@ function filterOtherDataArr(arrTmp,jsonArr){
|
|
let index4 = jsonArr.findIndex((item)=>{
|
|
let index4 = jsonArr.findIndex((item)=>{
|
|
return item.formulaCode=='yjs_4';
|
|
return item.formulaCode=='yjs_4';
|
|
});
|
|
});
|
|
|
|
+ if(index1==-1&&index2==-1&&index3==-1&&index4==-1){//无月经史
|
|
|
|
+ return {str1:filterDataArr(arrTmp),str2:''};
|
|
|
|
+ }
|
|
tmpArr = arrTmp.map((it,i)=>{ //连续的标点符号保留第一个
|
|
tmpArr = arrTmp.map((it,i)=>{ //连续的标点符号保留第一个
|
|
if(!it.match(config.punctuationReg)&&!arrTmp[i-1]||[index1,index2,index3,index4].includes(i)){ //只有标点符号或者前一个标签无值是(说明本标点灰显,不显示在预览中)
|
|
if(!it.match(config.punctuationReg)&&!arrTmp[i-1]||[index1,index2,index3,index4].includes(i)){ //只有标点符号或者前一个标签无值是(说明本标点灰显,不显示在预览中)
|
|
return '';
|
|
return '';
|