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,