wangyizhe/his
3
3
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

解决合并冲突

Browse Source
This commit is contained in:
chenqi
2025-12-10 14:20:24 +08:00
parent e1385cb3e6
commit 18f6a845e6
804 changed files with 61881 additions and 13577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
openhis-server-new/openhis-application/src/main/resources/mapper/paymentmanage/PaymentMapper.xml
View File

@@ -4,63 +4,65 @@
<select id="getPage" resultType="com.openhis.web.paymentmanage.dto.PaymentVO">
SELECT T1.id,
T1.relation_id,
T1.status_enum,
T1.payment_no,
T1.payment_enum,
T1.enterer_id,
T1.kind_enum,
T1.patient_id,
T1.outcome_enum,
T1.tendered_amount,
T1.returned_amount,
T1.display_amount,
T1.print_count,
T1.bill_date,
T1.encounter_id,
T1.yb_clear_flag,
T1.yb_settle_ids,
T1.enterer_name,
T1.patient_name,
T1.invoice_id,
T1.bill_no as invoice_no,
T1.encounter_bus_no
T1.relation_id,
T1.status_enum,
T1.payment_no,
T1.payment_enum,
T1.enterer_id,
T1.kind_enum,
T1.patient_id,
T1.outcome_enum,
T1.tendered_amount,
T1.returned_amount,
T1.display_amount,
T1.print_count,
T1.bill_date,
T1.encounter_id,
T1.yb_clear_flag,
T1.yb_settle_ids,
T1.enterer_name,
T1.patient_name,
T1.invoice_id,
T1.bill_no as invoice_no,
T1.invoice_status,
T1.encounter_bus_no
FROM (SELECT t.id,
t.relation_id,
t.status_enum,
t.payment_no,
t.payment_enum,
t.enterer_id,
t.kind_enum,
pra.name AS enterer_name,
t.patient_id,
patient.name AS patient_name,
t.outcome_enum,
t.tendered_amount,
t.returned_amount,
t.display_amount,
t.bill_date,
t.print_count,
t.encounter_id,
invoice.id AS invoice_id,
invoice.bill_no,
t.yb_clear_flag,
t.yb_settle_ids,
enc.bus_no AS encounter_bus_no,
t.tenant_id
FROM fin_payment_reconciliation t
LEFT JOIN adm_patient patient ON patient.id = t.patient_id
LEFT JOIN adm_practitioner pra ON pra.id = t.enterer_id
LEFT JOIN adm_invoice invoice ON invoice.reconciliation_id = t.id
LEFT JOIN adm_encounter enc ON enc.id = t.enterer_id
WHERE 1 = 1
AND t.delete_flag = '0'
AND t.kind_enum = #{kindEnum}
<if test="invoiceNo != null and !invoiceNo.empty">
AND invoice.bill_no = #{invoiceNo}
</if>
ORDER BY t.create_time DESC) as T1
${ew.customSqlSegment}
t.relation_id,
t.status_enum,
t.payment_no,
t.payment_enum,
t.enterer_id,
t.kind_enum,
pra.name AS enterer_name,
t.patient_id,
patient.name AS patient_name,
t.outcome_enum,
t.tendered_amount,
t.returned_amount,
t.display_amount,
t.bill_date,
t.print_count,
t.encounter_id,
invoice.id AS invoice_id,
invoice.bill_no,
case when invoice.bill_no is not null then 1 else 0 end as invoice_status,
t.yb_clear_flag,
t.yb_settle_ids,
enc.bus_no AS encounter_bus_no,
t.tenant_id
FROM fin_payment_reconciliation t
LEFT JOIN adm_patient patient ON patient.id = t.patient_id
LEFT JOIN adm_practitioner pra ON pra.id = t.enterer_id
LEFT JOIN adm_invoice invoice ON invoice.reconciliation_id = t.id
LEFT JOIN adm_encounter enc ON enc.id = t.enterer_id
WHERE 1 = 1
AND t.delete_flag = '0'
AND t.kind_enum = #{kindEnum}
<if test="invoiceNo != null and !invoiceNo.empty">
AND invoice.bill_no = #{invoiceNo}
</if>
ORDER BY t.create_time DESC) as T1
${ew.customSqlSegment}
</select>
<select id="getPaymentDetailList" resultType="com.openhis.yb.dto.PaymentDetailDto">
SELECT id,