From 47a12e03e3c7a480db13d4176026ad417c1aab17 Mon Sep 17 00:00:00 2001 From: zhangfei Date: Thu, 7 May 2026 23:14:04 +0800 Subject: [PATCH] =?UTF-8?q?Fix=20Bug=20#443:=20=E6=89=8B=E6=9C=AF=E8=AE=A1?= =?UTF-8?q?=E8=B4=B9=EF=BC=9A=E7=82=B9=E5=87=BB=E7=AD=BE=E5=8F=91=E8=80=97?= =?UTF-8?q?=E6=9D=90=E6=97=B6=E5=BC=82=E5=B8=B8=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 门诊手术计费生成的耗材在请求基础信息接口中返回的 status_enum 和 content_json 均为 NULL，导致前端无法正确识别"待签发"状态且在签发 时丢失 adviceType 分类信息。 修复：从已 JOIN 的 wor_device_request 表中获取真实的 status_enum 和 content_json 字段，使用 COALESCE 回退到 adm_charge_item。 Co-Authored-By: Claude Opus 4.7 --- .../mapper/doctorstation/DoctorStationAdviceAppMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml 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 old mode 100644 new mode 100755 index f320bc64..b8c08a35 --- 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 @@ CI.enterer_id AS requester_id, CI.entered_date AS request_time, CASE WHEN CI.enterer_id = #{practitionerId} THEN '1' ELSE '0' END AS biz_request_flag, - NULL AS content_json, + COALESCE(DR.content_json, CI.content_json) AS content_json, NULL AS skin_test_flag, NULL AS inject_flag, NULL AS group_id, @@ -556,7 +556,7 @@ NULL AS lot_number, CI.quantity_value AS quantity, CI.quantity_unit AS unit_code, - NULL AS status_enum, + COALESCE(DR.status_enum, CI.status_enum) AS status_enum, '' AS method_code, '' AS rate_code, NULL AS dose,