|
@@ -250,7 +250,6 @@ import {
|
|
|
confirmOrders, copyOrder,
|
|
|
enterOrders,
|
|
|
getOrderNo,
|
|
|
- getParentOrders,
|
|
|
huoQuFeiYongXinXi,
|
|
|
huoQuXiangMu,
|
|
|
huoQuZhiXinKeShi,
|
|
@@ -283,7 +282,7 @@ import {
|
|
|
frequencyConfig,
|
|
|
addTempOrderNo,
|
|
|
yiZhuDataInit,
|
|
|
- setOrderDataAndTwinkle
|
|
|
+ setOrderDataAndTwinkle, feeKey
|
|
|
} from "@/views/hospitalization/zhu-yuan-yi-sheng/public-js/zhu-yuan-yi-sheng";
|
|
|
import {ElMessageBox} from "element-plus";
|
|
|
import YzDialog from "@/components/zhu-yuan-yi-sheng/yi-zhu-lu-ru/dialog/YzDialog";
|
|
@@ -349,9 +348,8 @@ const xuanZhongFeiYong = async (row, laiyuan = 1) => {
|
|
|
// 00 是项目
|
|
|
if (row.serial !== '00') {
|
|
|
try {
|
|
|
- let queryKey = row.orderCode + '_' + row.serial + '_' + props.patientInfo.zkWard + '_' + queryParam.value.groupNo + "_" + yiZhuData.value.superiorDoctor
|
|
|
- let res = await huoQuFeiYongXinXi(queryKey)
|
|
|
-
|
|
|
+ let queryKey2 = feeKey(row.orderCode, row.serial, props.patientInfo.zkWard, queryParam.value.groupNo, yiZhuData.value.superiorDoctor, yiZhuData.value.statusFlag)
|
|
|
+ let res = await huoQuFeiYongXinXi(queryKey2)
|
|
|
if (res.permissionPrompt) {
|
|
|
let authorization = await yzMitt.emit('openDoctorAuthoriztion', row.orderCode + '_' + row.serial)
|
|
|
yiZhuData.value.superiorDoctor = authorization.code
|
|
@@ -423,8 +421,8 @@ const xuanZhongFeiYong = async (row, laiyuan = 1) => {
|
|
|
} else {
|
|
|
yiZhuData.value.kjywFlag = 0
|
|
|
try {
|
|
|
- let queryKey = row.orderCode + '_' + '00' + '_' + props.patientInfo.zkWard + '_' + queryParam.value.groupNo + "_" + yiZhuData.value.superiorDoctor
|
|
|
- let res = await huoQuFeiYongXinXi(queryKey)
|
|
|
+ let queryKey2 = feeKey(row.orderCode, '00', props.patientInfo.zkWard, queryParam.value.groupNo, yiZhuData.value.superiorDoctor, yiZhuData.value.statusFlag)
|
|
|
+ let res = await huoQuFeiYongXinXi(queryKey2)
|
|
|
tiShiBiaoTi.value = res.prompt
|
|
|
if (newData) {
|
|
|
openTheOrderPopUpWindow('请输入处置医嘱名')
|
|
@@ -447,8 +445,7 @@ const xuanZhongFeiYong = async (row, laiyuan = 1) => {
|
|
|
}
|
|
|
if (newData) {
|
|
|
// 判断这个是不是 新添加的数据 如果是空的就是 新数据
|
|
|
- let serverDate = await getServerDateApi()
|
|
|
-
|
|
|
+ let serverDate = await getServerDateApi();
|
|
|
if (!yiZhuData.value.orderTime) {
|
|
|
yiZhuData.value.orderTime = serverDate
|
|
|
}
|
|
@@ -565,13 +562,18 @@ const metZhiXingKeShi = (val) => {
|
|
|
const fuYiZhuData = ref([])
|
|
|
const fuYiZhuClick = async () => {
|
|
|
fuYiZhuData.value = []
|
|
|
- fuYiZhuData.value = await getParentOrders(props.patientInfo.inpatientNo, props.patientInfo.admissTimes)
|
|
|
- let tempIndex = fuYiZhuData.value.findIndex(item => {
|
|
|
- return item.actOrderNo == yiZhuData.value.actOrderNo
|
|
|
+
|
|
|
+ XEUtils.lastArrayEach(yzData.value, (item) => {
|
|
|
+ let {statusFlag, serial, parentNo, drugFlag, actOrderNo} = item
|
|
|
+ if (statusFlag === '1') {
|
|
|
+ if ( serial !== '00' && stringIsBlank(parentNo) && drugFlag !== 'd'){
|
|
|
+ if (yiZhuData.value.actOrderNo !== actOrderNo) {
|
|
|
+ fuYiZhuData.value.push(item)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
})
|
|
|
- if (tempIndex > -1) {
|
|
|
- fuYiZhuData.value.splice(tempIndex, 1)
|
|
|
- }
|
|
|
+
|
|
|
}
|
|
|
|
|
|
const modifyDosingMethod = (val) => {
|