From 0e6dc880b39e799a86eea3f6c4aa0e5f7070dea4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=A4=87?= <刘备@gentronhealth.com> Date: Sat, 9 May 2026 19:02:10 +0800 Subject: [PATCH] =?UTF-8?q?Fix=20Bug=20#457:=20=E9=97=A8=E8=AF=8A=E6=94=B6?= =?UTF-8?q?=E8=B4=B9=EF=BC=9A=E5=B7=B2=E7=AD=BE=E5=8F=91=E7=9A=84=E6=89=8B?= =?UTF-8?q?=E6=9C=AF=E7=B1=BB=E5=8C=BB=E5=98=B1=E5=9C=A8=E9=97=A8=E8=AF=8A?= =?UTF-8?q?=E6=94=B6=E8=B4=B9=E5=88=97=E8=A1=A8=E4=B8=AD=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在 SQL CASE 表达式的 item_name 字段中，为 context_enum=activity 且非 cli_surgery 的分支增加从 wor_service_request.content_json 中读取 surgeryName 的回退逻辑， 使门诊医生站开立的手术类医嘱在收费列表中能正确显示项目名称。 Co-Authored-By: Claude Opus 4.7 --- .../mapper/chargemanage/OutpatientChargeAppMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 6899f247..47b950d4 100755 --- 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 @@ -100,7 +100,7 @@ WHEN T1.context_enum = 6 AND T1.product_id = 0 AND T1.service_table = 'wor_service_request' THEN COALESCE(wsr.content_json::json->>'adviceName', T2."name") WHEN T1.context_enum = 6 THEN T2."name" WHEN T1.context_enum = #{activity} AND T1.product_id = 0 AND T1.service_table = 'wor_service_request' THEN COALESCE(wsr.content_json::json->>'adviceName', T2."name") - WHEN T1.context_enum = #{activity} THEN T2."name" + WHEN T1.context_enum = #{activity} THEN COALESCE(wsr.content_json::json->>'surgeryName', wsr.content_json::json->>'adviceName', T2."name") WHEN T1.context_enum = #{medication} THEN T3."name" WHEN T1.context_enum = #{device} THEN T4."name" END AS item_name, @@ -225,7 +225,7 @@ WHEN T1.context_enum = 6 AND T1.product_id = 0 AND T1.service_table = 'wor_service_request' THEN COALESCE(wsr.content_json::json->>'adviceName', T2."name") WHEN T1.context_enum = 6 THEN T2."name" WHEN T1.context_enum = #{activity} AND T1.product_id = 0 AND T1.service_table = 'wor_service_request' THEN COALESCE(wsr.content_json::json->>'adviceName', T2."name") - WHEN T1.context_enum = #{activity} THEN T2."name" + WHEN T1.context_enum = #{activity} THEN COALESCE(wsr.content_json::json->>'surgeryName', wsr.content_json::json->>'adviceName', T2."name") WHEN T1.context_enum = #{medication} THEN T3."name" WHEN T1.context_enum = #{device} THEN T4."name" END AS item_name,