诊疗下没有项目功能完善

openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml

@@ -24,6 +24,7 @@
         abi.yb_no,
         abi.product_name,
         abi.activity_type,
+        abi.activity_type_dictText,
         abi.unit_code,
         abi.min_unit_code,
         abi.volume,
@@ -69,6 +70,7 @@
                 T1.yb_no AS yb_no,
                 T1.merchandise_name AS product_name,
                 0 AS activity_type,
+                '' AS activity_type_dictText,
                 T1.unit_code AS unit_code,
                 T1.min_unit_code AS min_unit_code,
                 T2.total_volume AS volume,
@@ -138,6 +140,7 @@
                 T1.yb_no AS yb_no,
                 '' AS product_name,
                 0 AS activity_type,
+                '' AS activity_type_dictText,
                 T1.unit_code AS unit_code,
                 T1.min_unit_code AS min_unit_code,
                 T1.SIZE AS volume,
@@ -200,8 +203,12 @@
                 T1.wb_str AS wb_str,
                 T1.yb_no AS yb_no,
                 '' AS product_name,
-                T1.type_enum AS activity_type,
-                '' AS unit_code,
+                -- 前端"类型"列：显示目录类别（category_code）
+                -- 将category_code转换为整数，用于字典转换（字典转换框架会自动填充activityType_dictText）
+                CAST(T1.category_code AS INTEGER) AS activity_type,
+                NULL AS activity_type_dictText,
+                -- 前端"包装单位"列：显示使用单位（permitted_unit_code）
+                T1.permitted_unit_code AS unit_code,
                 '' AS min_unit_code,
                 '' AS volume,
                 '' AS method_code,
@@ -263,6 +270,7 @@
                 CAST('' AS VARCHAR) AS yb_no,
                 CAST('' AS VARCHAR) AS product_name,
                 CAST(0 AS INTEGER) AS activity_type,
+                CAST('' AS VARCHAR) AS activity_type_dictText,
                 CAST('' AS VARCHAR) AS unit_code,
                 CAST('' AS VARCHAR) AS min_unit_code,
                 CAST(0 AS NUMERIC) AS volume,