fix: 修复#436手术计费界面显示无关费用项
根因: 前端按generateSourceEnum和sourceBillNo过滤手术计费项目, 但后端SQL查询和DTO未返回这两个字段,导致过滤失效,显示所有费用项。 修复: 1. EncounterPatientPrescriptionDto添加generateSourceEnum和sourceBillNo字段 2. SQL查询添加T1.generate_source_enum和T1.prescription_no AS source_bill_no
This commit is contained in:
@@ -209,4 +209,14 @@ public class EncounterPatientPrescriptionDto {
|
|||||||
private String discountRate = "0";
|
private String discountRate = "0";
|
||||||
private String discountRate_dictText;
|
private String discountRate_dictText;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 账单生成来源
|
||||||
|
*/
|
||||||
|
private Integer generateSourceEnum;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 来源单据号(手术单号等)
|
||||||
|
*/
|
||||||
|
private String sourceBillNo;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -76,6 +76,8 @@
|
|||||||
T1.quantity_unit,
|
T1.quantity_unit,
|
||||||
T1.unit_price,
|
T1.unit_price,
|
||||||
T1.total_price,
|
T1.total_price,
|
||||||
|
T1.generate_source_enum,
|
||||||
|
T1.prescription_no AS source_bill_no,
|
||||||
mmr.prescription_no,
|
mmr.prescription_no,
|
||||||
mmr.method_code AS method_code,
|
mmr.method_code AS method_code,
|
||||||
mmr.rate_code,
|
mmr.rate_code,
|
||||||
@@ -190,6 +192,8 @@
|
|||||||
T1.quantity_unit,
|
T1.quantity_unit,
|
||||||
T1.unit_price,
|
T1.unit_price,
|
||||||
T1.total_price,
|
T1.total_price,
|
||||||
|
T1.generate_source_enum,
|
||||||
|
T1.prescription_no AS source_bill_no,
|
||||||
mmr.prescription_no,
|
mmr.prescription_no,
|
||||||
mmr.method_code AS method_code,
|
mmr.method_code AS method_code,
|
||||||
mmr.rate_code,
|
mmr.rate_code,
|
||||||
|
|||||||
Reference in New Issue
Block a user