diff --git a/openhis-ui-vue3/src/views/clinicmanagement/bargain/component/prescriptionlist.vue b/openhis-ui-vue3/src/views/clinicmanagement/bargain/component/prescriptionlist.vue index 9adbfb4d2..8a66146ee 100755 --- a/openhis-ui-vue3/src/views/clinicmanagement/bargain/component/prescriptionlist.vue +++ b/openhis-ui-vue3/src/views/clinicmanagement/bargain/component/prescriptionlist.vue @@ -461,6 +461,10 @@ watch( console.log(prescriptionList.value,"prescriptionList.value") if(newValue&&newValue.length>0){ let saveList = prescriptionList.value.filter((item) => { + // 手术计费场景(generateSourceEnum=6)不限制 bizRequestFlag + if (isSurgeryChargeBillingContext()) { + return item.check && item.statusEnum == 1 + } return item.check && item.statusEnum == 1&&(Number(item.bizRequestFlag)==1||!item.bizRequestFlag) }) console.log(saveList,"prescriptionList.value") @@ -1025,7 +1029,9 @@ function changeCheck(value,index,row){ groupList.value.map(k=>{ if(k.check){ if(k.statusEnum == 1){//待签发 - if(Number(k.bizRequestFlag)==1||!k.bizRequestFlag){ + // 手术计费场景(generateSourceEnum=6)不限制 bizRequestFlag + const bizAllowed = isSurgeryChargeBillingContext() || Number(k.bizRequestFlag)==1||!k.bizRequestFlag + if(bizAllowed){ if(handleSaveDisabled.value&&!handleSingOutDisabled.value&&groupList.value.length>1){ proxy.$modal.msgWarning('请选择相同的状态的项目进行操作') return @@ -1040,7 +1046,9 @@ function changeCheck(value,index,row){ } } if(k.statusEnum == 2){ //已签发 - if(Number(k.bizRequestFlag)==1||!k.bizRequestFlag){ + // 手术计费场景(generateSourceEnum=6)不限制 bizRequestFlag + const bizAllowed = isSurgeryChargeBillingContext() || Number(k.bizRequestFlag)==1||!k.bizRequestFlag + if(bizAllowed){ if(!handleSaveDisabled.value&&handleSingOutDisabled.value&&groupList.value.length>1){ proxy.$modal.msgWarning('请选择相同的状态的项目进行操作') return @@ -1067,6 +1075,11 @@ function handleSave() { return; } let saveList = prescriptionList.value.filter((item) => { + // 手术计费场景(generateSourceEnum=6)不限制 bizRequestFlag,允许任何授权用户签发 + // 门诊划价场景保留 bizRequestFlag 限制,只能操作本人开立的医嘱 + if (isSurgeryChargeBillingContext()) { + return item.check && item.statusEnum == 1 + } return item.check && item.statusEnum == 1&&(Number(item.bizRequestFlag)==1||!item.bizRequestFlag) }); // let saveList = prescriptionList.value @@ -1185,6 +1198,10 @@ function handleSingOut() { return item.check; }) .filter((item) => { + // 手术计费场景(generateSourceEnum=6)不限制 bizRequestFlag + if (isSurgeryChargeBillingContext()) { + return item.statusEnum == 2 && item.chargeStatus != 5 + } return item.statusEnum == 2 && item.chargeStatus != 5 && (Number(item.bizRequestFlag)==1||!item.bizRequestFlag) }) .map((item) => {