From b1d6c6008e3283f9fdbc53f94c8488313051edb1 Mon Sep 17 00:00:00 2001 From: chenqi Date: Wed, 1 Apr 2026 12:57:52 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20doctorstation=E6=89=8B=E6=9C=AF=E5=8C=BB?= =?UTF-8?q?=E5=98=B1advice=5Ftype=E4=BD=BF=E7=94=A8category=5Fenum?= =?UTF-8?q?=EF=BC=8Cadvice=5Fname=E6=94=AF=E6=8C=81surgeryName?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/doctorstation/DoctorStationAdviceAppMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml index cb1efea0..53e526ca 100644 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml @@ -547,7 +547,7 @@ AND T1.refund_device_id IS NULL ORDER BY T1.status_enum) UNION ALL - (SELECT 3 AS advice_type, + (SELECT COALESCE(T1.category_enum, 3) AS advice_type, T1.id AS request_id, T1.id || '-3' AS unique_key, '' AS prescription_no, @@ -558,7 +558,7 @@ null AS skin_test_flag, null AS inject_flag, null AS group_id, - COALESCE(T2.NAME, CASE WHEN T1.content_json IS NOT NULL AND T1.content_json != '' THEN T1.content_json::json->>'adviceName' ELSE NULL END) AS advice_name, + COALESCE(T2.NAME, T1.content_json::jsonb->>'surgeryName', T1.content_json::jsonb->>'adviceName') AS advice_name, '' AS volume, '' AS lot_number, T1.quantity AS quantity,