|
@@ -392,7 +392,7 @@ const closeActOrder = () => {
|
|
|
dismissCalMsg.value = ''
|
|
|
showActOrders.value = false
|
|
|
}
|
|
|
-const executeDismissCalculate = (midSetl, disdate) => {
|
|
|
+const executeDismissCalculate = (midSetl, disdate, sortNo) => {
|
|
|
showPreDischargeErrors.value = false
|
|
|
dismissCalculate(patient.value).then(() => {
|
|
|
settleApply.value.patNo = patient.value.inpatientNo
|
|
@@ -403,6 +403,7 @@ const executeDismissCalculate = (midSetl, disdate) => {
|
|
|
settleApply.value.acctUsedFlag = '0'
|
|
|
settleApply.value.deathFlag = patient.value.deathFlag
|
|
|
settleApply.value.inputComment = midSetl ? null : '医嘱离院。'
|
|
|
+ settleApply.value.sortNo = sortNo
|
|
|
showSettleApplyForm.value = true
|
|
|
}).catch((res2) => {
|
|
|
if (res2.code && res2.code === 1004) {
|
|
@@ -429,12 +430,12 @@ const cancelDischarge = () => {
|
|
|
setlDatetime.value = ''
|
|
|
}
|
|
|
|
|
|
-const preDischarge = (midSetl, settleDatetime) => {
|
|
|
+const preDischarge = (midSetl, settleDatetime, sortNo) => {
|
|
|
if (midSetl) {
|
|
|
- executeDismissCalculate(midSetl, settleDatetime)
|
|
|
+ executeDismissCalculate(midSetl, settleDatetime, sortNo)
|
|
|
} else {
|
|
|
powersiPreDischarge(makeVisitId()).then(() => {
|
|
|
- executeDismissCalculate(midSetl, settleDatetime)
|
|
|
+ executeDismissCalculate(midSetl, settleDatetime, sortNo)
|
|
|
}).catch((e) => {
|
|
|
setlDatetime.value = settleDatetime
|
|
|
preDischargeErrors.value = e.data
|
|
@@ -467,11 +468,11 @@ const beforeSettle = (midSetl) => {
|
|
|
closeOnPressEscape: false
|
|
|
}).then(() => {
|
|
|
patient.value.deathFlag = false
|
|
|
- preDischarge(midSetl, res.settleDatetime)
|
|
|
+ preDischarge(midSetl, res.settleDatetime, res.sortNo)
|
|
|
}).catch((action) => {
|
|
|
if (action === 'cancel') {
|
|
|
patient.value.deathFlag = true
|
|
|
- preDischarge(midSetl, res.settleDatetime)
|
|
|
+ preDischarge(midSetl, res.settleDatetime, res.sortNo)
|
|
|
}
|
|
|
})
|
|
|
} else {
|
|
@@ -513,10 +514,10 @@ const beforeSettle = (midSetl) => {
|
|
|
cancelButtonText: '患者已死亡'
|
|
|
}).then(() => {
|
|
|
patient.value.deathFlag = false
|
|
|
- executeDismissCalculate(midSetl, res.settleDatetime)
|
|
|
+ executeDismissCalculate(midSetl, res.settleDatetime, res.sortNo)
|
|
|
}).catch(() => {
|
|
|
patient.value.deathFlag = true
|
|
|
- executeDismissCalculate(midSetl, res.settleDatetime)
|
|
|
+ executeDismissCalculate(midSetl, res.settleDatetime, res.sortNo)
|
|
|
})
|
|
|
}
|
|
|
})
|