|
@@ -1416,7 +1416,7 @@ export default {
|
|
|
this.isTuiDaoZy = true;
|
|
this.isTuiDaoZy = true;
|
|
|
}
|
|
}
|
|
|
// 处方编辑 recipeType
|
|
// 处方编辑 recipeType
|
|
|
- else if (this.getEditPreNo()) await this.getRecipeDataByid(this.getEditPreNo());
|
|
|
|
|
|
|
+ else if (query.from !== 'his' && this.getEditPreNo()) await this.getRecipeDataByid(this.getEditPreNo());
|
|
|
// 暂存处方
|
|
// 暂存处方
|
|
|
else if (sessionStorage.getItem("prescr" + this.getPatiensInfo.pid)) await this._showDataFromStorage();
|
|
else if (sessionStorage.getItem("prescr" + this.getPatiensInfo.pid)) await this._showDataFromStorage();
|
|
|
// 历史处方
|
|
// 历史处方
|
|
@@ -1425,6 +1425,7 @@ export default {
|
|
|
let res = await getPreNumber({pid: this.getPatiensInfo.pid}).catch(() => void 0);
|
|
let res = await getPreNumber({pid: this.getPatiensInfo.pid}).catch(() => void 0);
|
|
|
const has = res && res.ResultCode == 0 && res.Data.length > 0;
|
|
const has = res && res.ResultCode == 0 && res.Data.length > 0;
|
|
|
if (has) await this.getRecipeShowData();
|
|
if (has) await this.getRecipeShowData();
|
|
|
|
|
+ else if (this.getEditPreNo()) await this.getRecipeDataByid(this.getEditPreNo());
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
// 参考医案
|
|
// 参考医案
|