wangyizhe/his
3
3
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

版本更新

Browse Source
This commit is contained in:
Zhang.WH
2025-10-16 17:17:24 +08:00
parent d23a594a4b
commit f515bb8fbb
600 changed files with 7881 additions and 35954 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/LossReportFormMapper.xml
View File

@@ -76,7 +76,8 @@
T1.end_time, -- 结束时间
T1.supplier_id, -- 供应商id
T9."name" AS supplier_name, -- 供应商名称
T2.part_percent --拆零比
T2.part_percent, --拆零比
T1.total_quantity AS old_quantity --报损前数量
FROM wor_supply_request T1
LEFT JOIN med_medication_definition T2
ON T1.item_id = T2.id
@@ -137,7 +138,8 @@
T1.end_time, -- 结束时间
T1.supplier_id, -- 供应商id
T9."name" AS supplier_name, -- 供应商名称
T7.part_percent --拆零比
T7.part_percent, --拆零比
T1.total_quantity AS old_quantity --报损前数量
FROM wor_supply_request T1
LEFT JOIN adm_device_definition T7
ON T1.item_id = T7.id

4
openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/ProductTransferMapper.xml
View File

@@ -235,6 +235,7 @@
AND T1.source_location_id = T9.location_id
AND T9.lot_number = T1.lot_number
AND T9.delete_flag = '0'
AND T9.inventory_status_enum != 3
LEFT JOIN adm_charge_item_definition AS T10
ON T10.instance_id = T9.item_id
AND T10.delete_flag = '0'
@@ -248,6 +249,7 @@
AND T1.purpose_location_id = T12.location_id
AND T12.lot_number = T1.lot_number
AND T12.delete_flag = '0'
AND T12.inventory_status_enum != 3
WHERE T1.bus_no = #{busNo}
AND T1.item_table = #{medicationTableName}
AND T1.delete_flag = '0'
@@ -305,6 +307,7 @@
AND T1.source_location_id = T9.location_id
AND T9.lot_number = T1.lot_number
AND T9.delete_flag = '0'
AND T9.inventory_status_enum != 3
LEFT JOIN adm_charge_item_definition AS T10
ON T10.instance_id = T9.item_id
AND T10.delete_flag = '0'
@@ -318,6 +321,7 @@
AND T1.purpose_location_id = T12.location_id
AND T12.lot_number = T1.lot_number
AND T12.delete_flag = '0'
AND T12.inventory_status_enum != 3
WHERE T1.bus_no = #{busNo}
AND T1.item_table = #{deviceTableName}
AND T1.delete_flag = '0'