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

fix: 修复门诊手术申请后未生成预收费明细记录的问题 (Bug #307)

Browse Source 
- 修改 OutpatientChargeAppMapper.xml

- 在门诊收费查询SQL中增加对 cli_surgery 表的关联

- 支持手术申请生成的收费项目正确显示在门诊收费系统中
This commit is contained in:
chenqi
2026-04-01 09:17:41 +08:00
parent 6f3d4272e6
commit b27d8a6703
1 changed files with 44 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientChargeAppMapper.xml
View File

@@ -93,16 +93,19 @@
T7.med_type_code, T7.med_type_code,
T8.contract_name, T8.contract_name,
CASE CASE
WHEN T1.context_enum = #{activity} AND T1.product_table = 'cli_surgery' THEN T9.surgery_name
WHEN T1.context_enum = #{activity} THEN T2."name" WHEN T1.context_enum = #{activity} THEN T2."name"
WHEN T1.context_enum = #{medication} THEN T3."name" WHEN T1.context_enum = #{medication} THEN T3."name"
WHEN T1.context_enum = #{device} THEN T4."name" WHEN T1.context_enum = #{device} THEN T4."name"
END AS item_name, END AS item_name,
CASE CASE
WHEN T1.context_enum = #{activity} AND T1.product_table = 'cli_surgery' THEN NULL
WHEN T1.context_enum = #{activity} THEN T2.yb_no WHEN T1.context_enum = #{activity} THEN T2.yb_no
WHEN T1.context_enum = #{medication} THEN T3.yb_no WHEN T1.context_enum = #{medication} THEN T3.yb_no
WHEN T1.context_enum = #{device} THEN T4.yb_no WHEN T1.context_enum = #{device} THEN T4.yb_no
END AS yb_no, END AS yb_no,
CASE CASE
WHEN T1.context_enum = #{activity} AND T1.product_table = 'cli_surgery' THEN T9.id
WHEN T1.context_enum = #{activity} THEN T2.id WHEN T1.context_enum = #{activity} THEN T2.id
WHEN T1.context_enum = #{medication} THEN T3.id WHEN T1.context_enum = #{medication} THEN T3.id
WHEN T1.context_enum = #{device} THEN T4.id WHEN T1.context_enum = #{device} THEN T4.id
@@ -120,6 +123,10 @@
ON T1.context_enum = #{device} ON T1.context_enum = #{device}
AND T1.product_id = T4.id AND T1.product_id = T4.id
AND T4.delete_flag = '0' AND T4.delete_flag = '0'
LEFT JOIN cli_surgery AS T9
ON T1.product_table = 'cli_surgery'
AND T1.product_id = T9.id
AND T9.delete_flag = '0'
LEFT JOIN fin_payment_reconciliation AS T5 LEFT JOIN fin_payment_reconciliation AS T5
ON T1.id::TEXT = ANY(string_to_array(T5.charge_item_ids, ',')) ON T1.id::TEXT = ANY(string_to_array(T5.charge_item_ids, ','))
AND T5.delete_flag = '0' AND T5.delete_flag = '0'
@@ -186,16 +193,19 @@
T7.med_type_code, T7.med_type_code,
T8.contract_name, T8.contract_name,
CASE CASE
WHEN T1.context_enum = #{activity} AND T1.product_table = 'cli_surgery' THEN T9.surgery_name
WHEN T1.context_enum = #{activity} THEN T2."name" WHEN T1.context_enum = #{activity} THEN T2."name"
WHEN T1.context_enum = #{medication} THEN T3."name" WHEN T1.context_enum = #{medication} THEN T3."name"
WHEN T1.context_enum = #{device} THEN T4."name" WHEN T1.context_enum = #{device} THEN T4."name"
END AS item_name, END AS item_name,
CASE CASE
WHEN T1.context_enum = #{activity} AND T1.product_table = 'cli_surgery' THEN NULL
WHEN T1.context_enum = #{activity} THEN T2.yb_no WHEN T1.context_enum = #{activity} THEN T2.yb_no
WHEN T1.context_enum = #{medication} THEN T3.yb_no WHEN T1.context_enum = #{medication} THEN T3.yb_no
WHEN T1.context_enum = #{device} THEN T4.yb_no WHEN T1.context_enum = #{device} THEN T4.yb_no
END AS yb_no, END AS yb_no,
CASE CASE
WHEN T1.context_enum = #{activity} AND T1.product_table = 'cli_surgery' THEN T9.id
WHEN T1.context_enum = #{activity} THEN T2.id WHEN T1.context_enum = #{activity} THEN T2.id
WHEN T1.context_enum = #{medication} THEN T3.id WHEN T1.context_enum = #{medication} THEN T3.id
WHEN T1.context_enum = #{device} THEN T4.id WHEN T1.context_enum = #{device} THEN T4.id
@@ -214,6 +224,10 @@
ON T1.context_enum = #{device} ON T1.context_enum = #{device}
AND T1.product_id = T4.id AND T1.product_id = T4.id
AND T4.delete_flag = '0' AND T4.delete_flag = '0'
LEFT JOIN cli_surgery AS T9
ON T1.product_table = 'cli_surgery'
AND T1.product_id = T9.id
AND T9.delete_flag = '0'
LEFT JOIN fin_payment_reconciliation AS T5 LEFT JOIN fin_payment_reconciliation AS T5
ON T1.id::TEXT = ANY(string_to_array(T5.charge_item_ids, ',')) ON T1.id::TEXT = ANY(string_to_array(T5.charge_item_ids, ','))
AND T5.delete_flag = '0' AND T5.delete_flag = '0'