后端最新版本同步

openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ChargeItemMapper.xml

@@ -68,11 +68,26 @@
         org.yb_no as dept_yb_no,
         pra."name" as doct_name,
         pra.yb_no as doct_yb_no,
-        contract.bus_no as contract_no
+        contract.bus_no as contract_no,
+        T2.charge_name,
+        T2.title,
+        T2.status_enum,
+        T2.org_id,
+        T2.description,
+        T2.instance_table,
+        T2.instance_id,
+        T2.effective_start,
+        T2.effective_end,
+        T2.type_code,
+        T2.yb_type,
+        T2.condition_flag,
+        T2.price
         -- 添加更多需要的字段
         FROM
         adm_charge_item a
         LEFT JOIN
+        adm_charge_item_definition T2 ON a.definition_id = T2.ID AND T2.delete_flag = '0'
+        LEFT JOIN
         med_medication_request b1 ON a.service_id = b1.id AND a.service_table = 'med_medication_request'
         LEFT JOIN
         wor_device_request b2 ON a.service_id = b2.id AND a.service_table = 'wor_device_request'
@@ -171,5 +186,6 @@
         <foreach collection="chargeItemIds" item="itemId" open="(" separator="," close=")">
             #{itemId}
         </foreach>
+        AND T1.delete_flag = '0'
     </select>
 </mapper>