解决合并冲突

2025-12-10 14:20:24 +08:00
parent e1385cb3e6
commit 18f6a845e6
804 changed files with 61881 additions and 13577 deletions
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/personalization/OrdersGroupPackageAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/personalization/OrdersGroupPackageAppMapper.xml
@@ -38,6 +38,12 @@
        togpd.quantity,
        togpd.unit_code,
        sdd.dict_label AS unit_code_name,
+        togpd.dose,
+        togpd.rate_code,
+        togpd.method_code,
+        togpd.dose_quantity,
+        togpd.group_id,
+        togpd.dispense_per_duration,
        CASE
        WHEN togpd.order_definition_table = 'med_medication_definition' THEN
        med.NAME