diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java index a95f8d971..51b0b6f12 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java @@ -582,7 +582,10 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService { // 处理长期已发放的药品 if (!longMedDispensedList.isEmpty()) { // 生成退药单 - this.creatRefundMedicationList(tempMedDispensedList, procedureIdMap); + this.creatRefundMedicationList(longMedDispensedList, procedureIdMap); + // 药品退药请求状态变更(待退药) + medicationRequestService.updateCancelledStatusBatch( + longMedDispensedList.stream().map(MedicationDispense::getMedReqId).toList(), null, null); } // 处理临时已发放药品 if (!tempMedDispensedList.isEmpty()) { diff --git a/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/index.vue b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/index.vue index af7f25ae3..18318b138 100755 --- a/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/index.vue +++ b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/index.vue @@ -111,6 +111,7 @@ function handleClick(tabName) { break; case 'cancel': exeStatus.value = 9; + requestStatus.value = RequestStatus.CANCELLED; break; }