diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentDto.java index 3d5e9549..dbb37d7f 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentDto.java @@ -147,6 +147,12 @@ public class DiagnosisTreatmentDto { /** 费用套餐名称(JOIN inspection_basic_information.package_name) */ private String packageName; + /** 套餐金额(JOIN inspection_basic_information.package_amount) */ + private BigDecimal packageAmount; + + /** 套餐服务费(JOIN inspection_basic_information.service_fee) */ + private BigDecimal serviceFee; + /** 下级医技类型ID(关联 inspection_type 子类) */ @JsonSerialize(using = ToStringSerializer.class) private Long subItemId; diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/LabActivityDefinitionManageMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/LabActivityDefinitionManageMapper.xml index 5caaa144..c2ecdd48 100644 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/LabActivityDefinitionManageMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/LabActivityDefinitionManageMapper.xml @@ -35,6 +35,8 @@ T1.sub_item_id, T3.name AS test_type, T5.package_name, + T5.package_amount, + T5.service_fee, T6.name AS sub_item_name FROM lab_activity_definition T1 /* 检验类型关联(逻辑关联,无外键) */ @@ -97,6 +99,8 @@ T1.sub_item_id, T3.name AS test_type, T5.package_name, + T5.package_amount, + T5.service_fee, T6.name AS sub_item_name FROM lab_activity_definition T1 LEFT JOIN inspection_type T3 diff --git a/openhis-ui-vue3/src/views/doctorstation/components/inspection/inspectionApplication.vue b/openhis-ui-vue3/src/views/doctorstation/components/inspection/inspectionApplication.vue index d6b21fe4..a1042405 100644 --- a/openhis-ui-vue3/src/views/doctorstation/components/inspection/inspectionApplication.vue +++ b/openhis-ui-vue3/src/views/doctorstation/components/inspection/inspectionApplication.vue @@ -1,28 +1,25 @@ - - - - - - 保存 - - - - 新增 - - + + - - - 检验信息 - + + 检验信息 + + + 保存 + + + 新增 + + + - + - - + - + + + + + + {{ item.itemName }} ¥{{ item.itemPrice }} 删除 - - - + + + + + + + 加载中... + + + + {{ detail.itemName }} + ¥{{ detail.unitPrice || 0 }} + + + 暂无明细 + + + @@ -546,15 +573,16 @@