From 87e6850f67187f7f27b4b2c84ac24b566d756918 Mon Sep 17 00:00:00 2001 From: xunyu Date: Sat, 2 May 2026 19:05:47 +0800 Subject: [PATCH] =?UTF-8?q?fix(#439,#452,#464):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E9=A2=86=E7=94=A8=E5=87=BA=E5=BA=93=E5=BA=93=E5=AD=98=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=92=8C=E8=AF=8A=E7=96=97=E7=9B=AE=E5=BD=95=E9=9B=B6?= =?UTF-8?q?=E5=94=AE=E4=BB=B7=E5=90=8C=E6=AD=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #439 领用出库选择药品后总库存数量列数据未显示 #452 领用出库模块选择药品时提示仓库数量为0与实际库存不符 - CommonAppMapper.xml: selectInventoryItemInfo的WHERE条件修复 当objLocationId非空时，location_id IN应同时包含orgLocationId和objLocationId 原代码只包含orgLocationId导致obj_quantity永远为0 #464 诊疗目录新增项目时零售价未与诊疗子项合计总价自动同步 - diagnosisTreatmentDialog.vue: submitForm中增加零售价自动同步逻辑 当有子项时，form.retailPrice自动设置为totalPrice（子项合计总价） Author: xunyu --- .../src/main/resources/mapper/common/CommonAppMapper.xml | 2 +- .../components/diagnosisTreatmentDialog.vue | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/common/CommonAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/common/CommonAppMapper.xml index 8358fa85..95599294 100644 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/common/CommonAppMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/common/CommonAppMapper.xml @@ -268,7 +268,7 @@ - AND T1.location_id IN (#{orgLocationId}) + AND T1.location_id IN (#{orgLocationId}, #{objLocationId}) AND T1.location_id = #{orgLocationId} diff --git a/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue b/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue index 92fc19e8..4890f23e 100644 --- a/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue +++ b/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue @@ -646,6 +646,11 @@ async function submitForm() { treatmentItems.value.length > 0 && treatmentItems.value[0].adviceDefinitionId != '' ? JSON.stringify(treatmentItems.value) : undefined; + // Bug #464 修复：零售价自动与诊疗子项合计总价同步 + // 当有子项时，零售价自动设置为子项合计总价 + if (treatmentItems.value.length > 0 && treatmentItems.value[0].adviceDefinitionId != '') { + form.value.retailPrice = parseFloat(totalPrice.value) || 0; + } proxy.$refs['diagnosisTreatmentRef'].validate(async (valid) => { if (valid) { // 医保编码唯一性校验