From 3472aa790ec4b818db46759d6b106517d02e1797 Mon Sep 17 00:00:00 2001 From: guanyu Date: Wed, 29 Apr 2026 17:40:13 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D#436=E6=89=8B=E6=9C=AF?= =?UTF-8?q?=E8=AE=A1=E8=B4=B9=E7=95=8C=E9=9D=A2=E6=98=BE=E7=A4=BA=E6=97=A0?= =?UTF-8?q?=E5=85=B3=E8=B4=B9=E7=94=A8=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 根因: 前端按generateSourceEnum和sourceBillNo过滤手术计费项目， 但后端SQL查询和DTO未返回这两个字段，导致过滤失效，显示所有费用项。 修复: 1. EncounterPatientPrescriptionDto添加generateSourceEnum和sourceBillNo字段 2. SQL查询添加T1.generate_source_enum和T1.prescription_no AS source_bill_no --- .../dto/EncounterPatientPrescriptionDto.java | 10 ++++++++++ .../mapper/chargemanage/OutpatientChargeAppMapper.xml | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPrescriptionDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPrescriptionDto.java index 8debe787..005bd353 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPrescriptionDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPrescriptionDto.java @@ -209,4 +209,14 @@ public class EncounterPatientPrescriptionDto { private String discountRate = "0"; private String discountRate_dictText; + /** + * 账单生成来源 + */ + private Integer generateSourceEnum; + + /** + * 来源单据号（手术单号等） + */ + private String sourceBillNo; + } diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientChargeAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientChargeAppMapper.xml index 0bf7f396..3a6ddc45 100644 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientChargeAppMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientChargeAppMapper.xml @@ -76,6 +76,8 @@ T1.quantity_unit, T1.unit_price, T1.total_price, + T1.generate_source_enum, + T1.prescription_no AS source_bill_no, mmr.prescription_no, mmr.method_code AS method_code, mmr.rate_code, @@ -190,6 +192,8 @@ T1.quantity_unit, T1.unit_price, T1.total_price, + T1.generate_source_enum, + T1.prescription_no AS source_bill_no, mmr.prescription_no, mmr.method_code AS method_code, mmr.rate_code,