枚举调整

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

@@ -14,6 +14,7 @@
                abi.wb_str,
                abi.yb_no,
                abi.product_name,
+               abi.activity_type,
                abi.unit_code,
                abi.min_unit_code,
                abi.volume,
@@ -35,6 +36,7 @@
                         T1.wb_str             AS wb_str,
                         T1.yb_no              AS yb_no,
                         T1.merchandise_name   AS product_name,
+                        0                     AS activity_type,
                         T1.unit_code          AS unit_code,
                         T1.min_unit_code      AS min_unit_code,
                         T2.total_volume       AS volume,
@@ -67,6 +69,7 @@
                         T1.wb_str         AS wb_str,
                         T1.yb_no          AS yb_no,
                         ''                AS product_name,
+                        0                 AS activity_type,
                         T1.unit_code      AS unit_code,
                         T1.min_unit_code  AS min_unit_code,
                         T1.SIZE           AS volume,
@@ -97,6 +100,7 @@
                         T1.wb_str         AS wb_str,
                         T1.yb_no          AS yb_no,
                         ''                AS product_name,
+                        T1.type_enum      AS activity_type,
                         ''                AS unit_code,
                         ''                AS min_unit_code,
                         ''                AS volume,
@@ -125,6 +129,8 @@
         T1.min_quantity,
         T1.min_unit_code,
         T1.lot_number,
+        T1.price,
+        T1.location_id,
         T2.NAME AS location_name
         FROM
         wor_inventory_item AS T1
@@ -145,20 +151,26 @@
     </select>
 
     <select id="getChildCharge" resultType="com.openhis.web.doctorstation.dto.AdvicePriceDto">
-        SELECT definition_id,
-        condition_value,
-        condition_code,
-        amount AS price
-        FROM adm_charge_item_def_detail
-        WHERE delete_flag = '0'
-        AND condition_code = #{conditionCode}
+        SELECT
+        T1.definition_id,
+        T2.charge_name,
+        T1.condition_value,
+        T1.condition_code,
+        T1.amount AS price
+        FROM
+        adm_charge_item_def_detail AS T1
+        LEFT JOIN adm_charge_item_definition AS T2 ON T2.ID = T1.definition_id
+        AND T2.delete_flag = '0'
+        WHERE
+        T1.delete_flag = '0'
+        AND T1.condition_code = #{conditionCode}
         <if test="chargeItemDefinitionIdList != null and !chargeItemDefinitionIdList.isEmpty()">
-            AND definition_id IN
+            AND T1.definition_id IN
             <foreach collection="chargeItemDefinitionIdList" item="itemId" open="(" separator="," close=")">
                 #{itemId}
             </foreach>
         </if>
-        ORDER BY priority DESC
+        ORDER BY T1.priority DESC
     </select>
 
     <select id="getMainCharge" resultType="com.openhis.web.doctorstation.dto.AdvicePriceDto">