提交merge1.3

openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/ActivityDefinitionManageMapper.xml

@@ -5,6 +5,39 @@
             resultType="com.openhis.web.datadictionary.dto.DiagnosisTreatmentDto">
 
         SELECT
+<<<<<<< HEAD
+=======
+        T3.id,
+        T3.category_code,
+        T3.bus_no,
+        T3.name,
+        T3.py_str,
+        T3.wb_str,
+        T3.type_enum,
+        T3.permitted_unit_code,
+        T3.org_id,
+        T3.location_id,
+        T3.yb_flag,
+        T3.yb_no,
+        T3.yb_match_flag,
+        T3.status_enum,
+        T3.body_site_code,
+        T3.specimen_code,
+        T3.description_text,
+        T3.rule_id,
+        T3.tenant_id,
+        T3.item_type_code,
+        T3.yb_type,
+        T3.price_code,
+        T3.retail_price,
+        T3.maximum_retail_price,
+        T3.chrgitm_lv,--医保等级
+        T3.children_json,--子项json
+        T3.pricing_flag--划价标记
+        FROM
+        (
+        SELECT
+>>>>>>> v1.3
         T1.id,
         T1.category_code,
         T1.bus_no,
@@ -27,6 +60,7 @@
         T1.chrgitm_lv,--医保等级
         T2.type_code as item_type_code,
         T2.yb_type,
+        T2.price_code,
         T2.price as retail_price,--零售价
         T4.amount as maximum_retail_price,--最高零售价
         T1.children_json,--子项json
@@ -76,6 +110,7 @@
         T1.tenant_id,
         T2.type_code as item_type_code,
         T2.yb_type,
+        T2.price_code,
         T2.price as retail_price,--零售价,
         (   SELECT T4.amount
         FROM adm_charge_item_definition T5

openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/MedicationManageSearchMapper.xml

@@ -75,7 +75,8 @@
         T6.retail_price,
         T6.chrgitm_lv,--医保等级
         T6.rx_flag,--处方标志
-        T6.tenant_id
+        T6.tenant_id,
+        T6.drug_69_code
         FROM
         (
         SELECT T2.id,
@@ -101,6 +102,7 @@
         T2.ddd_unit_code,
         T2.min_rate_code,
         T2.max_rate_code,
+        T1.drug_69_code,
         T1.bus_no,
         T1.name,
         T1.domain_enum,
@@ -201,6 +203,7 @@
         T2.ddd_unit_code,
         T2.min_rate_code,
         T2.max_rate_code,
+        T1.drug_69_code,
         T1.bus_no,
         T1.name,
         T1.domain_enum,