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

```

Browse Source 
docs(release-notes): 添加住院护士站划价功能说明和发版记录

- 新增住院护士站划价服务流程说明文档，详细描述了从参数预处理到结果响应的五大阶段流程
- 包含耗材类医嘱和诊疗活动类医嘱的差异化处理逻辑
- 添加完整的发版内容记录，涵盖新增菜单功能和各模块优化点
- 记录了住院相关功能的新增和门诊业务流程的修复
```
This commit is contained in:
chenqi
2025-12-25 14:13:14 +08:00
parent 85fcb7c2e2
commit abc0674531
920 changed files with 107068 additions and 14495 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/InventorySettlementAppMapper.xml Normal file
View File

@@ -0,0 +1,93 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.openhis.web.inventorymanage.mapper.InventorySettlementAppMapper">
<select id="selectMedicationPage"
resultType="com.openhis.web.inventorymanage.dto.InventorySettlementDto">
SELECT ii.item_name ,
ii.item_no ,
ii.item_id ,
ii.py_str ,
ii.wb_str ,
ii.unit_code ,
ii.min_unit_code ,
ii.part_percent,
ii.category_code,
ii.manufacturer_text,
ii.total_volume
FROM ( SELECT mmd.tenant_id ,
mmd."name" AS item_name ,
mmd.id AS item_id ,
mmd.bus_no AS item_no,
mmd.py_str ,
mmd.wb_str ,
mmd.unit_code ,
mmd.min_unit_code ,
mmd.part_percent,
mmd.category_code,
mmd.manufacturer_text,
mm.total_volume
FROM med_medication_definition mmd
LEFT JOIN med_medication mm
ON mmd.id = mm.medication_def_id
AND mm.delete_flag = '0'
WHERE mmd.delete_flag = '0'
) AS ii
${ew.customSqlSegment}
ORDER BY ii.py_str
</select>
<select id="selectMedDispenseList" resultType="com.openhis.web.inventorymanage.dto.InventoryBusinessInfoDto">
SELECT mmd.id AS item_id ,
mmd.unit_code ,
mmd.min_unit_code ,
mmd.part_percent ,
mmq.quantity AS dispense_quantity ,
mmd2.id AS dispense_id ,
mmd2.lot_number AS dispense_lot ,
mmd2.location_id AS dispense_location ,
mmd2.unit_code AS dispense_unit_code ,
mmd2.status_enum AS dispense_status ,
mmd2.dispense_time
FROM med_medication_definition mmd
LEFT JOIN med_medication_request mmq
ON mmd.id = mmq.medication_id
AND mmq.delete_flag = '0'
LEFT JOIN med_medication_dispense mmd2
ON mmq.id = mmd2.med_req_id
AND mmd2.delete_flag = '0'
WHERE mmd.delete_flag = '0'
AND mmd2.status_enum IN (#{completed},#{refunded})
AND mmd2.dispense_time &lt;= #{endTime}
AND mmd2.dispense_time > #{startTime}
AND mmd2.location_id = #{locationId}
</select>
<select id="selectInventorySupplyList"
resultType="com.openhis.web.inventorymanage.dto.InventoryBusinessInfoDto">
SELECT mmd.id AS item_id,
mmd.unit_code ,
mmd.min_unit_code ,
mmd.part_percent ,
wsr.item_quantity AS delivery_quantity,
wsr.lot_number AS delivery_lot,
wsr.unit_code AS delivery_unit_code,
wsr.purpose_location_id,
wsr.source_location_id,
wsr.type_enum,
wsr.status_enum AS delivery_status,
wsr.approval_time,
wsd.id AS delivery_id
FROM med_medication_definition mmd
LEFT JOIN wor_supply_request wsr
ON mmd.id = wsr.item_id
AND wsr.delete_flag = '0'
LEFT JOIN wor_supply_delivery wsd
ON wsr.id = wsd.request_id
AND wsd.delete_flag = '0'
WHERE mmd.delete_flag = '0'
AND wsd.status_enum = #{completed}
AND wsr.approval_time &lt;= #{endTime}
AND wsr.approval_time > #{startTime}
AND (wsr.source_location_id = #{locationId} OR wsr.purpose_location_id = #{locationId})
AND wsr.type_enum IN (#{productBatchTransfer}, #{productTransfer}, #{productReturn}, #{productStocktaking},
#{productBatchStocktaking}, #{purchaseInventory}, #{lossReportForm}, #{issueInventory},#{returnIssue})
</select>
</mapper>

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

@@ -4,20 +4,20 @@
<select id="selectLossReportFormPage"
resultType="com.openhis.web.inventorymanage.dto.LossReportFormPageDto">
SELECT T4.supply_bus_no, -- 单据号
T4.type, -- 单据类型
T4.status_enum, -- 单据状态
T4.inventory_location_name, -- 盘点仓库
T4.reported_loss_amount, -- 报损金额(总价)
T4.applicant_id, -- 制单人(申请人)
T4.approver_id, -- 审核人
T4.approval_time, -- 审核日期
T4.create_time, -- 制单时间
T4.tenant_id -- 租户ID
FROM (SELECT T1.bus_no AS supply_bus_no,
T1.type_enum AS type,
SELECT T4.supply_bus_no, -- 单据号
T4.type, -- 单据类型
T4.status_enum, -- 单据状态
T4.inventory_location_name, -- 盘点仓库
T4.reported_loss_amount, -- 报损金额(总价)
T4.applicant_id, -- 制单人(申请人)
T4.approver_id, -- 审核人
T4.approval_time, -- 审核日期
T4.create_time, -- 制单时间
T4.tenant_id -- 租户ID
FROM (SELECT T1.bus_no AS supply_bus_no,
T1.type_enum AS type,
T1.status_enum,
T4.name AS inventory_location_name,
T4.name AS inventory_location_name,
T2.reported_loss_amount,
T1.applicant_id,
T1.approver_id,
@@ -43,41 +43,40 @@
T1.approver_id,
T1.approval_time,
T1.tenant_id
ORDER BY T1.bus_no desc
) AS T4
ORDER BY T1.bus_no desc) AS T4
${ew.customSqlSegment}
</select>
<select id="selectDetail" resultType="com.openhis.web.inventorymanage.dto.ReceiptDetailDto">
SELECT T1.id, --ID
T1.bus_no AS supply_bus_no, --单据号
T1.item_id, --物品编码
T1.purpose_type_enum, --目的类型
T1.purpose_location_id, --目的仓库
T5."name" AS purpose_location_name, --目的仓库名称
T6."name" AS purpose_location_store_name, --目的仓位
T1.occurrence_time, --报损时间
#{medicine} AS item_type, --药品类型
T1.remake, --备注
T2.bus_no AS item_bus_no, --项目编码
T2."name" AS item_name, --名称
T3.total_volume, --规格
T1.unit_code AS measurement_unit_code, -- 物品计量单位
T2.unit_code, -- 包装单位
T2.min_unit_code, -- 最小单位
T2.manufacturer_text, --生产厂商文本
T4.lot_number, --产品批号
T4.quantity AS total_quantity, --当前库存数量
T1.item_quantity, --数量(报损数量)
T11.amount AS price, --采购单价(大单位)
T1.total_price, --总价(报损金额)
T1.reason_code, --理由类型(报损原因)
T1.reason, --理由(报损详细)
T1.start_time, -- 开始时间
T1.end_time, -- 结束时间
T1.supplier_id, -- 供应商id
T9."name" AS supplier_name, -- 供应商名称
T2.part_percent, --拆零比
T1.total_quantity AS old_quantity --报损前数量
SELECT T1.id, -- ID
T1.bus_no AS supply_bus_no, -- 单据号
T1.item_id, -- 物品编码
T1.purpose_type_enum, -- 目的类型
T1.purpose_location_id, -- 目的仓库
T5."name" AS purpose_location_name, -- 目的仓库名称
T6."name" AS purpose_location_store_name, -- 目的仓位
T1.occurrence_time, -- 报损时间
#{medicine} AS item_type, -- 药品类型
T1.remake, -- 备注
T2.bus_no AS item_bus_no, -- 项目编码
T2."name" AS item_name, -- 名称
T3.total_volume, -- 规格
T1.unit_code AS measurement_unit_code, -- 物品计量单位
T2.unit_code, -- 包装单位
T2.min_unit_code, -- 最小单位
T2.manufacturer_text, -- 生产厂商文本
T4.lot_number, -- 产品批号
T4.quantity AS total_quantity, -- 当前库存数量
T1.item_quantity, -- 数量(报损数量)
T11.amount AS price, -- 采购单价(大单位)
T1.total_price, -- 总价(报损金额)
T1.reason_code, -- 理由类型(报损原因)
T1.reason, -- 理由(报损详细)
T1.start_time, -- 开始时间
T1.end_time, -- 结束时间
T1.supplier_id, -- 供应商id
T9."name" AS supplier_name, -- 供应商名称
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
@@ -105,41 +104,41 @@
ON T11.definition_id = T10.id
AND T11.delete_flag = '0'
AND T11.condition_value = T4.lot_number
AND T11.condition_code = '1'--1:批号进价
AND T11.condition_code = '1'-- 1:批号进价
WHERE T1.bus_no = #{busNo}
AND T1.item_table = #{medicationTableName}
AND T1.delete_flag = '0'
UNION
SELECT T1.id, --ID
T1.bus_no AS supply_bus_no, --单据号
T1.item_id, --物品编码
T1.purpose_type_enum, --目的类型
T1.purpose_location_id, --目的仓库
T5."name" AS purpose_location_name, --目的仓库名称
T6."name" AS purpose_location_store_name, --目的仓位
T1.occurrence_time, --报损时间
#{device} AS item_type, --器材类型
T1.remake, --备注
T7.bus_no AS item_bus_no, --项目编码
T7."name" AS item_name, --名称
T7."size" AS total_volume, --器材规格
T1.unit_code AS measurement_unit_code, -- 物品计量单位
T7.unit_code, -- 包装单位
T7.min_unit_code, -- 最小单位
T7.manufacturer_text, --生产厂商文本
T4.lot_number, --产品批号
T4.quantity AS total_quantity, --当前库存数量
T1.item_quantity, --数量(报损数量)
T11.amount AS price, --采购单价(大单位)
T1.total_price, --总价(报损金额)
T1.reason_code, --理由类型(报损原因)
T1.reason, --理由(报损详细)
T1.start_time, -- 开始时间
T1.end_time, -- 结束时间
T1.supplier_id, -- 供应商id
T9."name" AS supplier_name, -- 供应商名称
T7.part_percent, --拆零比
T1.total_quantity AS old_quantity --报损前数量
SELECT T1.id, -- ID
T1.bus_no AS supply_bus_no, -- 单据号
T1.item_id, -- 物品编码
T1.purpose_type_enum, -- 目的类型
T1.purpose_location_id, -- 目的仓库
T5."name" AS purpose_location_name, -- 目的仓库名称
T6."name" AS purpose_location_store_name, -- 目的仓位
T1.occurrence_time, -- 报损时间
#{device} AS item_type, -- 器材类型
T1.remake, -- 备注
T7.bus_no AS item_bus_no, -- 项目编码
T7."name" AS item_name, -- 名称
T7."size" AS total_volume, -- 器材规格
T1.unit_code AS measurement_unit_code, -- 物品计量单位
T7.unit_code, -- 包装单位
T7.min_unit_code, -- 最小单位
T7.manufacturer_text, -- 生产厂商文本
T4.lot_number, -- 产品批号
T4.quantity AS total_quantity, -- 当前库存数量
T1.item_quantity, -- 数量(报损数量)
T11.amount AS price, -- 采购单价(大单位)
T1.total_price, -- 总价(报损金额)
T1.reason_code, -- 理由类型(报损原因)
T1.reason, -- 理由(报损详细)
T1.start_time, -- 开始时间
T1.end_time, -- 结束时间
T1.supplier_id, -- 供应商id
T9."name" AS supplier_name, -- 供应商名称
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
@@ -165,41 +164,41 @@
ON T11.definition_id = T10.id
AND T11.delete_flag = '0'
AND T11.condition_value = T4.lot_number
AND T11.condition_code = '1'--1:批号进价
AND T11.condition_code = '1'-- 1:批号进价
WHERE T1.bus_no = #{busNo}
AND T1.item_table = #{deviceTableName}
AND T1.delete_flag = '0'
</select>
<select id="getMonthlySettlementDetail" resultType="com.openhis.web.inventorymanage.dto.ReceiptDetailDto">
SELECT T1.id, --ID
T1.bus_no AS supply_bus_no, --单据号
T1.item_id, --物品编码
T1.purpose_type_enum, --目的类型
T1.purpose_location_id, --目的仓库
T5."name" AS purpose_location_name, --目的仓库名称
T6."name" AS purpose_location_store_name, --目的仓位
T1.occurrence_time, --报损时间
#{medicine} AS item_type, --药品类型
T1.remake, --备注
T2.bus_no AS item_bus_no, --项目编码
T2."name" AS item_name, --名称
T3.total_volume, --规格
T1.unit_code AS measurement_unit_code, -- 物品计量单位
T2.unit_code, -- 包装单位
T2.min_unit_code, -- 最小单位
T2.manufacturer_text, --生产厂商文本
T4.lot_number, --产品批号
T4.quantity AS total_quantity, --当前库存数量
T1.item_quantity, --数量(报损数量)
T11.amount AS price, --采购单价(大单位)
T1.total_price, --总价(报损金额)
T1.reason_code, --理由类型(报损原因)
T1.reason, --理由(报损详细)
T1.start_time, -- 开始时间
T1.end_time, -- 结束时间
T1.supplier_id, -- 供应商id
T9."name" AS supplier_name, -- 供应商名称
T2.part_percent --拆零比
SELECT T1.id, -- ID
T1.bus_no AS supply_bus_no, -- 单据号
T1.item_id, -- 物品编码
T1.purpose_type_enum, -- 目的类型
T1.purpose_location_id, -- 目的仓库
T5."name" AS purpose_location_name, -- 目的仓库名称
T6."name" AS purpose_location_store_name, -- 目的仓位
T1.occurrence_time, -- 报损时间
#{medicine} AS item_type, -- 药品类型
T1.remake, -- 备注
T2.bus_no AS item_bus_no, -- 项目编码
T2."name" AS item_name, -- 名称
T3.total_volume, -- 规格
T1.unit_code AS measurement_unit_code, -- 物品计量单位
T2.unit_code, -- 包装单位
T2.min_unit_code, -- 最小单位
T2.manufacturer_text, -- 生产厂商文本
T4.lot_number, -- 产品批号
T4.quantity AS total_quantity, -- 当前库存数量
T1.item_quantity, -- 数量(报损数量)
T11.amount AS price, -- 采购单价(大单位)
T1.total_price, -- 总价(报损金额)
T1.reason_code, -- 理由类型(报损原因)
T1.reason, -- 理由(报损详细)
T1.start_time, -- 开始时间
T1.end_time, -- 结束时间
T1.supplier_id, -- 供应商id
T9."name" AS supplier_name, -- 供应商名称
T2.part_percent -- 拆零比
FROM wor_supply_request T1
LEFT JOIN med_medication_definition T2
ON T1.item_id = T2.id
@@ -227,7 +226,7 @@
ON T11.definition_id = T10.id
AND T11.delete_flag = '0'
AND T11.condition_value = T4.lot_number
AND T11.condition_code = '1'--1:批号进价
AND T11.condition_code = '1'-- 1:批号进价
WHERE T1.purpose_location_id = #{locationId}
AND T1.status_enum = #{statusEnum}
AND T1.type_enum = #{typeEnum}
@@ -235,35 +234,35 @@
AND T1.item_table = #{medicationTableName}
AND T1.delete_flag = '0'
UNION
SELECT T1.id, --ID
T1.bus_no AS supply_bus_no, --单据号
T1.item_id, --物品编码
T1.purpose_type_enum, --目的类型
T1.purpose_location_id, --目的仓库
T5."name" AS purpose_location_name, --目的仓库名称
T6."name" AS purpose_location_store_name, --目的仓位
T1.occurrence_time, --报损时间
#{device} AS item_type, --器材类型
T1.remake, --备注
T7.bus_no AS item_bus_no, --项目编码
T7."name" AS item_name, --名称
T7."size" AS total_volume, --器材规格
T1.unit_code AS measurement_unit_code, -- 物品计量单位
T7.unit_code, -- 包装单位
T7.min_unit_code, -- 最小单位
T7.manufacturer_text, --生产厂商文本
T4.lot_number, --产品批号
T4.quantity AS total_quantity, --当前库存数量
T1.item_quantity, --数量(报损数量)
T11.amount AS price, --采购单价(大单位)
T1.total_price, --总价(报损金额)
T1.reason_code, --理由类型(报损原因)
T1.reason, --理由(报损详细)
T1.start_time, -- 开始时间
T1.end_time, -- 结束时间
T1.supplier_id, -- 供应商id
T9."name" AS supplier_name, -- 供应商名称
T7.part_percent --拆零比
SELECT T1.id, -- ID
T1.bus_no AS supply_bus_no, -- 单据号
T1.item_id, -- 物品编码
T1.purpose_type_enum, -- 目的类型
T1.purpose_location_id, -- 目的仓库
T5."name" AS purpose_location_name, -- 目的仓库名称
T6."name" AS purpose_location_store_name, -- 目的仓位
T1.occurrence_time, -- 报损时间
#{device} AS item_type, -- 器材类型
T1.remake, -- 备注
T7.bus_no AS item_bus_no, -- 项目编码
T7."name" AS item_name, -- 名称
T7."size" AS total_volume, -- 器材规格
T1.unit_code AS measurement_unit_code, -- 物品计量单位
T7.unit_code, -- 包装单位
T7.min_unit_code, -- 最小单位
T7.manufacturer_text, -- 生产厂商文本
T4.lot_number, -- 产品批号
T4.quantity AS total_quantity, -- 当前库存数量
T1.item_quantity, -- 数量(报损数量)
T11.amount AS price, -- 采购单价(大单位)
T1.total_price, -- 总价(报损金额)
T1.reason_code, -- 理由类型(报损原因)
T1.reason, -- 理由(报损详细)
T1.start_time, -- 开始时间
T1.end_time, -- 结束时间
T1.supplier_id, -- 供应商id
T9."name" AS supplier_name, -- 供应商名称
T7.part_percent -- 拆零比
FROM wor_supply_request T1
LEFT JOIN adm_device_definition T7
ON T1.item_id = T7.id
@@ -289,7 +288,7 @@
ON T11.definition_id = T10.id
AND T11.delete_flag = '0'
AND T11.condition_value = T4.lot_number
AND T11.condition_code = '1'--1:批号进价
AND T11.condition_code = '1'-- 1:批号进价
WHERE T1.purpose_location_id = #{locationId}
AND T1.status_enum = #{statusEnum}
AND T1.type_enum = #{typeEnum}
@@ -297,4 +296,137 @@
AND T1.item_table = #{deviceTableName}
AND T1.delete_flag = '0'
</select>
<select id="selectLossDetail" resultType="com.openhis.web.inventorymanage.dto.LossReceiptDetailDto">
SELECT T1.id, -- ID
T1.bus_no AS supply_bus_no, -- 单据号
T1.item_id, -- 物品编码
T1.purpose_type_enum, -- 目的类型
T1.purpose_location_id, -- 目的仓库
T5."name" AS purpose_location_name, -- 目的仓库名称
T6."name" AS purpose_location_store_name, -- 目的仓位
T1.occurrence_time, -- 报损时间
#{medicine} AS item_type, -- 药品类型
T1.remake, -- 备注
T2.bus_no AS item_bus_no, -- 项目编码
T2."name" AS item_name, -- 名称
T3.total_volume, -- 规格
T1.unit_code AS measurement_unit_code, -- 物品计量单位
T2.unit_code, -- 包装单位
T2.min_unit_code, -- 最小单位
T2.manufacturer_text, -- 生产厂商文本
T4.lot_number, -- 产品批号
T4.quantity AS total_quantity, -- 当前库存数量
T1.item_quantity, -- 数量(报损数量)
T11.amount AS price, -- 采购单价(大单位)
T1.total_price, -- 总价(报损金额)
T1.reason_code, -- 理由类型(报损原因)
T1.reason, -- 理由(报损详细)
T1.start_time, -- 开始时间
T1.end_time, -- 结束时间
T1.supplier_id, -- 供应商id
T9."name" AS supplier_name, -- 供应商名称
T2.part_percent, -- 拆零比
T1.total_quantity AS old_quantity, -- 报损前数量
sdd.dict_label AS unitCodeDict_text,
sdd1.dict_label AS minUnitCodeDict_text
FROM wor_supply_request T1
LEFT JOIN med_medication_definition T2
ON T1.item_id = T2.id
AND T2.delete_flag = '0'
LEFT JOIN med_medication T3
ON T3.medication_def_id = T2.id
AND T3.delete_flag = '0'
LEFT JOIN wor_inventory_item T4
ON T1.item_id = T4.item_id
AND T1.purpose_location_id = T4.location_id
AND T1.lot_number = T4.lot_number
AND T4.delete_flag = '0'
LEFT JOIN adm_location T5
ON T1.purpose_location_id = T5.id
AND T5.delete_flag = '0'
LEFT JOIN adm_location T6
ON T1.purpose_location_store_id = T6.id
AND T6.delete_flag = '0'
LEFT JOIN adm_supplier T9
ON T9.id = T1.supplier_id
LEFT JOIN adm_charge_item_definition AS T10
ON T10.instance_id = T4.item_id
AND T10.delete_flag = '0'
LEFT JOIN adm_charge_item_def_detail AS T11
ON T11.definition_id = T10.id
AND T11.delete_flag = '0'
AND T11.condition_value = T4.lot_number
AND T11.condition_code = '1'-- 1:批号进价
LEFT JOIN sys_dict_data sdd ON sdd.dict_value = T2.unit_code AND sdd.dict_type = 'unit_code'
LEFT JOIN sys_dict_data sdd1 ON sdd1.dict_value = T2.min_unit_code AND sdd1.dict_type = 'unit_code'
WHERE T1.bus_no = #{busNo}
AND T1.item_table = #{medicationTableName}
AND T1.delete_flag = '0'
UNION
SELECT T1.id, -- ID
T1.bus_no AS supply_bus_no, -- 单据号
T1.item_id, -- 物品编码
T1.purpose_type_enum, -- 目的类型
T1.purpose_location_id, -- 目的仓库
T5."name" AS purpose_location_name, -- 目的仓库名称
T6."name" AS purpose_location_store_name, -- 目的仓位
T1.occurrence_time, -- 报损时间
#{device} AS item_type, -- 器材类型
T1.remake, -- 备注
T7.bus_no AS item_bus_no, -- 项目编码
T7."name" AS item_name, -- 名称
T7."size" AS total_volume, -- 器材规格
T1.unit_code AS measurement_unit_code, -- 物品计量单位
T7.unit_code, -- 包装单位
T7.min_unit_code, -- 最小单位
T7.manufacturer_text, -- 生产厂商文本
T4.lot_number, -- 产品批号
T4.quantity AS total_quantity, -- 当前库存数量
T1.item_quantity, -- 数量(报损数量)
T11.amount AS price, -- 采购单价(大单位)
T1.total_price, -- 总价(报损金额)
T1.reason_code, -- 理由类型(报损原因)
T1.reason, -- 理由(报损详细)
T1.start_time, -- 开始时间
T1.end_time, -- 结束时间
T1.supplier_id, -- 供应商id
T9."name" AS supplier_name, -- 供应商名称
T7.part_percent, -- 拆零比
T1.total_quantity AS old_quantity, -- 报损前数量
sdd.dict_label AS unitCodeDict_text,
sdd1.dict_label AS minUnitCodeDict_text
FROM wor_supply_request T1
LEFT JOIN adm_device_definition T7
ON T1.item_id = T7.id
AND T7.delete_flag = '0'
LEFT JOIN wor_inventory_item T4
ON T1.item_id = T4.item_id
AND T1.purpose_location_id = T4.location_id
AND T1.lot_number = T4.lot_number
AND T4.delete_flag = '0'
LEFT JOIN adm_location T5
ON T1.purpose_location_id = T5.id
AND T5.delete_flag = '0'
LEFT JOIN adm_location T6
ON T1.purpose_location_store_id = T6.id
AND T6.delete_flag = '0'
LEFT JOIN adm_supplier T9
ON T9.id = T1.supplier_id
AND T9.delete_flag = '0'
LEFT JOIN adm_charge_item_definition AS T10
ON T10.instance_id = T4.item_id
AND T10.delete_flag = '0'
LEFT JOIN adm_charge_item_def_detail AS T11
ON T11.definition_id = T10.id
AND T11.delete_flag = '0'
AND T11.condition_value = T4.lot_number
AND T11.condition_code = '1'-- 1:批号进价
LEFT JOIN sys_dict_data sdd ON sdd.dict_value = T7.unit_code AND sdd.dict_type = 'unit_code'
LEFT JOIN sys_dict_data sdd1 ON sdd1.dict_value = T7.min_unit_code AND sdd1.dict_type = 'unit_code'
WHERE T1.bus_no = #{busNo}
AND T1.item_table = #{deviceTableName}
AND T1.delete_flag = '0'
</select>
</mapper>

362
openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/ProductStocktakingMapper.xml
View File

@@ -5,19 +5,19 @@
<select id="selectStocktakingReceiptPage"
resultType="com.openhis.web.inventorymanage.dto.ReceiptPageDto">
SELECT T4.tenant_id,
T4.supply_bus_no, --单据号
T4.type_enum, --类型
T4.status_enum, --状态
T4.purpose_type_enum, --目的类型
T4.purpose_location_id, --目的仓库
T4.purpose_location_store_id, --目的仓位
T4.breakeven_price, --盈亏金额
T4.applicant_id, --申请人
T4.approver_id, --审批人
T4.create_time, -- 制单时间
T4.approval_time --审批时间
T4.supply_bus_no, -- 单据号
T4.type_enum, -- 类型
T4.status_enum, -- 状态
T4.purpose_type_enum, -- 目的类型
T4.purpose_location_id, -- 目的仓库
T4.purpose_location_store_id, -- 目的仓位
T4.breakeven_price, -- 盈亏金额
T4.applicant_id, -- 申请人
T4.approver_id, -- 审批人
T4.create_time, -- 制单时间
T4.approval_time -- 审批时间
FROM (SELECT T1.tenant_id,
T1.bus_no AS supply_bus_no,
T1.bus_no AS supply_bus_no,
T1.type_enum,
T1.status_enum,
T1.purpose_type_enum,
@@ -49,8 +49,7 @@
T1.applicant_id,
T1.approver_id,
T1.approval_time
ORDER BY T1.bus_no desc
) AS T4
ORDER BY T1.bus_no desc) AS T4
${ew.customSqlSegment}
</select>
<select id="selectDetail" resultType="com.openhis.web.inventorymanage.dto.ReceiptDetailDto">
@@ -73,6 +72,7 @@
T2.min_unit_code, --最小单位(小单位)
T2.manufacturer_text, --生产厂商文本
T4.lot_number, --产品批号
T4.quantity AS org_quantity, --实际库存
T1.total_quantity, --实盘数量(常规单位)(小单位)
T11.amount AS price, --采购单价(大单位)
T1.item_quantity, --数量(盈亏数量)(小单位)
@@ -108,7 +108,7 @@
ON T11.definition_id = T10.id
AND T11.delete_flag = '0'
AND T11.condition_value = T4.lot_number
AND T11.condition_code = '1'--1:批号进价
AND T11.condition_code = '1'-- 1:批号进价
WHERE T1.bus_no = #{busNo}
AND T1.delete_flag = '0'
AND T1.item_table = #{medicationTableName}
@@ -119,7 +119,7 @@
T1.item_id,
T1.purpose_type_enum,
T1.purpose_location_id,
T7."name" AS purpose_location_name,
T7."name" AS purpose_location_name,
T1.purpose_location_store_id,
T1.occurrence_time,
#{device} AS item_type,
@@ -127,22 +127,23 @@
T5.bus_no AS item_bus_no,
T5."name" AS item_name,
T5."size" AS total_volume,
T1.unit_code AS measurement_unit_code, -- 物品计量单位
T1.unit_code AS measurement_unit_code, -- 物品计量单位
T5.unit_code,
T5.min_unit_code AS min_unit_code,
T5.manufacturer_text,
T4.lot_number,
T4.quantity AS org_quantity, --实际库存
T1.total_quantity,
T11.amount AS price, --采购单价(大单位)
T11.amount AS price, -- 采购单价(大单位)
T1.item_quantity,
T1.total_price,
T1.reason_code,
T1.reason,
T5.yb_no,
T1.start_time, -- 开始时间
T1.end_time, -- 结束时间
T1.supplier_id, -- 供应商id
T8."name" AS supplier_name, -- 供应商名称
T1.start_time, -- 开始时间
T1.end_time, -- 结束时间
T1.supplier_id, -- 供应商id
T8."name" AS supplier_name, -- 供应商名称
T5.part_percent
FROM wor_supply_request AS T1
LEFT JOIN adm_device_definition AS T5
@@ -164,7 +165,7 @@
ON T11.definition_id = T10.id
AND T11.delete_flag = '0'
AND T11.condition_value = T4.lot_number
AND T11.condition_code = '1'--1:批号进价
AND T11.condition_code = '1'-- 1:批号进价
WHERE T1.bus_no = #{busNo}
AND T1.delete_flag = '0'
AND T1.item_table = #{deviceTableName}
@@ -172,29 +173,29 @@
<select id="selectStocktakingReceiptDetail"
resultType="com.openhis.web.inventorymanage.dto.ReceiptDetailDto">
SELECT T6.tenant_id,
T6.id AS item_Id, --Id
T6.bus_no AS item_bus_no, --编码
T6.item_type, --药品类型
T6.medication_type, -- 药品类型
T6.item_name, --名称
T6.total_volume, --规格
T6.lot_number, --产品批号
T6.yb_no, --医保编码
T6.measurement_unit_code, -- 计量单位
T6.unit_code, --药品单位(包装单位)(大单位)
T6.min_unit_code, --最小单位(小单位)
T6.part_percent, --拆零比
T6.stocktaking_unit_code, --常规单位(小单位)
T6.quantity AS total_quantity, --当前库存数量(常规单位)(小单位)
T6.price, --采购单价(大单位)
T6.manufacturer_text, --生产厂商文本
T6.location_id AS purpose_location_id, --仓库
T6.location_store_id AS purpose_location_store_id, --库位
T6.supplier_id, -- 供应商id
T6.supplier_name, -- 供应商名称
T6.start_time, -- 生产日期
T6.end_time, -- 有效期
T6.form_enum AS purpose_type_enum --仓库类型
T6.id AS item_Id, -- Id
T6.bus_no AS item_bus_no, -- 编码
T6.item_type, -- 药品类型
T6.medication_type, -- 药品类型
T6.item_name, -- 名称
T6.total_volume, -- 规格
T6.lot_number, -- 产品批号
T6.yb_no, -- 医保编码
T6.measurement_unit_code, -- 计量单位
T6.unit_code, -- 药品单位(包装单位)(大单位)
T6.min_unit_code, -- 最小单位(小单位)
T6.part_percent, -- 拆零比
T6.stocktaking_unit_code, -- 常规单位(小单位)
T6.quantity AS total_quantity, -- 当前库存数量(常规单位)(小单位)
T6.price, -- 采购单价(大单位)
T6.manufacturer_text, -- 生产厂商文本
T6.location_id AS purpose_location_id, -- 仓库
T6.location_store_id AS purpose_location_store_id, -- 库位
T6.supplier_id, -- 供应商id
T6.supplier_name, -- 供应商名称
T6.start_time, -- 生产日期
T6.end_time, -- 有效期
T6.form_enum AS purpose_type_enum -- 仓库类型
FROM (SELECT T1.tenant_id,
T2.id,
T2.bus_no,
@@ -214,8 +215,8 @@
T2.manufacturer_text,
T1.location_id,
T1.location_store_id,
T1.supplier_id, -- 供应商id
T7."name" AS supplier_name, -- 供应商名称
T1.supplier_id, -- 供应商id
T7."name" AS supplier_name, -- 供应商名称
T1.production_date AS start_time,
T1.expiration_date AS end_time,
T5.form_enum
@@ -238,7 +239,7 @@
ON T11.definition_id = T10.id
AND T11.delete_flag = '0'
AND T11.condition_value = T1.lot_number
AND T11.condition_code = '1'--1:批号进价
AND T11.condition_code = '1'-- 1:批号进价
WHERE T1.delete_flag = '0'
AND T1.inventory_status_enum = #{inventoryStatusEnum}
AND T1.location_id = #{sourceLocationId}
@@ -263,8 +264,8 @@
T4.manufacturer_text,
T1.location_id,
T1.location_store_id,
T1.supplier_id, -- 供应商id
T7."name" AS supplier_name, -- 供应商名称
T1.supplier_id, -- 供应商id
T7."name" AS supplier_name, -- 供应商名称
T1.production_date AS start_time,
T1.expiration_date AS end_time,
T5.form_enum
@@ -284,7 +285,7 @@
ON T11.definition_id = T10.id
AND T11.delete_flag = '0'
AND T11.condition_value = T1.lot_number
AND T11.condition_code = '1'--1:批号进价
AND T11.condition_code = '1'-- 1:批号进价
WHERE T1.delete_flag = '0'
AND T1.inventory_status_enum = #{inventoryStatusEnum}
AND T1.location_id = #{sourceLocationId}
@@ -295,20 +296,20 @@
<select id="selectAutoStocktakingBatch"
resultType="com.openhis.web.inventorymanage.dto.ProductStocktakingDto">
SELECT T1.id,
T1.item_table, --项目
T2.id AS item_id, --项目id
T1.unit_code AS unit_code,--物品计量单位
0 AS item_quantity,--盈亏数量
T1.quantity AS total_quantity,--合计数量
T11.amount / T2.part_percent AS price,--单价
0 AS total_price, -- 盈亏金额
T5.form_enum AS purpose_type_enum,--目的仓库类型
T1.location_id AS purpose_location_id,--目的仓库
T1.location_store_id AS purpose_location_store_id,--目的仓位
T1.supplier_id,--供应商
T1.production_date AS start_time,--开始时间
T1.expiration_date AS end_time,--结束时间
T1.lot_number--产品批号
T1.item_table, -- 项目
T2.id AS item_id, -- 项目id
T1.unit_code AS unit_code,-- 物品计量单位
0 AS item_quantity,-- 盈亏数量
T1.quantity AS total_quantity,-- 合计数量
T11.amount / T2.part_percent AS price,-- 单价
0 AS total_price, -- 盈亏金额
T5.form_enum AS purpose_type_enum,-- 目的仓库类型
T1.location_id AS purpose_location_id,-- 目的仓库
T1.location_store_id AS purpose_location_store_id,-- 目的仓位
T1.supplier_id,-- 供应商
T1.production_date AS start_time,-- 开始时间
T1.expiration_date AS end_time,-- 结束时间
T1.lot_number-- 产品批号
FROM wor_inventory_item T1
LEFT JOIN med_medication_definition T2
ON T1.item_id = T2.id
@@ -328,26 +329,26 @@
ON T11.definition_id = T10.id
AND T11.delete_flag = '0'
AND T11.condition_value = T1.lot_number
AND T11.condition_code = '1'--1:批号进价
AND T11.condition_code = '1'-- 1:批号进价
WHERE T1.delete_flag = '0'
AND T1.inventory_status_enum = #{inventoryStatusEnum}
AND T1.item_table = #{medicationTableName}
UNION
SELECT T1.id,
T1.item_table, --项目
T4.id AS item_id, --项目id
T1.unit_code AS unit_code,--物品计量单位
0 AS item_quantity,--盈亏数量
T1.quantity AS total_quantity,--合计数量
T11.amount / T4.part_percent AS price,--单价
0 AS total_price, -- 盈亏金额
T5.form_enum AS purpose_type_enum,--目的仓库类型
T1.location_id AS purpose_location_id,--目的仓库
T1.location_store_id AS purpose_location_store_id,--目的仓位
T1.supplier_id,--供应商
T1.production_date AS start_time,--开始时间
T1.expiration_date AS end_time,--结束时间
T1.lot_number--产品批号
T1.item_table, -- 项目
T4.id AS item_id, -- 项目id
T1.unit_code AS unit_code,-- 物品计量单位
0 AS item_quantity,-- 盈亏数量
T1.quantity AS total_quantity,-- 合计数量
T11.amount / T4.part_percent AS price,-- 单价
0 AS total_price, -- 盈亏金额
T5.form_enum AS purpose_type_enum,-- 目的仓库类型
T1.location_id AS purpose_location_id,-- 目的仓库
T1.location_store_id AS purpose_location_store_id,-- 目的仓位
T1.supplier_id,-- 供应商
T1.production_date AS start_time,-- 开始时间
T1.expiration_date AS end_time,-- 结束时间
T1.lot_number-- 产品批号
FROM wor_inventory_item T1
LEFT JOIN adm_device_definition T4
ON T1.item_id = T4.id
@@ -364,43 +365,43 @@
ON T11.definition_id = T10.id
AND T11.delete_flag = '0'
AND T11.condition_value = T1.lot_number
AND T11.condition_code = '1'--1:批号进价
AND T11.condition_code = '1'-- 1:批号进价
WHERE T1.delete_flag = '0'
AND T1.inventory_status_enum = #{inventoryStatusEnum}
AND T1.item_table = #{deviceTableName}
</select>
<select id="getMonthlySettlementDetail" resultType="com.openhis.web.inventorymanage.dto.ReceiptDetailDto">
SELECT T1.id, --ID
T1.bus_no, --单据号
T1.trace_no, --追溯码
T1.item_id, --物品编码
T1.purpose_type_enum, --目的类型
T1.purpose_location_id, --目的仓库
T7."name" AS purpose_location_name, -- 目的仓库
T1.purpose_location_store_id, --目的仓位
T1.occurrence_time, --期望时间(盘点日期)
#{medicine} AS item_type, --药品类型
T1.remake, --备注
T2.bus_no AS item_bus_no, --项目编码
T2."name" AS item_name, --名称
T3.total_volume, --规格
T1.unit_code AS measurement_unit_code, -- 物品计量单位
T2.unit_code, --包装单位(大单位)
T2.min_unit_code, --最小单位(小单位)
T2.manufacturer_text, --生产厂商文本
T4.lot_number, --产品批号
T1.total_quantity, --实盘数量(常规单位)(小单位)
T11.amount AS price, --采购单价(大单位)
T1.item_quantity, --数量(盈亏数量)(小单位)
T1.total_price, --总价(盈亏金额)
T1.reason_code, --理由类型(盈亏原因)
T1.reason, --理由(盈亏详细)
T2.yb_no, --医保编码
T1.start_time, -- 开始时间
T1.end_time, -- 结束时间
T1.supplier_id, -- 供应商id
T8."name" AS supplier_name, -- 供应商名称
T2.part_percent --拆零比
SELECT T1.id, -- ID
T1.bus_no, -- 单据号
T1.trace_no, -- 追溯码
T1.item_id, -- 物品编码
T1.purpose_type_enum, -- 目的类型
T1.purpose_location_id, -- 目的仓库
T7."name" AS purpose_location_name, -- 目的仓库
T1.purpose_location_store_id, -- 目的仓位
T1.occurrence_time, -- 期望时间(盘点日期)
#{medicine} AS item_type, -- 药品类型
T1.remake, -- 备注
T2.bus_no AS item_bus_no, -- 项目编码
T2."name" AS item_name, -- 名称
T3.total_volume, -- 规格
T1.unit_code AS measurement_unit_code, -- 物品计量单位
T2.unit_code, -- 包装单位(大单位)
T2.min_unit_code, -- 最小单位(小单位)
T2.manufacturer_text, -- 生产厂商文本
T4.lot_number, -- 产品批号
T1.total_quantity, -- 实盘数量(常规单位)(小单位)
T11.amount AS price, -- 采购单价(大单位)
T1.item_quantity, -- 数量(盈亏数量)(小单位)
T1.total_price, -- 总价(盈亏金额)
T1.reason_code, -- 理由类型(盈亏原因)
T1.reason, -- 理由(盈亏详细)
T2.yb_no, -- 医保编码
T1.start_time, -- 开始时间
T1.end_time, -- 结束时间
T1.supplier_id, -- 供应商id
T8."name" AS supplier_name, -- 供应商名称
T2.part_percent -- 拆零比
FROM
<if test="endTime == null">
wor_aut_supply_request AS T1
@@ -430,7 +431,7 @@
ON T11.definition_id = T10.id
AND T11.delete_flag = '0'
AND T11.condition_value = T4.lot_number
AND T11.condition_code = '1'--1:批号进价
AND T11.condition_code = '1'-- 1:批号进价
WHERE T1.purpose_location_id = #{locationId}
AND T1.status_enum = #{statusEnum}
AND T1.type_enum IN
@@ -460,22 +461,22 @@
T5.bus_no AS item_bus_no,
T5."name" AS item_name,
T5."size" AS total_volume,
T1.unit_code AS measurement_unit_code, -- 物品计量单位
T1.unit_code AS measurement_unit_code, -- 物品计量单位
T5.unit_code,
T5.min_unit_code AS min_unit_code,
T5.manufacturer_text,
T4.lot_number,
T1.total_quantity,
T11.amount AS price, --采购单价(大单位)
T11.amount AS price, -- 采购单价(大单位)
T1.item_quantity,
T1.total_price,
T1.reason_code,
T1.reason,
T5.yb_no,
T1.start_time, -- 开始时间
T1.end_time, -- 结束时间
T1.supplier_id, -- 供应商id
T8."name" AS supplier_name, -- 供应商名称
T1.start_time, -- 开始时间
T1.end_time, -- 结束时间
T1.supplier_id, -- 供应商id
T8."name" AS supplier_name, -- 供应商名称
T5.part_percent
FROM
<if test="endTime == null">
@@ -503,7 +504,7 @@
ON T11.definition_id = T10.id
AND T11.delete_flag = '0'
AND T11.condition_value = T4.lot_number
AND T11.condition_code = '1'--1:批号进价
AND T11.condition_code = '1'-- 1:批号进价
WHERE T1.purpose_location_id = #{locationId}
AND T1.status_enum = #{statusEnum}
AND T1.type_enum IN
@@ -519,4 +520,123 @@
AND T1.item_table = #{deviceTableName}
AND T1.delete_flag = '0'
</select>
<select id="selectInventoryReceiptDetail" resultType="com.openhis.web.inventorymanage.dto.InventoryReceiptDetailDto">
SELECT T1.id, -- ID
T1.bus_no, -- 单据号
T1.trace_no, -- 追溯码
T1.item_id, -- 物品编码
T1.purpose_type_enum, -- 目的类型
T1.purpose_location_id, -- 目的仓库
T7."name" AS purpose_location_name, -- 目的仓库
T1.purpose_location_store_id, -- 目的仓位
T1.occurrence_time, -- 期望时间(盘点日期)
#{medicine} AS item_type, -- 药品类型
T1.remake, -- 备注
T2.bus_no AS item_bus_no, -- 项目编码
T2."name" AS item_name, -- 名称
T3.total_volume, -- 规格
T1.unit_code AS measurement_unit_code, -- 物品计量单位
T2.unit_code, -- 包装单位(大单位)
T2.min_unit_code, -- 最小单位(小单位)
T2.manufacturer_text, -- 生产厂商文本
T4.lot_number, -- 产品批号
T1.total_quantity, -- 实盘数量(常规单位)(小单位)
T11.amount AS price, -- 采购单价(大单位)
T1.item_quantity, -- 数量(盈亏数量)(小单位)
T1.total_price, -- 总价(盈亏金额)
T1.reason_code, -- 理由类型(盈亏原因)
T1.reason, -- 理由(盈亏详细)
T2.yb_no, -- 医保编码
T1.start_time, -- 开始时间
T1.end_time, -- 结束时间
T1.supplier_id, -- 供应商id
T8."name" AS supplier_name, -- 供应商名称
T2.part_percent -- 拆零比
FROM wor_supply_request AS T1
LEFT JOIN med_medication_definition AS T2
ON T1.item_id = T2.id
AND T2.delete_flag = '0'
LEFT JOIN med_medication AS T3
ON T2.id = T3.medication_def_id
AND T3.delete_flag = '0'
LEFT JOIN wor_inventory_item AS T4
ON T1.item_id = T4.item_id
AND T1.purpose_location_id = T4.location_id
AND T1.lot_number = T4.lot_number
AND T4.delete_flag = '0'
LEFT JOIN adm_location T7
ON T1.purpose_location_id = T7.id
LEFT JOIN adm_supplier T8
ON T8.id = T1.supplier_id
LEFT JOIN adm_charge_item_definition AS T10
ON T10.instance_id = T4.item_id
AND T10.delete_flag = '0'
LEFT JOIN adm_charge_item_def_detail AS T11
ON T11.definition_id = T10.id
AND T11.delete_flag = '0'
AND T11.condition_value = T4.lot_number
AND T11.condition_code = '1'-- 1:批号进价
WHERE T1.bus_no = #{busNo}
AND T1.delete_flag = '0'
AND T1.item_table = #{medicationTableName}
UNION
SELECT T1.id,
T1.bus_no,
T1.trace_no,
T1.item_id,
T1.purpose_type_enum,
T1.purpose_location_id,
T7."name" AS purpose_location_name,
T1.purpose_location_store_id,
T1.occurrence_time,
#{device} AS item_type,
T1.remake,
T5.bus_no AS item_bus_no,
T5."name" AS item_name,
T5."size" AS total_volume,
T1.unit_code AS measurement_unit_code, -- 物品计量单位
T5.unit_code,
T5.min_unit_code AS min_unit_code,
T5.manufacturer_text,
T4.lot_number,
T1.total_quantity,
T11.amount AS price, -- 采购单价(大单位)
T1.item_quantity,
T1.total_price,
T1.reason_code,
T1.reason,
T5.yb_no,
T1.start_time, -- 开始时间
T1.end_time, -- 结束时间
T1.supplier_id, -- 供应商id
T8."name" AS supplier_name, -- 供应商名称
T5.part_percent
FROM wor_supply_request AS T1
LEFT JOIN adm_device_definition AS T5
ON T1.item_id = T5.id
AND T5.delete_flag = '0'
LEFT JOIN wor_inventory_item AS T4
ON T1.item_id = T4.item_id
AND T1.purpose_location_id = T4.location_id
AND T1.lot_number = T4.lot_number
AND T4.delete_flag = '0'
LEFT JOIN adm_location T7
ON T1.purpose_location_id = T7.id
LEFT JOIN adm_supplier T8
ON T8.id = T1.supplier_id
LEFT JOIN adm_charge_item_definition AS T10
ON T10.instance_id = T4.item_id
AND T10.delete_flag = '0'
LEFT JOIN adm_charge_item_def_detail AS T11
ON T11.definition_id = T10.id
AND T11.delete_flag = '0'
AND T11.condition_value = T4.lot_number
AND T11.condition_code = '1'-- 1:批号进价
WHERE T1.bus_no = #{busNo}
AND T1.delete_flag = '0'
AND T1.item_table = #{deviceTableName}
</select>
</mapper>

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

@@ -16,7 +16,8 @@
T2.approval_time, -- 审批时间
T2.applicant_id, -- 申请人ID
T2.create_time, -- 制单时间
T2.tenant_id -- 租户ID
T2.tenant_id, -- 租户ID
T2.total_amount
FROM (SELECT T1.bus_no AS supply_bus_no,
T1.status_enum,
T1.type_enum,
@@ -29,7 +30,8 @@
T2."name" AS source_location_name, -- 源仓库
T1.purpose_location_id,
T3."name" AS purpose_location_name, -- 目的仓库
T1.tenant_id -- 租户ID
T1.tenant_id, -- 租户ID
sum(T1.total_price) AS total_amount
FROM wor_supply_request AS T1
LEFT JOIN adm_location T2
ON T1.source_location_id = T2.id
@@ -55,11 +57,12 @@
</select>
<select id="selectBatchTransferDetail" resultType="com.openhis.web.inventorymanage.dto.ProductTransferDetailDto">
SELECT A.tenant_id,
A.id,
A.medication_type, -- 药品类型
A.item_type, -- 药品类型
A.name, -- 项目
A.total_volume, -- 规格
A.manufacturer, -- 生产厂家
A.manufacturer_text, -- 生产厂家
A.measurement_unit_code, -- 计量单位
A.unit_code, -- 包装单位
A.min_unit_code, -- 最小单位
@@ -77,11 +80,12 @@
A.supplier_name, -- 供应商名称
A.packaging_levels -- 追溯码包装层级
FROM (SELECT T1.tenant_id,
T1.id,
#{medicine} AS medication_type,
#{medicine} AS item_type,
T1.name,
T3.total_volume,
T2.manufacturer_text AS manufacturer,
T2.manufacturer_text ,
T1.unit_code AS measurement_unit_code,
T2.unit_code,
T2.min_unit_code,
@@ -129,11 +133,12 @@
AND T1.quantity > 0
UNION ALL
SELECT T1.tenant_id,
T1.id,
#{device} AS medication_type,
#{device} AS item_type,
T1.name,
T5.size AS total_volume,
T5.manufacturer_text AS manufacturer,
T5.manufacturer_text,
T1.unit_code AS measurement_unit_code,
T5.unit_code,
T5.min_unit_code,
@@ -179,6 +184,8 @@
) AS A
${ew.customSqlSegment}
</select>
<select id="selectDetail" resultType="com.openhis.web.inventorymanage.dto.ProductTransferDetailDto">
SELECT DISTINCT T1.id,
T1.bus_no, -- 商品调拨单据号
@@ -196,7 +203,7 @@
#{medicine} AS item_type, -- 项目类型
T2.name, -- 药品名称
T3.total_volume, -- 规格
T2.manufacturer_text AS manufacturer, -- 生产厂商
T2.manufacturer_text, -- 生产厂商
T4."name" AS supplier_name, -- 供应商名称
T1.unit_code AS measurement_unit_code, -- 物品计量单位
T2.unit_code, -- 包装单位
@@ -213,8 +220,9 @@
T2.part_percent, -- 拆零比
T1.remake, -- 备注
T1.occurrence_time,
T9.quantity AS total_source_quantity, -- 库存数量(源库存)
T12.quantity AS total_purpose_quantity -- 库存数量(目的库存)
T1.total_quantity AS total_source_quantity, -- 库存数量(源库存)
T12.quantity AS total_purpose_quantity, -- 库存数量(目的库存)
sdt.dict_label AS measurementUnitCode_dictText -- 物品计量单位文字
FROM wor_supply_request T1
LEFT JOIN med_medication_definition T2
ON T1.item_id = T2.id
@@ -243,15 +251,17 @@
ON T11.definition_id = T10.id
AND T11.delete_flag = '0'
AND T11.condition_value = T9.lot_number
AND T11.condition_code = '1'--1:批号进价
AND T11.condition_code = '1' -- 1:批号进价
LEFT JOIN wor_inventory_item T12
ON T1.item_id = T12.item_id
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
LEFT JOIN sys_dict_data sdt
ON sdt.dict_value = T1.unit_code AND dict_type = 'unit_code'
WHERE T1.bus_no = #{busNo}
AND T1.item_table = #{medicationTableName}
AND T9.item_table = #{medicationTableName}
AND T1.delete_flag = '0'
UNION
SELECT DISTINCT T1.id,
@@ -270,7 +280,7 @@
#{device} AS item_type, -- 项目类型
T2.name, -- 药品名称
T2."size" AS total_volume, -- 规格
T2.manufacturer_text AS manufacturer, -- 生产厂商
T2.manufacturer_text, -- 生产厂商
T4."name" AS supplier_name, -- 供应商名称
T1.unit_code AS measurement_unit_code, -- 物品计量单位
T2.unit_code, -- 包装单位
@@ -287,8 +297,9 @@
T2.part_percent, -- 拆零比
T1.remake, -- 备注
T1.occurrence_time,
T9.quantity AS total_source_quantity, -- 总库存数量(源库存)
T12.quantity AS total_purpose_quantity -- 总库存数量(目的库存)
T1.total_quantity AS total_source_quantity, -- 总库存数量(源库存)
T12.quantity AS total_purpose_quantity, -- 总库存数量(目的库存)
sdt.dict_label AS measurementUnitCode_dictText
FROM wor_supply_request T1
LEFT JOIN adm_device_definition T2
ON T1.item_id = T2.id
@@ -315,17 +326,20 @@
ON T11.definition_id = T10.id
AND T11.delete_flag = '0'
AND T11.condition_value = T9.lot_number
AND T11.condition_code = '1'--1:批号进价
AND T11.condition_code = '1' -- 1:批号进价
LEFT JOIN wor_inventory_item T12
ON T1.item_id = T12.item_id
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
LEFT JOIN sys_dict_data sdt
ON sdt.dict_value = T1.unit_code AND dict_type = 'unit_code'
WHERE T1.bus_no = #{busNo}
AND T1.item_table = #{deviceTableName}
AND T9.item_table = #{deviceTableName}
AND T1.delete_flag = '0'
</select>
<select id="getMonthlySettlementDetail" resultType="com.openhis.web.inventorymanage.dto.ReceiptDetailDto">
SELECT DISTINCT T1.id,
T1.bus_no, -- 商品调拨单据号
@@ -343,7 +357,7 @@
#{medicine} AS item_type, -- 项目类型
T2.name, -- 药品名称
T3.total_volume, -- 规格
T2.manufacturer_text AS manufacturer, -- 生产厂商
T2.manufacturer_text , -- 生产厂商
T4."name" AS supplier_name, -- 供应商名称
T1.unit_code AS measurement_unit_code, -- 物品计量单位
T2.unit_code, -- 包装单位
@@ -425,7 +439,7 @@
#{device} AS item_type, -- 项目类型
T2.name, -- 药品名称
T2."size" AS total_volume, -- 规格
T2.manufacturer_text AS manufacturer, -- 生产厂商
T2.manufacturer_text , -- 生产厂商
T4."name" AS supplier_name, -- 供应商名称
T1.unit_code AS measurement_unit_code, -- 物品计量单位
T2.unit_code, -- 包装单位

410
openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/PurchaseReturnMapper.xml
View File

@@ -8,94 +8,95 @@
WHEN T1.type_enum = #{purchaseReturn}
THEN T1.item_quantity
ELSE 0
END AS item_quantity, --退库数量
END AS item_quantity, -- 退库数量
CASE
WHEN T1.type_enum = #{purchaseReturn}
THEN (
SELECT COALESCE(SUM(T9.item_quantity), 0)
FROM wor_supply_request AS T9
WHERE T9.original_bus_no = T1.original_bus_no
AND T9.item_id = T1.item_id
AND T9.lot_number = T1.lot_number
AND T9.delete_flag = '0'
AND T9.status_enum = #{agree}
)
ELSE (
SELECT COALESCE(SUM(T9.item_quantity), 0)
FROM wor_supply_request AS T9
WHERE T9.original_bus_no = T1.bus_no
AND T9.item_id = T1.item_id
AND T9.lot_number = T1.lot_number
AND T9.delete_flag = '0'
AND T9.status_enum = #{agree}
)
END AS returned_quantity, --已退数量
THEN (SELECT COALESCE(SUM(T9.item_quantity), 0)
FROM wor_supply_request AS T9
WHERE T9.original_bus_no = T1.original_bus_no
AND T9.item_id = T1.item_id
AND T9.lot_number = T1.lot_number
AND T9.delete_flag = '0'
AND T9.status_enum = #{agree})
ELSE (SELECT COALESCE(SUM(T9.item_quantity), 0)
FROM wor_supply_request AS T9
WHERE T9.original_bus_no = T1.bus_no
AND T9.item_id = T1.item_id
AND T9.lot_number = T1.lot_number
AND T9.delete_flag = '0'
AND T9.status_enum = #{agree})
END AS returned_quantity, -- 已退数量
CASE
WHEN T1.type_enum = #{purchaseReturn}
THEN T1.id
ELSE NULL
END AS id, --采购退货id
END AS id, -- 采购退货id
CASE
WHEN T1.type_enum = #{purchaseReturn}
THEN NULL
ELSE T1.id
END AS purchase_id, --采购入库id
T2.quantity AS quantity, --库存数量
END AS purchase_id, -- 采购入库id
T2.quantity AS quantity, -- 库存数量
CASE
WHEN T1.type_enum = #{purchaseReturn}
THEN (
SELECT T9.item_quantity
FROM wor_supply_request AS T9
WHERE T1.original_bus_no = T9.bus_no
AND T9.item_id = T1.item_id
AND T9.lot_number = T1.lot_number
AND T9.delete_flag = '0'
)
THEN (SELECT T9.item_quantity
FROM wor_supply_request AS T9
WHERE T1.original_bus_no = T9.bus_no
AND T9.item_id = T1.item_id
AND T9.lot_number = T1.lot_number
AND T9.delete_flag = '0')
ELSE T3.quantity
END AS purchase_quantity, --采购数量
T11.amount AS price, --采购单价
END AS purchase_quantity, -- 采购数量
T11.amount AS price, -- 采购单价
CASE
WHEN T1.type_enum = #{purchaseReturn}
THEN (
SELECT T9.unit_code
FROM wor_supply_request AS T9
WHERE T1.original_bus_no = T9.bus_no
AND T9.item_id = T1.item_id
AND T9.lot_number = T1.lot_number
AND T9.delete_flag = '0'
)
THEN (SELECT T9.unit_code
FROM wor_supply_request AS T9
WHERE T1.original_bus_no = T9.bus_no
AND T9.item_id = T1.item_id
AND T9.lot_number = T1.lot_number
AND T9.delete_flag = '0')
ELSE T1.unit_code
END AS purchase_unit_code, --采购单位
T1.unit_code AS measurement_unit_code, -- 物品计量单位
T4.unit_code, -- 包装单位
T4.min_unit_code, -- 最小单位
T5."name" AS purpose_location_name, --仓库
T6."name" AS purpose_location_store_name, --货位
T4."name" AS item_name, --药品
T1.lot_number, --批次号
T1.reason, --退货原因
T1.remake, --备注
T1.item_id, --物品编码
T1.purpose_location_id, --目的仓库ID
T1.purpose_location_store_id, --目的货位ID
T1.purpose_type_enum, -- 目的仓库类型
T1.supplier_id, -- 供应商id
T7."name" AS supplier_name, -- 供应商名称
T8.total_volume, -- 规格
T4.manufacturer_text AS manufacturer, -- 生产厂商
END AS purchase_unit_code, -- 采购单位
T1.unit_code AS measurement_unit_code, -- 物品计量单位
T4.unit_code, -- 包装单位
T4.min_unit_code, -- 最小单位
T5."name" AS purpose_location_name, -- 仓库
T6."name" AS purpose_location_store_name, -- 货位
T4."name" AS item_name, -- 药品
T1.lot_number, -- 批次号
T1.reason, -- 退货原因
T1.remake, -- 备注
T1.item_id, -- 物品编码
T1.purpose_location_id, -- 目的仓库ID
T1.purpose_location_store_id, -- 目的货位ID
T1.purpose_type_enum, -- 目的仓库类型
T1.supplier_id, -- 供应商id
T7."name" AS supplier_name, -- 供应商名称
T8.total_volume, -- 规格
T4.manufacturer_text , -- 生产厂商
#{medicine} AS item_type,
T1.start_time, -- 开始时间
T1.end_time, -- 结束时间
T1.invoice_no, -- 发票号
T1.trace_no, -- 追溯码
T2.packaging_levels, -- 追溯码包装层级
T1.start_time, -- 开始时间
T1.end_time, -- 结束时间
T1.invoice_no, -- 发票号
T1.trace_no, -- 追溯码
T2.packaging_levels, -- 追溯码包装层级
CASE
WHEN T1.type_enum = #{purchaseReturn}
THEN T1.practitioner_id
ELSE NULL
END AS practitioner_id, --经手人
END AS practitioner_id, -- 经手人
T1.occurrence_time,
T4.part_percent --拆零比
T4.part_percent, -- 拆零比
CASE
WHEN T1.type_enum = #{purchaseReturn}
THEN (SELECT name
FROM adm_practitioner ap
WHERE ap.delete_flag = '0'
AND ap.tenant_id = 1
AND ap.id = T1.practitioner_id)
ELSE NULL
END AS practitioner_name -- 经手人姓名
FROM wor_supply_request T1
LEFT JOIN wor_inventory_item T2
ON T1.item_id = T2.item_id
@@ -127,7 +128,8 @@
ON T11.definition_id = T10.id
AND T11.delete_flag = '0'
AND T11.condition_value = T2.lot_number
AND T11.condition_code = '1'--1:批号进价
AND T11.condition_code = '1'-- 1:批号进价
WHERE T1.bus_no = #{busNo}
AND T1.item_table = #{medicationTableName}
AND T1.delete_flag = '0'
@@ -138,94 +140,95 @@
WHEN T1.type_enum = #{purchaseReturn}
THEN T1.item_quantity
ELSE NULL
END AS item_quantity, --退库数量
END AS item_quantity, -- 退库数量
CASE
WHEN T1.type_enum = #{purchaseReturn}
THEN (
SELECT COALESCE(SUM(T9.item_quantity), 0)
FROM wor_supply_request AS T9
WHERE T9.original_bus_no = T1.original_bus_no
AND T9.item_id = T1.item_id
AND T9.lot_number = T1.lot_number
AND T9.delete_flag = '0'
AND T9.status_enum = #{agree}
)
ELSE (
SELECT COALESCE(SUM(T9.item_quantity), 0)
FROM wor_supply_request AS T9
WHERE T9.original_bus_no = T1.bus_no
AND T9.item_id = T1.item_id
AND T9.lot_number = T1.lot_number
AND T9.delete_flag = '0'
AND T9.status_enum = #{agree}
)
END AS returned_quantity, --已退数量
THEN (SELECT COALESCE(SUM(T9.item_quantity), 0)
FROM wor_supply_request AS T9
WHERE T9.original_bus_no = T1.original_bus_no
AND T9.item_id = T1.item_id
AND T9.lot_number = T1.lot_number
AND T9.delete_flag = '0'
AND T9.status_enum = #{agree})
ELSE (SELECT COALESCE(SUM(T9.item_quantity), 0)
FROM wor_supply_request AS T9
WHERE T9.original_bus_no = T1.bus_no
AND T9.item_id = T1.item_id
AND T9.lot_number = T1.lot_number
AND T9.delete_flag = '0'
AND T9.status_enum = #{agree})
END AS returned_quantity, -- 已退数量
CASE
WHEN T1.type_enum = #{purchaseReturn}
THEN T1.id
ELSE NULL
END AS id, --采购退货id
END AS id, -- 采购退货id
CASE
WHEN T1.type_enum = #{purchaseReturn}
THEN NULL
ELSE T1.id
END AS purchase_id, --采购入库id
T2.quantity AS quantity, --库存数量
END AS purchase_id, -- 采购入库id
T2.quantity AS quantity, -- 库存数量
CASE
WHEN T1.type_enum = #{purchaseReturn}
THEN (
SELECT T9.item_quantity
FROM wor_supply_request AS T9
WHERE T1.original_bus_no = T9.bus_no
AND T9.item_id = T1.item_id
AND T9.lot_number = T1.lot_number
AND T9.delete_flag = '0'
)
THEN (SELECT T9.item_quantity
FROM wor_supply_request AS T9
WHERE T1.original_bus_no = T9.bus_no
AND T9.item_id = T1.item_id
AND T9.lot_number = T1.lot_number
AND T9.delete_flag = '0')
ELSE T3.quantity
END AS purchase_quantity, --采购数量
T11.amount AS price, --采购单价
END AS purchase_quantity, -- 采购数量
T11.amount AS price, -- 采购单价
CASE
WHEN T1.type_enum = #{purchaseReturn}
THEN (
SELECT T9.unit_code
FROM wor_supply_request AS T9
WHERE T1.original_bus_no = T9.bus_no
AND T9.item_id = T1.item_id
AND T9.lot_number = T1.lot_number
AND T9.delete_flag = '0'
)
THEN (SELECT T9.unit_code
FROM wor_supply_request AS T9
WHERE T1.original_bus_no = T9.bus_no
AND T9.item_id = T1.item_id
AND T9.lot_number = T1.lot_number
AND T9.delete_flag = '0')
ELSE T1.unit_code
END AS purchase_unit_code, --采购单位
T1.unit_code AS measurement_unit_code, -- 物品计量单位
T4.unit_code, -- 包装单位
T4.min_unit_code, -- 最小单位
T5."name" AS purpose_location_name, --仓库
T6."name" AS purpose_location_store_name, --货位
T4."name" AS item_name, --药品
T1.lot_number, --批次号
T1.reason, --退货原因
T1.remake, --备注
T1.item_id, --物品编码
T1.purpose_location_id, --目的仓库ID
T1.purpose_location_store_id, --目的货位ID
T1.purpose_type_enum, -- 目的仓库类型
T1.supplier_id, -- 供应商id
T7."name" AS supplier_name, -- 供应商名称
T4."size" AS total_volume, -- 规格
T4.manufacturer_text AS manufacturer, -- 生产厂商
END AS purchase_unit_code, -- 采购单位
T1.unit_code AS measurement_unit_code, -- 物品计量单位
T4.unit_code, -- 包装单位
T4.min_unit_code, -- 最小单位
T5."name" AS purpose_location_name, -- 仓库
T6."name" AS purpose_location_store_name, -- 货位
T4."name" AS item_name, -- 药品
T1.lot_number, -- 批次号
T1.reason, -- 退货原因
T1.remake, -- 备注
T1.item_id, -- 物品编码
T1.purpose_location_id, -- 目的仓库ID
T1.purpose_location_store_id, -- 目的货位ID
T1.purpose_type_enum, -- 目的仓库类型
T1.supplier_id, -- 供应商id
T7."name" AS supplier_name, -- 供应商名称
T4."size" AS total_volume, -- 规格
T4.manufacturer_text , -- 生产厂商
#{device} AS item_type,
T1.start_time, -- 开始时间
T1.end_time, -- 结束时间
T1.invoice_no, -- 发票号
T1.trace_no, -- 追溯码
T2.packaging_levels, -- 追溯码包装层级
T1.start_time, -- 开始时间
T1.end_time, -- 结束时间
T1.invoice_no, -- 发票号
T1.trace_no, -- 追溯码
T2.packaging_levels, -- 追溯码包装层级
CASE
WHEN T1.type_enum = #{purchaseReturn}
THEN T1.practitioner_id
ELSE NULL
END AS practitioner_id, --经手人
END AS practitioner_id, -- 经手人
T1.occurrence_time,
T4.part_percent --拆零比
T4.part_percent, -- 拆零比
CASE
WHEN T1.type_enum = #{purchaseReturn}
THEN (SELECT name
FROM adm_practitioner ap
WHERE ap.delete_flag = '0'
AND ap.tenant_id = 1
AND ap.id = T1.practitioner_id)
ELSE NULL
END AS practitioner_name -- 经手人姓名
FROM wor_supply_request T1
LEFT JOIN wor_inventory_item T2
ON T2.item_id = T1.item_id
@@ -254,11 +257,12 @@
ON T11.definition_id = T10.id
AND T11.delete_flag = '0'
AND T11.condition_value = T2.lot_number
AND T11.condition_code = '1'--1:批号进价
AND T11.condition_code = '1'-- 1:批号进价
WHERE T1.bus_no = #{busNo}
AND T1.item_table = #{deviceTableName}
AND T1.delete_flag = '0'
</select>
<select id="selectGeneratedDetail"
resultType="com.openhis.web.inventorymanage.dto.PurchaseReturnPageDto">
SELECT T1.bus_no AS supply_bus_no,
@@ -268,7 +272,7 @@
T1.practitioner_id,
T1.applicant_id,
T1.approver_id,
MIN(T1.occurrence_time) AS occurrence_time, -- 制单时间
MIN(T1.occurrence_time) AS occurrence_time, -- 制单时间
T1.approval_time
FROM wor_supply_request AS T1
WHERE T1.original_bus_no = #{busNo}
@@ -287,7 +291,7 @@
<select id="getMonthlySettlementDetail" resultType="com.openhis.web.inventorymanage.dto.PurchaseReturnDetailDto">
SELECT T1.bus_no,
T1.original_bus_no,
T1.item_quantity AS item_quantity, --退库数量
T1.item_quantity AS item_quantity, -- 退库数量
( SELECT COALESCE(SUM(T9.item_quantity), 0)
FROM wor_supply_request AS T9
WHERE T9.original_bus_no = T1.original_bus_no
@@ -296,10 +300,10 @@
AND T9.delete_flag = '0'
AND T9.status_enum = #{statusEnum}
)
AS returned_quantity, --已退数量
T1.id , --采购退货id
NULL AS purchase_id, --采购入库id
T2.quantity AS quantity, --库存数量
AS returned_quantity, -- 已退数量
T1.id , -- 采购退货id
NULL AS purchase_id, -- 采购入库id
T2.quantity AS quantity, -- 库存数量
( SELECT T9.item_quantity
FROM wor_supply_request AS T9
WHERE T1.original_bus_no = T9.bus_no
@@ -307,41 +311,41 @@
AND T9.lot_number = T1.lot_number
AND T9.delete_flag = '0'
)
AS purchase_quantity, --采购数量
T11.amount AS price, --采购单价
AS purchase_quantity, -- 采购数量
T11.amount AS price, -- 采购单价
( SELECT T9.unit_code
FROM wor_supply_request AS T9
WHERE T1.original_bus_no = T9.bus_no
AND T9.item_id = T1.item_id
AND T9.lot_number = T1.lot_number
AND T9.delete_flag = '0'
) AS purchase_unit_code, --采购单位
T1.unit_code AS measurement_unit_code, -- 物品计量单位
T4.unit_code, -- 包装单位
T4.min_unit_code, -- 最小单位
T5."name" AS purpose_location_name, --仓库
T6."name" AS purpose_location_store_name, --货位
T4."name" AS item_name, --药品
T1.lot_number, --批次号
T1.reason, --退货原因
T1.remake, --备注
T1.item_id, --物品编码
T1.purpose_location_id, --目的仓库ID
T1.purpose_location_store_id, --目的货位ID
T1.purpose_type_enum, -- 目的仓库类型
T1.supplier_id, -- 供应商id
T7."name" AS supplier_name, -- 供应商名称
T8.total_volume, -- 规格
T4.manufacturer_text AS manufacturer, -- 生产厂商
) AS purchase_unit_code, -- 采购单位
T1.unit_code AS measurement_unit_code, -- 物品计量单位
T4.unit_code, -- 包装单位
T4.min_unit_code, -- 最小单位
T5."name" AS purpose_location_name, -- 仓库
T6."name" AS purpose_location_store_name, -- 货位
T4."name" AS item_name, -- 药品
T1.lot_number, -- 批次号
T1.reason, -- 退货原因
T1.remake, -- 备注
T1.item_id, -- 物品编码
T1.purpose_location_id, -- 目的仓库ID
T1.purpose_location_store_id, -- 目的货位ID
T1.purpose_type_enum, -- 目的仓库类型
T1.supplier_id, -- 供应商id
T7."name" AS supplier_name, -- 供应商名称
T8.total_volume, -- 规格
T4.manufacturer_text , -- 生产厂商
#{medicine} AS item_type,
T1.start_time, -- 开始时间
T1.end_time, -- 结束时间
T1.invoice_no, -- 发票号
T1.trace_no, -- 追溯码
T2.packaging_levels, -- 追溯码包装层级
T1.practitioner_id , --经手人
T1.occurrence_time,--制单日期
T4.part_percent --拆零比
T1.start_time, -- 开始时间
T1.end_time, -- 结束时间
T1.invoice_no, -- 发票号
T1.trace_no, -- 追溯码
T2.packaging_levels, -- 追溯码包装层级
T1.practitioner_id , -- 经手人
T1.occurrence_time,-- 制单日期
T4.part_percent -- 拆零比
FROM wor_supply_request T1
LEFT JOIN wor_inventory_item T2
ON T1.item_id = T2.item_id
@@ -373,7 +377,7 @@
ON T11.definition_id = T10.id
AND T11.delete_flag = '0'
AND T11.condition_value = T2.lot_number
AND T11.condition_code = '1'--1:批号进价
AND T11.condition_code = '1'-- 1:批号进价
WHERE T1.purpose_location_id = #{locationId}
AND T1.status_enum = #{statusEnum}
AND T1.type_enum IN
@@ -386,7 +390,7 @@
UNION
SELECT T1.bus_no,
T1.original_bus_no,
T1.item_quantity AS item_quantity, --退库数量
T1.item_quantity AS item_quantity, -- 退库数量
( SELECT COALESCE(SUM(T9.item_quantity), 0)
FROM wor_supply_request AS T9
WHERE T9.original_bus_no = T1.original_bus_no
@@ -394,51 +398,51 @@
AND T9.lot_number = T1.lot_number
AND T9.delete_flag = '0'
AND T9.status_enum = #{statusEnum}
) AS returned_quantity, --已退数量
T1.id , --采购退货id
NULL AS purchase_id, --采购入库id
T2.quantity AS quantity, --库存数量
) AS returned_quantity, -- 已退数量
T1.id , -- 采购退货id
NULL AS purchase_id, -- 采购入库id
T2.quantity AS quantity, -- 库存数量
( SELECT T9.item_quantity
FROM wor_supply_request AS T9
WHERE T1.original_bus_no = T9.bus_no
AND T9.item_id = T1.item_id
AND T9.lot_number = T1.lot_number
AND T9.delete_flag = '0'
) AS purchase_quantity, --采购数量
T11.amount AS price, --采购单价
) AS purchase_quantity, -- 采购数量
T11.amount AS price, -- 采购单价
( SELECT T9.unit_code
FROM wor_supply_request AS T9
WHERE T1.original_bus_no = T9.bus_no
AND T9.item_id = T1.item_id
AND T9.lot_number = T1.lot_number
AND T9.delete_flag = '0'
) AS purchase_unit_code, --采购单位
T1.unit_code AS measurement_unit_code, -- 物品计量单位
T4.unit_code, -- 包装单位
T4.min_unit_code, -- 最小单位
T5."name" AS purpose_location_name, --仓库
T6."name" AS purpose_location_store_name, --货位
T4."name" AS item_name, --药品
T1.lot_number, --批次号
T1.reason, --退货原因
T1.remake, --备注
T1.item_id, --物品编码
T1.purpose_location_id, --目的仓库ID
T1.purpose_location_store_id, --目的货位ID
T1.purpose_type_enum, -- 目的仓库类型
T1.supplier_id, -- 供应商id
T7."name" AS supplier_name, -- 供应商名称
T4."size" AS total_volume, -- 规格
T4.manufacturer_text AS manufacturer, -- 生产厂商
) AS purchase_unit_code, -- 采购单位
T1.unit_code AS measurement_unit_code, -- 物品计量单位
T4.unit_code, -- 包装单位
T4.min_unit_code, -- 最小单位
T5."name" AS purpose_location_name, -- 仓库
T6."name" AS purpose_location_store_name, -- 货位
T4."name" AS item_name, -- 药品
T1.lot_number, -- 批次号
T1.reason, -- 退货原因
T1.remake, -- 备注
T1.item_id, -- 物品编码
T1.purpose_location_id, -- 目的仓库ID
T1.purpose_location_store_id, -- 目的货位ID
T1.purpose_type_enum, -- 目的仓库类型
T1.supplier_id, -- 供应商id
T7."name" AS supplier_name, -- 供应商名称
T4."size" AS total_volume, -- 规格
T4.manufacturer_text , -- 生产厂商
#{device} AS item_type,
T1.start_time, -- 开始时间
T1.end_time, -- 结束时间
T1.invoice_no, -- 发票号
T1.trace_no, -- 追溯码
T2.packaging_levels, -- 追溯码包装层级
T1.practitioner_id, --经手人
T1.occurrence_time,--制单日期
T4.part_percent --拆零比
T1.start_time, -- 开始时间
T1.end_time, -- 结束时间
T1.invoice_no, -- 发票号
T1.trace_no, -- 追溯码
T2.packaging_levels, -- 追溯码包装层级
T1.practitioner_id, -- 经手人
T1.occurrence_time,-- 制单日期
T4.part_percent -- 拆零比
FROM wor_supply_request T1
LEFT JOIN wor_inventory_item T2
ON T2.item_id = T1.item_id
@@ -467,7 +471,7 @@
ON T11.definition_id = T10.id
AND T11.delete_flag = '0'
AND T11.condition_value = T2.lot_number
AND T11.condition_code = '1'--1:批号进价
AND T11.condition_code = '1'-- 1:批号进价
WHERE T1.purpose_location_id = #{locationId}
AND T1.status_enum = #{statusEnum}
AND T1.type_enum IN

456
openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/RequisitionIssueMapper.xml
View File

@@ -16,12 +16,13 @@
T2.approver_id,--审批人
T2.approval_time,--审批时间
T2.applicant_id,--申请人
T2.create_time, -- 制单时间
T2.create_time, -- 制单时间
T2.practitioner_id,--经手人
T2.tenant_id,--租户ID
T2.purpose_location_id,--领用部门ID
T2.location_name --领用部门名
FROM (SELECT T1.bus_no AS supply_bus_no,
T2.location_name, --领用部门名
T2.total_amount--总金额
FROM (SELECT T1.bus_no AS supply_bus_no,
T1.status_enum,
T1.approver_id,
T1.approval_time,
@@ -30,12 +31,13 @@
T1.practitioner_id,
T1.tenant_id,
T1.purpose_location_id,--领用部门ID
T4.name AS location_name
T4.name AS location_name,
SUM(T1.total_price) AS total_amount
FROM wor_supply_request AS T1
LEFT JOIN adm_location T3
ON T1.source_location_id = T3.id
LEFT JOIN adm_organization T4
ON T1.purpose_location_id = T4.id
LEFT JOIN adm_location T3
ON T1.source_location_id = T3.id
LEFT JOIN adm_organization T4
ON T1.purpose_location_id = T4.id
WHERE T1.type_enum = #{issueInventory}
AND T1.delete_flag = '0'
GROUP BY T1.bus_no,
@@ -48,17 +50,17 @@
T1.purpose_location_id,
T4.name
ORDER BY T1.bus_no desc
) AS T2
${ew.customSqlSegment}
) AS T2
${ew.customSqlSegment}
</select>
<select id="requisitionIssueDetail" resultType="com.openhis.web.inventorymanage.dto.IssueDetailDto">
SELECT T1.id,
T1.bus_no,--单据号
T1.item_id,
T1.item_quantity,--数量
T1.unit_code AS measurement_unit_code, -- 物品计量单位
T2.unit_code, -- 包装单位
T2.min_unit_code, -- 最小单位
T1.unit_code AS measurement_unit_code, -- 物品计量单位
T2.unit_code, -- 包装单位
T2.min_unit_code, -- 最小单位
T1.detail_json,--请求细节
T1.purpose_type_enum,--目的类型
#{medicine} AS item_type,--药品类型
@@ -68,166 +70,25 @@
T1.invoice_no,--发票号
T1.start_time,--开始时间
T1.end_time,--结束时间
T13.amount AS price,--单价
T1.price,--单价
T1.total_price,--总价
T2."name" AS item_name,--药品类型
T2."name" AS item_name,--药品类型
T2.part_percent,--拆零比
T2."yb_no",--医保编码
T3.total_volume,--规格
T4."name" AS supplier_name,--供应商名称
T2.manufacturer_text AS manufacturer, -- 生产厂商
T4."name" AS supplier_name,--供应商名称
T2.manufacturer_text, -- 生产厂商
T10.quantity AS total_quantity, -- 当前库存总数
T1.source_location_id, -- 源仓库ID
T1.source_location_store_id, -- 源仓位ID
T1.purpose_location_id, -- 目的仓库ID
T1.purpose_location_store_id, -- 目的货位ID
T6."name" AS source_location_name, -- 源仓库
T7."name" AS source_location_store_name, -- 源仓位
T8."name" AS purpose_location_name, -- 目的仓库
T9."name" AS purpose_location_store_name, -- 目的货位
T1.practitioner_id, -- 经办人
T1.remake, -- 备注
T1.occurrence_time,
T11."name" AS practitioner_name -- 经办人名称
FROM wor_supply_request T1
LEFT JOIN med_medication_definition T2
ON T1.item_id = T2.id
LEFT JOIN med_medication T3
ON T3.medication_def_id = T2.id
LEFT JOIN adm_supplier T4
ON T4.id = T1.supplier_id
LEFT JOIN adm_location T6
ON T1.source_location_id = T6.id
LEFT JOIN adm_location T7
ON T1.source_location_store_id = T7.id
LEFT JOIN adm_organization T8
ON T1.purpose_location_id = T8.id
LEFT JOIN adm_organization T9
ON T1.purpose_location_store_id = T9.id
LEFT JOIN wor_inventory_item T10
ON T1.item_id = T10.item_id
AND T1.source_location_id = T10.location_id
AND T10.lot_number = T1.lot_number
AND T10.delete_flag = '0'
LEFT JOIN adm_practitioner T11
ON T1.practitioner_id = T11.id
LEFT JOIN adm_charge_item_definition AS T12
ON T12.instance_id = T10.item_id
AND T12.delete_flag = '0'
LEFT JOIN adm_charge_item_def_detail AS T13
ON T13.definition_id = T12.id
AND T13.delete_flag = '0'
AND T13.condition_value = T10.lot_number
AND T13.condition_code = '1'--1:批号进价
WHERE T1.bus_no = #{busNo}
AND T1.item_table = #{medicationTableName}
AND T1.delete_flag = '0'
UNION
SELECT T1.id,
T1.bus_no,
T1.item_id,
T1.item_quantity,
T1.unit_code AS measurement_unit_code, -- 物品计量单位
T2.unit_code, -- 包装单位
T2.min_unit_code, -- 最小单位
T1.detail_json,
T1.purpose_type_enum,
#{device} AS item_type, --耗材类型
T1.apply_time,
T1.lot_number,
T1.trace_no,
T1.invoice_no,
T1.start_time,
T1.end_time,
T13.amount AS price,--单价
T1.total_price,
T2."name" AS item_name,
T2.part_percent,
T2."size" AS total_volume,
T2."yb_no",
T4."name" AS supplier_name,
T2.manufacturer_text AS manufacturer, -- 生产厂商
T10.quantity AS total_quantity, -- 当前库存总数
T1.source_location_id, -- 源仓库ID
T1.source_location_store_id, -- 源仓位ID
T1.purpose_location_id, -- 目的仓库ID
T1.purpose_location_store_id, -- 目的货位ID
T6."name" AS source_location_name, -- 源仓库
T7."name" AS source_location_store_name, -- 源仓位
T8."name" AS purpose_location_name, -- 目的仓库
T9."name" AS purpose_location_store_name, -- 目的货位
T1.practitioner_id, -- 经办人
T1.remake, -- 备注
T1.occurrence_time,
T11."name" AS practitioner_name -- 经办人名称
FROM wor_supply_request T1
LEFT JOIN adm_device_definition T2
ON T1.item_id = T2.id
LEFT JOIN adm_supplier T4
ON T4.id = T1.supplier_id
LEFT JOIN adm_location T6
ON T1.source_location_id = T6.id
LEFT JOIN adm_location T7
ON T1.source_location_store_id = T7.id
LEFT JOIN adm_organization T8
ON T1.purpose_location_id = T8.id
LEFT JOIN adm_organization T9
ON T1.purpose_location_store_id = T9.id
LEFT JOIN wor_inventory_item T10
ON T1.item_id = T10.item_id
AND T1.source_location_id = T10.location_id
AND T10.lot_number = T1.lot_number
AND T10.delete_flag = '0'
LEFT JOIN adm_practitioner T11
ON T1.practitioner_id = T11.id
LEFT JOIN adm_charge_item_definition AS T12
ON T12.instance_id = T10.item_id
AND T12.delete_flag = '0'
LEFT JOIN adm_charge_item_def_detail AS T13
ON T13.definition_id = T12.id
AND T13.delete_flag = '0'
AND T13.condition_value = T10.lot_number
AND T13.condition_code = '1'--1:批号进价
WHERE T1.bus_no = #{busNo}
AND T1.item_table = #{deviceTableName}
AND T1.delete_flag = '0'
</select>
<select id="getMonthlySettlementDetail" resultType="com.openhis.web.inventorymanage.dto.IssueDetailDto">
SELECT T1.id,
T1.bus_no,--单据号
T1.item_id,
T1.item_quantity,--数量
T1.unit_code AS measurement_unit_code, -- 物品计量单位
T2.unit_code, -- 包装单位
T2.min_unit_code, -- 最小单位
T1.detail_json,--请求细节
T1.purpose_type_enum,--目的类型
#{medicine} AS item_type,--药品类型
T1.apply_time,--申请时间
T1.lot_number,--产品批号
T1.trace_no,--追溯码
T1.invoice_no,--发票号
T1.start_time,--开始时间
T1.end_time,--结束时间
T13.amount AS price,--单价
T1.total_price,--总价
T2."name" AS item_name,--药品类型
T2.part_percent,--拆零比
T2."yb_no",--医保编码
T3.total_volume,--规格
T4."name" AS supplier_name,--供应商名称
T2.manufacturer_text AS manufacturer, -- 生产厂商
T10.quantity AS total_quantity, -- 当前库存总数
T1.source_location_id, -- 源仓库ID
T1.source_location_store_id, -- 源仓位ID
T1.purpose_location_id, -- 目的仓库ID
T1.purpose_location_store_id, -- 目的货位ID
T6."name" AS source_location_name, -- 源仓库
T7."name" AS source_location_store_name, -- 源仓位
T8."name" AS purpose_location_name, -- 目的仓库
T9."name" AS purpose_location_store_name, -- 目的货位
T1.practitioner_id, -- 经办人
T1.remake, -- 备注
T1.source_location_id, -- 源仓库ID
T1.source_location_store_id, -- 源仓位ID
T1.purpose_location_id, -- 目的仓库ID
T1.purpose_location_store_id, -- 目的货位ID
T6."name" AS source_location_name, -- 源仓库
T7."name" AS source_location_store_name, -- 源仓位
T8."name" AS purpose_location_name, -- 目的仓库
T9."name" AS purpose_location_store_name, -- 目的货位
T1.practitioner_id, -- 经办人
T1.remake, -- 备注
T1.occurrence_time,
T11."name" AS practitioner_name -- 经办人名称
FROM wor_supply_request T1
@@ -240,33 +101,27 @@
LEFT JOIN adm_location T6
ON T1.source_location_id = T6.id
LEFT JOIN adm_location T7
ON T1.source_location_store_id = T7.id
ON T1.source_location_store_id = T7.id
LEFT JOIN adm_organization T8
ON T1.purpose_location_id = T8.id
LEFT JOIN adm_organization T9
ON T1.purpose_location_store_id = T9.id
ON T1.purpose_location_store_id = T9.id
LEFT JOIN wor_inventory_item T10
ON T1.item_id = T10.item_id
AND T1.source_location_id = T10.location_id
AND T10.lot_number = T1.lot_number
AND T10.delete_flag = '0'
LEFT JOIN adm_practitioner T11
ON T1.practitioner_id = T11.id
LEFT JOIN adm_charge_item_definition AS T12
ON T12.instance_id = T10.item_id
AND T12.delete_flag = '0'
LEFT JOIN adm_charge_item_def_detail AS T13
ON T13.definition_id = T12.id
AND T13.delete_flag = '0'
AND T13.condition_value = T10.lot_number
AND T13.condition_code = '1'--1:批号进价
WHERE T1.source_location_id = #{locationId}
AND T1.status_enum = #{statusEnum}
AND T1.type_enum IN
<foreach collection="typeEnum" item="item" separator="," open="(" close=")">
#{item}
</foreach>
AND TO_CHAR(T1.occurrence_time, 'yyyy-MM-dd HH24:mi:ss') BETWEEN #{startTime} AND #{endTime}
ON T1.practitioner_id = T11.id
-- LEFT JOIN adm_charge_item_definition AS T12
-- ON T12.instance_id = T10.item_id
-- AND T12.delete_flag = '0'
-- LEFT JOIN adm_charge_item_def_detail AS T13
-- ON T13.definition_id = T12.id
-- AND T13.delete_flag = '0'
-- AND T13.condition_value = T10.lot_number
-- AND T13.condition_code = '1'--1:批号进价
WHERE T1.bus_no = #{busNo}
AND T1.item_table = #{medicationTableName}
AND T1.delete_flag = '0'
UNION
@@ -274,39 +129,39 @@
T1.bus_no,
T1.item_id,
T1.item_quantity,
T1.unit_code AS measurement_unit_code, -- 物品计量单位
T2.unit_code, -- 包装单位
T2.min_unit_code, -- 最小单位
T1.unit_code AS measurement_unit_code, -- 物品计量单位
T2.unit_code, -- 包装单位
T2.min_unit_code, -- 最小单位
T1.detail_json,
T1.purpose_type_enum,
#{device} AS item_type, --耗材类型
#{device} AS item_type, --耗材类型
T1.apply_time,
T1.lot_number,
T1.trace_no,
T1.invoice_no,
T1.start_time,
T1.end_time,
T13.amount AS price,--单价
T1.price,--单价
T1.total_price,
T2."name" AS item_name,
T2."name" AS item_name,
T2.part_percent,
T2."size" AS total_volume,
T2."size" AS total_volume,
T2."yb_no",
T4."name" AS supplier_name,
T2.manufacturer_text AS manufacturer, -- 生产厂商
T10.quantity AS total_quantity, -- 当前库存总数
T1.source_location_id, -- 源仓库ID
T1.source_location_store_id, -- 源仓位ID
T1.purpose_location_id, -- 目的仓库ID
T1.purpose_location_store_id, -- 目的货位ID
T6."name" AS source_location_name, -- 源仓库
T7."name" AS source_location_store_name, -- 源仓位
T8."name" AS purpose_location_name, -- 目的仓库
T9."name" AS purpose_location_store_name, -- 目的货位
T1.practitioner_id, -- 经办人
T1.remake, -- 备注
T4."name" AS supplier_name,
T2.manufacturer_text, -- 生产厂商
T10.quantity AS total_quantity, -- 当前库存总数
T1.source_location_id, -- 源仓库ID
T1.source_location_store_id, -- 源仓位ID
T1.purpose_location_id, -- 目的仓库ID
T1.purpose_location_store_id, -- 目的货位ID
T6."name" AS source_location_name, -- 源仓库
T7."name" AS source_location_store_name, -- 源仓位
T8."name" AS purpose_location_name, -- 目的仓库
T9."name" AS purpose_location_store_name, -- 目的货位
T1.practitioner_id, -- 经办人
T1.remake, -- 备注
T1.occurrence_time,
T11."name" AS practitioner_name -- 经办人名称
T11."name" AS practitioner_name -- 经办人名称
FROM wor_supply_request T1
LEFT JOIN adm_device_definition T2
ON T1.item_id = T2.id
@@ -315,34 +170,181 @@
LEFT JOIN adm_location T6
ON T1.source_location_id = T6.id
LEFT JOIN adm_location T7
ON T1.source_location_store_id = T7.id
ON T1.source_location_store_id = T7.id
LEFT JOIN adm_organization T8
ON T1.purpose_location_id = T8.id
LEFT JOIN adm_organization T9
ON T1.purpose_location_store_id = T9.id
ON T1.purpose_location_store_id = T9.id
LEFT JOIN wor_inventory_item T10
ON T1.item_id = T10.item_id
AND T1.source_location_id = T10.location_id
AND T10.lot_number = T1.lot_number
AND T10.delete_flag = '0'
LEFT JOIN adm_practitioner T11
ON T1.practitioner_id = T11.id
LEFT JOIN adm_charge_item_definition AS T12
ON T12.instance_id = T10.item_id
AND T12.delete_flag = '0'
LEFT JOIN adm_charge_item_def_detail AS T13
ON T13.definition_id = T12.id
AND T13.delete_flag = '0'
AND T13.condition_value = T10.lot_number
AND T13.condition_code = '1'--1:批号进价
WHERE T1.source_location_id = #{locationId}
AND T1.status_enum = #{statusEnum}
AND T1.type_enum IN
<foreach collection="typeEnum" item="item" separator="," open="(" close=")">
#{item}
</foreach>
AND TO_CHAR(T1.occurrence_time, 'yyyy-MM-dd HH24:mi:ss') BETWEEN #{startTime} AND #{endTime}
AND T1.item_table = #{deviceTableName}
AND T1.delete_flag = '0'
ON T1.practitioner_id = T11.id
-- LEFT JOIN adm_charge_item_definition AS T12
-- ON T12.instance_id = T10.item_id
-- AND T12.delete_flag = '0'
-- LEFT JOIN adm_charge_item_def_detail AS T13
-- ON T13.definition_id = T12.id
-- AND T13.delete_flag = '0'
-- AND T13.condition_value = T10.lot_number
-- AND T13.condition_code = '1'--1:批号进价
WHERE T1.bus_no = #{busNo}
AND T1.item_table = #{deviceTableName}
AND T1.delete_flag = '0'
</select>
<select id="getMonthlySettlementDetail" resultType="com.openhis.web.inventorymanage.dto.IssueDetailDto">
SELECT T1.id,
T1.bus_no,--单据号
T1.item_id,
T1.item_quantity,--数量
T1.unit_code AS measurement_unit_code, -- 物品计量单位
T2.unit_code, -- 包装单位
T2.min_unit_code, -- 最小单位
T1.detail_json,--请求细节
T1.purpose_type_enum,--目的类型
#{medicine} AS item_type,--药品类型
T1.apply_time,--申请时间
T1.lot_number,--产品批号
T1.trace_no,--追溯码
T1.invoice_no,--发票号
T1.start_time,--开始时间
T1.end_time,--结束时间
T13.amount AS price,--单价
T1.total_price,--总价
T2."name" AS item_name,--药品类型
T2.part_percent,--拆零比
T2."yb_no",--医保编码
T3.total_volume,--规格
T4."name" AS supplier_name,--供应商名称
T2.manufacturer_text , -- 生产厂商
T10.quantity AS total_quantity, -- 当前库存总数
T1.source_location_id, -- 源仓库ID
T1.source_location_store_id, -- 源仓位ID
T1.purpose_location_id, -- 目的仓库ID
T1.purpose_location_store_id, -- 目的货位ID
T6."name" AS source_location_name, -- 源仓库
T7."name" AS source_location_store_name, -- 源仓位
T8."name" AS purpose_location_name, -- 目的仓库
T9."name" AS purpose_location_store_name, -- 目的货位
T1.practitioner_id, -- 经办人
T1.remake, -- 备注
T1.occurrence_time,
T11."name" AS practitioner_name -- 经办人名称
FROM wor_supply_request T1
LEFT JOIN med_medication_definition T2
ON T1.item_id = T2.id
LEFT JOIN med_medication T3
ON T3.medication_def_id = T2.id
LEFT JOIN adm_supplier T4
ON T4.id = T1.supplier_id
LEFT JOIN adm_location T6
ON T1.source_location_id = T6.id
LEFT JOIN adm_location T7
ON T1.source_location_store_id = T7.id
LEFT JOIN adm_organization T8
ON T1.purpose_location_id = T8.id
LEFT JOIN adm_organization T9
ON T1.purpose_location_store_id = T9.id
LEFT JOIN wor_inventory_item T10
ON T1.item_id = T10.item_id
AND T1.source_location_id = T10.location_id
AND T10.lot_number = T1.lot_number
AND T10.delete_flag = '0'
LEFT JOIN adm_practitioner T11
ON T1.practitioner_id = T11.id
LEFT JOIN adm_charge_item_definition AS T12
ON T12.instance_id = T10.item_id
AND T12.delete_flag = '0'
LEFT JOIN adm_charge_item_def_detail AS T13
ON T13.definition_id = T12.id
AND T13.delete_flag = '0'
AND T13.condition_value = T10.lot_number
AND T13.condition_code = '1'--1:批号进价
WHERE T1.source_location_id = #{locationId}
AND T1.status_enum = #{statusEnum}
AND T1.type_enum IN
<foreach collection="typeEnum" item="item" separator="," open="(" close=")">
#{item}
</foreach>
AND TO_CHAR(T1.occurrence_time, 'yyyy-MM-dd HH24:mi:ss') BETWEEN #{startTime} AND #{endTime}
AND T1.item_table = #{medicationTableName}
AND T1.delete_flag = '0'
UNION
SELECT T1.id,
T1.bus_no,
T1.item_id,
T1.item_quantity,
T1.unit_code AS measurement_unit_code, -- 物品计量单位
T2.unit_code, -- 包装单位
T2.min_unit_code, -- 最小单位
T1.detail_json,
T1.purpose_type_enum,
#{device} AS item_type, --耗材类型
T1.apply_time,
T1.lot_number,
T1.trace_no,
T1.invoice_no,
T1.start_time,
T1.end_time,
T13.amount AS price,--单价
T1.total_price,
T2."name" AS item_name,
T2.part_percent,
T2."size" AS total_volume,
T2."yb_no",
T4."name" AS supplier_name,
T2.manufacturer_text , -- 生产厂商
T10.quantity AS total_quantity, -- 当前库存总数
T1.source_location_id, -- 源仓库ID
T1.source_location_store_id, -- 源仓位ID
T1.purpose_location_id, -- 目的仓库ID
T1.purpose_location_store_id, -- 目的货位ID
T6."name" AS source_location_name, -- 源仓库
T7."name" AS source_location_store_name, -- 源仓位
T8."name" AS purpose_location_name, -- 目的仓库
T9."name" AS purpose_location_store_name, -- 目的货位
T1.practitioner_id, -- 经办人
T1.remake, -- 备注
T1.occurrence_time,
T11."name" AS practitioner_name -- 经办人名称
FROM wor_supply_request T1
LEFT JOIN adm_device_definition T2
ON T1.item_id = T2.id
LEFT JOIN adm_supplier T4
ON T4.id = T1.supplier_id
LEFT JOIN adm_location T6
ON T1.source_location_id = T6.id
LEFT JOIN adm_location T7
ON T1.source_location_store_id = T7.id
LEFT JOIN adm_organization T8
ON T1.purpose_location_id = T8.id
LEFT JOIN adm_organization T9
ON T1.purpose_location_store_id = T9.id
LEFT JOIN wor_inventory_item T10
ON T1.item_id = T10.item_id
AND T1.source_location_id = T10.location_id
AND T10.lot_number = T1.lot_number
AND T10.delete_flag = '0'
LEFT JOIN adm_practitioner T11
ON T1.practitioner_id = T11.id
LEFT JOIN adm_charge_item_definition AS T12
ON T12.instance_id = T10.item_id
AND T12.delete_flag = '0'
LEFT JOIN adm_charge_item_def_detail AS T13
ON T13.definition_id = T12.id
AND T13.delete_flag = '0'
AND T13.condition_value = T10.lot_number
AND T13.condition_code = '1'--1:批号进价
WHERE T1.source_location_id = #{locationId}
AND T1.status_enum = #{statusEnum}
AND T1.type_enum IN
<foreach collection="typeEnum" item="item" separator="," open="(" close=")">
#{item}
</foreach>
AND TO_CHAR(T1.occurrence_time, 'yyyy-MM-dd HH24:mi:ss') BETWEEN #{startTime} AND #{endTime}
AND T1.item_table = #{deviceTableName}
AND T1.delete_flag = '0'
</select>
</mapper>

8
openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/ReturnIssueMapper.xml
View File

@@ -75,7 +75,7 @@
T2."yb_no",--医保编码
T3.total_volume,--药品规格
T4."name" AS supplier_name,--供应商名称
T2.manufacturer_text AS manufacturer, -- 生产厂商
T2.manufacturer_text , -- 生产厂商
T1.practitioner_id, -- 经办人
T5."name" AS practitioner_name,--经办人名称
T10.quantity AS total_quantity, -- 当前库存总数
@@ -146,7 +146,7 @@
T2."yb_no",--医保编码
T2."size" AS total_volume,--包装规格
T4."name" AS supplier_name,
T2.manufacturer_text AS manufacturer, -- 生产厂商
T2.manufacturer_text , -- 生产厂商
T1.practitioner_id, -- 经办人
T5."name" AS practitioner_name,
T10.quantity AS total_quantity, -- 当前库存总数
@@ -216,7 +216,7 @@
T2."yb_no",--医保编码
T3.total_volume,--药品规格
T4."name" AS supplier_name,--供应商名称
T2.manufacturer_text AS manufacturer, -- 生产厂商
T2.manufacturer_text , -- 生产厂商
T1.practitioner_id, -- 经办人
T5."name" AS practitioner_name,--经办人名称
T10.quantity AS total_quantity, -- 当前库存总数
@@ -293,7 +293,7 @@
T2."yb_no",--医保编码
T2."size" AS total_volume,--包装规格
T4."name" AS supplier_name,
T2.manufacturer_text AS manufacturer, -- 生产厂商
T2.manufacturer_text , -- 生产厂商
T1.practitioner_id, -- 经办人
T5."name" AS practitioner_name,
T10.quantity AS total_quantity, -- 当前库存总数