|
@@ -257,9 +257,12 @@ const pushAllDataList =(whichSign,action,reData,type) =>{ //回读清
|
|
// Notify.success('页面已清空')
|
|
// Notify.success('页面已清空')
|
|
}else{
|
|
}else{
|
|
if (whichSign == 0) {
|
|
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);
|
|
if(type == 'template'){ //结构化模板回读
|
|
if(type == 'template'){ //结构化模板回读
|
|
- let dataJson = JSON.parse(reData.dataJson);
|
|
|
|
- let dataJsonStr = JSON.parse(reData.preview);
|
|
|
|
|
|
+ let dataJsonStr = JSON.parse(reData.preview);
|
|
// console.log(dataJson,dataJsonStr,'结构化模板引用')
|
|
// console.log(dataJson,dataJsonStr,'结构化模板引用')
|
|
store.dispatch({
|
|
store.dispatch({
|
|
type: CLEAR_MAIN_SUIT,
|
|
type: CLEAR_MAIN_SUIT,
|
|
@@ -279,7 +282,7 @@ const pushAllDataList =(whichSign,action,reData,type) =>{ //回读清
|
|
type: CLEAROTHERHISTORY,
|
|
type: CLEAROTHERHISTORY,
|
|
data:dataJson.other,
|
|
data:dataJson.other,
|
|
selecteds:dataJson.otherHistorySelecteds?dataJson.otherHistorySelecteds:[],
|
|
selecteds:dataJson.otherHistorySelecteds?dataJson.otherHistorySelecteds:[],
|
|
- isEmpty:dataJson.otherHistoryIsEmpty,
|
|
|
|
|
|
+ isEmpty:onlyOneText?true:false,//dataJson.otherHistoryIsEmpty,
|
|
saveText:JSON.parse(dataJsonStr.other),
|
|
saveText:JSON.parse(dataJsonStr.other),
|
|
editClear:dataJson.other.length>0?false:true
|
|
editClear:dataJson.other.length>0?false:true
|
|
});
|
|
});
|
|
@@ -312,9 +315,9 @@ const pushAllDataList =(whichSign,action,reData,type) =>{ //回读清
|
|
data:dataJson.addItems
|
|
data:dataJson.addItems
|
|
});
|
|
});
|
|
}else{ //结构化历史病历回读
|
|
}else{ //结构化历史病历回读
|
|
- let dataJson = JSON.parse(reData.dataJson);
|
|
|
|
|
|
+ /*let dataJson = JSON.parse(reData.dataJson);*/
|
|
let dataJsonStr = reData.detailList;
|
|
let dataJsonStr = reData.detailList;
|
|
- // console.log(dataJson,dataJsonStr,'结构化历史病历回读')
|
|
|
|
|
|
+ // console.log(dataJson,dataJsonStr,'结构化历史病历回读')
|
|
// console.log(dataJson.mainSuitSelecteds,7887)
|
|
// console.log(dataJson.mainSuitSelecteds,7887)
|
|
store.dispatch({
|
|
store.dispatch({
|
|
type: CLEAR_MAIN_SUIT,
|
|
type: CLEAR_MAIN_SUIT,
|
|
@@ -335,7 +338,7 @@ const pushAllDataList =(whichSign,action,reData,type) =>{ //回读清
|
|
data:dataJson.other,
|
|
data:dataJson.other,
|
|
selecteds:dataJson.otherHistorySelecteds?dataJson.otherHistorySelecteds:[],
|
|
selecteds:dataJson.otherHistorySelecteds?dataJson.otherHistorySelecteds:[],
|
|
saveText:dataJsonStr[2].content ? JSON.parse(dataJsonStr[2].content):[],
|
|
saveText:dataJsonStr[2].content ? JSON.parse(dataJsonStr[2].content):[],
|
|
- isEmpty:dataJson.otherHistoryIsEmpty,
|
|
|
|
|
|
+ isEmpty:onlyOneText?true:false,//dataJson.otherHistoryIsEmpty,回读回来后判断是否只有一个空标签,是的话要使用模板
|
|
editClear:dataJson.other.length>0?false:true
|
|
editClear:dataJson.other.length>0?false:true
|
|
});
|
|
});
|
|
store.dispatch({
|
|
store.dispatch({
|