版本更新

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

@@ -33,6 +33,7 @@
         abi.dose,
         abi.dose_unit_code,
         abi.supplier,
+        abi.supplier_id,
         abi.manufacturer,
         abi.charge_item_definition_id,
         abi.advice_table_name,
@@ -69,6 +70,7 @@
             CAST(T2.dose AS TEXT) AS dose,
             T2.dose_unit_code AS dose_unit_code,
             T3.NAME AS supplier,
+            T3.id AS supplier_id,
             T1.manufacturer_text AS manufacturer,
             T5.id AS charge_item_definition_id,
             T5.instance_table AS advice_table_name,
@@ -134,6 +136,7 @@
             '' AS dose,
             '' AS dose_unit_code,
             T2.NAME AS supplier,
+            T2.id AS supplier_id,
             T1.manufacturer_text AS manufacturer,
             T4.id AS charge_item_definition_id,
             T4.instance_table AS advice_table_name,
@@ -194,6 +197,7 @@
             '' AS dose,
             '' AS dose_unit_code,
             '' AS supplier,
+            null AS supplier_id,
             '' AS manufacturer,
             T2.ID AS charge_item_definition_id,
             T2.instance_table AS advice_table_name,
@@ -486,6 +490,7 @@
         WHERE T1.delete_flag = '0'
         AND T1.based_on_table is null
         AND T1.parent_id IS NULL
+        AND T1.refund_service_id IS NULL
         <if test="historyFlag == '0'.toString()">
             AND T1.encounter_id = #{encounterId}
         </if>