Merge remote-tracking branch 'origin/develop' into develop

2026-03-04 11:05:18 +08:00
parent 6a8f82bb2e 09761c8ce8
commit b4ab67aed9
22 changed files with 2147 additions and 1159 deletions
--- 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 @@
        null AS skin_test_flag,
        null AS inject_flag,
        null AS group_id,
-        T2.NAME AS advice_name,
+        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,
        '' AS volume,
        '' AS lot_number,
        T1.quantity AS quantity,