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-09-25 10:43:25 +08:00
parent 1276dc4adb
commit c8014404f1
355 changed files with 10070 additions and 5578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/DrugDosageSettlementMapper.xml Normal file
View File

@@ -0,0 +1,67 @@
<?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.reportmanage.mapper.DrugDosageSettlementMapper">
<!--门诊收入明细-->
<select id="selectDrugDosageReportPage"
resultType="com.openhis.web.reportmanage.dto.DrugDosageSettlementPageDto">
select A.medication_name,
A.bus_no,
A.yb_no,
A.total_volume,
A.unit_code,
A.dispense_quantity,
A.dispense_price,
A.category_code,
A.dispense_time,
A.tenant_id
from (
SELECT def."name" AS medication_name,
def.bus_no,
def.yb_no,
mm.total_volume,
mmd.unit_code,
SUM( mmd.dispense_quantity) AS dispense_quantity,
SUM( aci.total_price ) AS dispense_price,
def.category_code,
mmd.dispense_time,
mmd.tenant_id
FROM med_medication_dispense mmd
LEFT JOIN med_medication_request mmr
ON mmd.med_req_id = mmr.id
AND mmr.delete_flag = '0'
INNER JOIN adm_charge_item aci
ON aci.service_id = mmr.id
AND aci.delete_flag = '0'
LEFT JOIN med_medication_definition def
ON mmd.medication_id = def.id
AND def.delete_flag = '0'
LEFT JOIN med_medication mm
ON mm.medication_def_id = def.id
AND mm.delete_flag = '0'
LEFT JOIN med_medication_request mmrr
on mmr.id = mmrr.refund_medicine_id
AND mmrr.delete_flag = '0'
WHERE mmd.status_enum = #{disCompleted}
AND mmr.status_enum = #{reqCompleted}
AND mmr.refund_medicine_id IS NULL
AND mmrr.refund_medicine_id IS NULL
AND mmd.delete_flag = '0'
<if test="antibioticFlg == 1" >
AND def.antibiotic_flag = 1
</if>
<if test="antibioticFlg == 0" >
AND def.antibiotic_flag = 0
</if>
GROUP BY def."name",
def.bus_no,
def.yb_no,
mm.total_volume,
mmd.unit_code,
def.category_code,
mmd.dispense_time,
mmd.tenant_id
) AS A
${ew.customSqlSegment}
ORDER BY A.bus_no DESC
</select>
</mapper>

8
openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/InboundReportMapper.xml
View File

@@ -20,7 +20,7 @@
T10.supplier_id, --供应商id
T10.supplier, --供应商
T10.approver_id, --审核人
T10.create_time, --制单日期
T10.occurrence_time, --制单日期
T10.approval_time, --审核日期
T10.tenant_id -- 租户ID
FROM (SELECT T1.bus_no AS supply_bus_no, --单据号
@@ -39,7 +39,7 @@
T1.supplier_id, --供应商id
T9.name AS supplier, --供应商
T1.approver_id, --审核人
T1.create_time, --制单日期
T1.occurrence_time, --制单日期
T1.approval_time, --审核日期
T1.tenant_id -- 租户ID
FROM wor_supply_request AS T1
@@ -57,6 +57,7 @@
ON T4.definition_id = T3.id
AND T4.delete_flag = '0'
AND T4.condition_value = T1.lot_number
AND T4.condition_code = '1'--1:批号进价
LEFT JOIN med_medication AS T5
ON T5.medication_def_id = T2.id
AND T5.delete_flag = '0'
@@ -90,7 +91,7 @@
T1.supplier_id, --供应商id
T9.name AS supplier, --供应商
T1.approver_id, --审核人
T1.create_time, --制单日期
T1.occurrence_time, --制单日期
T1.approval_time, --审核日期
T1.tenant_id -- 租户ID
FROM wor_supply_request AS T1
@@ -108,6 +109,7 @@
ON T4.definition_id = T3.id
AND T4.delete_flag = '0'
AND T4.condition_value = T1.lot_number
AND T4.condition_code = '1'--1:批号进价
LEFT JOIN adm_location AS T7
ON T7.id = T1.purpose_location_id
AND T7.delete_flag = '0'

38
openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/LossReportMapper.xml
View File

@@ -13,6 +13,14 @@
T9.unit_code, --小单位
T9.item_quantity, --数量
T9.approval_time, --审批时间
T9.supply_bus_no,--单据号
T9.purpose_location_id,-- 目的仓库id
T9.price,--采购单价
T9.location_store_name,--仓库货位
T9.total_price,--报损金额
T9.name AS supplier,--供应商
T9.approver_id, --审核人
T9.occurrence_time, --制单日期
T9.tenant_id -- 租户ID
FROM (SELECT T2.bus_no, --编码
T2.name, --名称
@@ -23,6 +31,14 @@
T1.unit_code, --单位
T1.item_quantity, --数量
T1.approval_time, --审批时间
T1.bus_no AS supply_bus_no,--单据号
T1.purpose_location_id,-- 目的仓库id
T1.price,--采购单价
T4.name AS location_store_name,--仓库货位
T1.total_price,--报损金额
T9.name AS supplier,--供应商
T1.approver_id, --审核人
T1.occurrence_time, --制单日期
T1.tenant_id -- 租户ID
FROM wor_supply_request AS T1
INNER JOIN wor_supply_delivery AS T8
@@ -38,6 +54,12 @@
LEFT JOIN adm_location T5
ON T1.purpose_location_id = T5.id
AND T5.delete_flag = '0'
LEFT JOIN adm_location AS T4
ON T4.id = T1.purpose_location_store_id
AND T4.delete_flag = '0'
LEFT JOIN adm_supplier AS T9
ON T9.id = T1.supplier_id
AND T9.delete_flag = '0'
WHERE T1.type_enum = #{lossReport}
AND T1.status_enum = #{supplyStatus}
AND T1.item_table = #{medicationTableName}
@@ -52,6 +74,14 @@
T1.unit_code, --单位
T1.item_quantity, --数量
T1.approval_time, --审批时间
T1.bus_no AS supply_bus_no,--单据号
T1.purpose_location_id,-- 目的仓库id
T1.price,--采购单价
T4.name AS location_store_name,--仓库货位
T1.total_price,--报损金额
T9.name AS supplier,--供应商
T1.approver_id, --审核人
T1.occurrence_time, --制单日期
T1.tenant_id -- 租户ID
FROM wor_supply_request AS T1
INNER JOIN wor_supply_delivery AS T8
@@ -64,11 +94,17 @@
LEFT JOIN adm_location T5
ON T1.purpose_location_id = T5.id
AND T5.delete_flag = '0'
LEFT JOIN adm_location AS T4
ON T4.id = T1.purpose_location_store_id
AND T4.delete_flag = '0'
LEFT JOIN adm_supplier AS T9
ON T9.id = T1.supplier_id
AND T9.delete_flag = '0'
WHERE T1.type_enum = #{lossReport}
AND T1.status_enum = #{supplyStatus}
AND T1.item_table = #{deviceTableName}
AND T1.delete_flag = '0') AS T9
${ew.customSqlSegment}
ORDER BY T9.bus_no DESC
ORDER BY T9.supply_bus_no DESC
</select>
</mapper>

110
openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/MedicationDeviceReportMapper.xml
View File

@@ -11,9 +11,10 @@
manufacturer_text,
org_id,
SUM(total_quantity) AS total_quantity,
MAX(unit_code) AS unit_code,
unit_code,
unit_price,
SUM(total_money) AS total_money,
MAX(dispense_time) AS dispense_time
dispense_time
FROM (
/* ---------- 第一段查询 ---------- */
SELECT
@@ -33,12 +34,12 @@
T7.total_volume,
T1.lot_number,
T3.manufacturer_text,
SUM(T1.quantity) AS total_quantity,
MAX(T1.unit_code) AS unit_code,
MAX(T8.unit_price) AS unit_price,
SUM(T1.quantity) * MAX(T8.unit_price) AS total_money,
T1.quantity AS total_quantity,
T1.unit_code unit_code,
T8.unit_price,
T8.total_price AS total_money,
T1.org_id,
MAX(T2.dispense_time) AS dispense_time
T2.dispense_time
FROM med_medication_request T1
LEFT JOIN med_medication_dispense T2
ON T2.med_req_id = T1.id AND T2.delete_flag = '0'
@@ -50,15 +51,15 @@
ON T8.service_table = #{medReqTableName} --'med_medication_request'
AND T8.service_id = T1.id
AND T8.delete_flag = '0'
LEFT JOIN med_medication_request T17
on T1.id = T17.refund_medicine_id
AND T17.delete_flag = '0'
WHERE T1.status_enum = #{completed} --'3'
AND T2.status_enum = #{eventStatus} --'4'
AND T1.delete_flag = '0'
AND TO_CHAR(T2.dispense_time, 'yyyy-MM-dd HH24:mi:ss') BETWEEN #{dispenseDateSTime} AND #{dispenseDateETime}
GROUP BY
T3.name,
T7.total_volume,
T1.lot_number,
T3.manufacturer_text,
T1.org_id
AND T1.refund_medicine_id IS NULL
AND T17.refund_medicine_id IS NULL
UNION ALL
@@ -67,12 +68,12 @@
T6.size AS total_volume,
T4.lot_number,
T6.manufacturer_text,
SUM(T4.quantity) AS total_quantity,
MAX(T4.unit_code) AS unit_code,
MAX(T9.unit_price) AS unit_price,
SUM(T4.quantity) * MAX(T9.unit_price) AS total_money,
T4.quantity AS total_quantity,
T4.unit_code AS unit_code,
T9.unit_price AS unit_price,
T9.total_price AS total_money,
T4.org_id,
MAX(T5.dispense_time) AS dispense_time
T5.dispense_time
FROM wor_device_request T4
LEFT JOIN wor_device_dispense T5
ON T5.device_req_id = T4.id AND T5.delete_flag = '0'
@@ -82,17 +83,16 @@
ON T9.service_table = #{devReqTableName} --'wor_device_request'
AND T9.service_id = T4.id
AND T9.delete_flag = '0'
LEFT JOIN wor_device_request T17
on T4.id = T17.refund_device_id
AND T17.delete_flag = '0'
WHERE T4.status_enum = #{completed} --'3'
AND T5.status_enum = #{eventStatus} --'4'
AND T4.delete_flag = '0'
AND TO_CHAR(T5.dispense_time, 'yyyy-MM-dd HH24:mi:ss') BETWEEN #{dispenseDateSTime} AND #{dispenseDateETime}
GROUP BY
T6.name,
T6.size,
T4.lot_number,
T6.manufacturer_text,
T4.org_id
AND T4.refund_device_id IS NULL
AND T17.refund_device_id IS NULL
) AS q1
WHERE total_quantity > 0
UNION ALL
@@ -104,7 +104,7 @@
manufacturer_text,
total_quantity,
unit_code,
NULL AS unit_price, -- 第二段已自带总金额，不需要单价
unit_price,
total_money,
org_id,
dispense_time
@@ -116,9 +116,10 @@
manufacturer_text,
org_id,
SUM(quantity) AS total_quantity,
MAX(unit_code) AS unit_code,
unit_code,
price AS unit_price,
SUM(total_price) AS total_money,
MAX(dispense_time) AS dispense_time
dispense_time
FROM (
SELECT
T10.name,
@@ -128,6 +129,7 @@
CASE WHEN T9.type_enum = #{returnIssue} THEN T9.item_quantity * -1
ELSE T9.item_quantity END AS quantity,
T9.unit_code,
T9.price,
CASE WHEN T9.type_enum = #{returnIssue} THEN T9.total_price * -1
ELSE T9.total_price END AS total_price,
CASE WHEN T9.type_enum = #{returnIssue} THEN T9.source_location_id
@@ -156,6 +158,7 @@
CASE WHEN T13.type_enum = #{returnIssue} THEN T13.item_quantity * -1
ELSE T13.item_quantity END AS quantity,
T13.unit_code,
T13.price,
CASE WHEN T13.type_enum = #{returnIssue} THEN T13.total_price * -1
ELSE T13.total_price END AS total_price,
CASE WHEN T13.type_enum = #{returnIssue} THEN T13.source_location_id
@@ -177,7 +180,10 @@
total_volume,
lot_number,
manufacturer_text,
org_id
org_id,
unit_code,
price,
dispense_time
) AS q3
) AS merged
WHERE org_id = #{orgId}
@@ -188,10 +194,12 @@
total_volume,
lot_number,
manufacturer_text,
org_id
ORDER BY
org_id,
MAX(dispense_time) DESC
unit_code,
unit_price,
dispense_time
ORDER BY
dispense_time DESC
</select>
@@ -205,7 +213,7 @@
/* ---------- 第一段：药品申领 + 耗材申领 ---------- */
SELECT T1.org_id,
T16.name AS org_name,
SUM(T1.quantity * T8_MAX.unit_price_max) AS total_money
SUM(T8.total_price) AS total_money
FROM med_medication_request T1
LEFT JOIN med_medication_dispense T2
ON T2.med_req_id = T1.id
@@ -213,27 +221,31 @@
/* 时间区间 */
AND
TO_CHAR(T2.dispense_time, 'yyyy-MM-dd HH24:mi:ss') BETWEEN #{dispenseDateSTime} AND #{dispenseDateETime}
LEFT JOIN (SELECT T8.service_id,
MAX(T8.unit_price) AS unit_price_max -- 单处方的最高单价
FROM adm_charge_item T8
WHERE T8.service_table = #{medReqTableName} --'med_medication_request'
AND T8.delete_flag = '0'
GROUP BY T8.service_id) T8_MAX ON T8_MAX.service_id = T1.ID
LEFT JOIN adm_charge_item T8
ON T8.service_table = #{medReqTableName} --'med_medication_request'
AND T8.service_id = T1.id
AND T8.delete_flag = '0'
LEFT JOIN med_medication_request T17
on T1.id = T17.refund_medicine_id
AND T17.delete_flag = '0'
LEFT JOIN adm_organization T16
ON T1.org_id = T16.id
AND T16.delete_flag = '0'
WHERE T1.status_enum = #{completed} --'3'
AND T2.status_enum = #{eventStatus} --'4'
AND T1.delete_flag = '0'
/* 确保有发放记录才纳入汇总 */
AND T2.dispense_time IS NOT NULL
AND T1.refund_medicine_id IS NULL
AND T17.refund_medicine_id IS NULL
GROUP BY T1.org_id,
T16.name
UNION ALL
SELECT T4.org_id,
T16.name AS org_name,
SUM(T4.quantity * T9_MAX.unit_price_max) AS total_money
T16.name AS org_name,
SUM(T9.total_price) AS total_money
FROM wor_device_request T4
LEFT JOIN wor_device_dispense T5
ON T5.device_req_id = T4.id
@@ -241,18 +253,22 @@
/* 时间区间 */
AND
TO_CHAR(T5.dispense_time, 'yyyy-MM-dd HH24:mi:ss') BETWEEN #{dispenseDateSTime} AND #{dispenseDateETime}
LEFT JOIN (SELECT T9.service_id,
MAX(T9.unit_price) AS unit_price_max -- 单处方的最高单价
FROM adm_charge_item T9
WHERE T9.service_table = #{devReqTableName} --'wor_device_request'
AND T9.delete_flag = '0'
GROUP BY T9.service_id) T9_MAX ON T9_MAX.service_id = T4.ID
LEFT JOIN adm_charge_item T9
ON T9.service_table = #{devReqTableName} --'wor_device_request'
AND T9.service_id = T4.id
AND T9.delete_flag = '0'
LEFT JOIN wor_device_request T17
on T4.id = T17.refund_device_id
AND T17.delete_flag = '0'
LEFT JOIN adm_organization T16
ON T4.org_id = T16.id
AND T16.delete_flag = '0'
WHERE T4.status_enum = #{completed} --'3'
AND T5.status_enum = #{eventStatus} --'4'
AND T4.delete_flag = '0'
AND T5.dispense_time IS NOT NULL
AND T4.refund_device_id IS NULL
AND T17.refund_device_id IS NULL
GROUP BY T4.org_id,
T16.name

4
openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/MonthlySettlementReportMapper.xml
View File

@@ -68,7 +68,7 @@
COUNT(DISTINCT bus_no) AS total_number
FROM wor_supply_request T1
INNER JOIN wor_supply_delivery T2 ON T1.id = T2.request_id AND T2.delete_flag = '0'
WHERE T1.source_location_id = #{locationId}
WHERE T1.purpose_location_id = #{locationId}
AND T1.type_enum IN (#{productStocktaking} ,#{productBatchStocktaking} )
AND T1.status_enum = #{agree}--同意
AND T2.status_enum = #{completed}--已完成
@@ -112,6 +112,7 @@
AND T8.delete_flag = '0'
WHERE T2.location_id = #{locationId}
AND T1.status_enum = #{completed}--请求状态:已完成
AND T2.status_enum = #{agree}--请求状态:已发药
AND T1.delete_flag = '0'
AND TO_CHAR(T2.dispense_time, 'yyyy-MM-dd HH24:mi:ss') BETWEEN #{startTime} AND #{endTime}
GROUP BY
@@ -136,6 +137,7 @@
AND T9.delete_flag = '0'
WHERE T5.location_id = #{locationId}
AND T4.status_enum = #{completed}--请求状态:已完成
AND T5.status_enum = #{agree}--请求状态:已发药
AND T4.delete_flag = '0'
AND TO_CHAR(T5.dispense_time, 'yyyy-MM-dd HH24:mi:ss') BETWEEN #{startTime} AND #{endTime}
GROUP BY

5
openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/OutboundReportMapper.xml
View File

@@ -22,6 +22,7 @@
T10.supplier_id, --供应商
T10.approver_id, --审核人
T10.approval_time, --审批时间
T10.occurrence_time, --制单日期
T10.remake, --出库原因
T10.tenant_id -- 租户ID
from (
@@ -43,6 +44,7 @@
T1.supplier_id, --供应商
T1.approver_id, --审核人
T1.approval_time, --审批时间
T1.occurrence_time, --制单日期
T1.remake, --出库原因(备注)
T1.tenant_id -- 租户ID
from wor_supply_request as T1
@@ -66,6 +68,7 @@
on T6.id = T7.definition_id
and T7.delete_flag = '0'
AND T7.condition_value = T1.lot_number
AND T7.condition_code = '1'--1:批号进价
left join adm_organization T8
on T1.purpose_location_id = T8.id
and T8.delete_flag = '0'
@@ -92,6 +95,7 @@
T1.supplier_id, --供应商
T1.approver_id, --审核人
T1.approval_time, --审批时间
T1.occurrence_time, --制单日期
T1.remake, --出库原因
T1.tenant_id -- 租户ID
from wor_supply_request as T1
@@ -115,6 +119,7 @@
on T6.id = T7.definition_id
and T7.delete_flag = '0'
AND T7.condition_value = T1.lot_number
AND T7.condition_code = '1'--1:批号进价
left join adm_organization T8
on T1.purpose_location_id = T8.id
and T8.delete_flag = '0'

8
openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/PurchaseReturnReportMapper.xml
View File

@@ -20,7 +20,7 @@
T10.supplier_id, --供应商id
T10.supplier, --供应商
T10.approver_id, --审核人
T10.create_time, --制单日期
T10.occurrence_time, --制单日期
T10.approval_time, --审核日期
T10.tenant_id -- 租户ID
FROM (SELECT T1.bus_no AS supply_bus_no, --单据号
@@ -40,7 +40,7 @@
T1.supplier_id, --供应商id
T9.name AS supplier, --供应商
T1.approver_id, --审核人
T1.create_time, --制单日期
T1.occurrence_time, --制单日期
T1.approval_time, --审核日期
T1.tenant_id -- 租户ID
FROM wor_supply_request AS T1
@@ -58,6 +58,7 @@
ON T4.definition_id = T3.id
AND T4.delete_flag = '0'
AND T4.condition_value = T1.lot_number
AND T4.condition_code = '1'--1:批号进价
LEFT JOIN med_medication AS T5
ON T5.medication_def_id = T2.id
AND T5.delete_flag = '0'
@@ -92,7 +93,7 @@
T1.supplier_id, --供应商id
T9.name AS supplier, --供应商
T1.approver_id, --审核人
T1.create_time, --制单日期
T1.occurrence_time, --制单日期
T1.approval_time, --审核日期
T1.tenant_id -- 租户ID
FROM wor_supply_request AS T1
@@ -110,6 +111,7 @@
ON T4.definition_id = T3.id
AND T4.delete_flag = '0'
AND T4.condition_value = T1.lot_number
AND T4.condition_code = '1'--1:批号进价
LEFT JOIN adm_location AS T7
ON T7.id = T1.purpose_location_id
AND T7.delete_flag = '0'

5
openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/ReturnIssueReportMapper.xml
View File

@@ -23,6 +23,7 @@
T10.approver_id, --审核人
T10.approval_time, --审批时间
T10.remake, --退库原因
T10.occurrence_time, --制单日期
T10.tenant_id -- 租户ID
from (
select T1.bus_no as supply_bus_no, --单据号
@@ -44,6 +45,7 @@
T1.approver_id, --审核人
T1.approval_time, --审批时间
T1.remake, --退库原因(备注)
T1.occurrence_time, --制单日期
T1.tenant_id -- 租户ID
from wor_supply_request as T1
inner join wor_supply_delivery as T2
@@ -66,6 +68,7 @@
on T6.id = T7.definition_id
and T7.delete_flag = '0'
AND T7.condition_value = T1.lot_number
AND T7.condition_code = '1'--1:批号进价
left join adm_organization T8
on T1.source_location_id = T8.id
and T8.delete_flag = '0'
@@ -93,6 +96,7 @@
T1.approver_id, --审核人
T1.approval_time, --审批时间
T1.remake, --退库原因
T1.occurrence_time, --制单日期
T1.tenant_id -- 租户ID
from wor_supply_request as T1
inner join wor_supply_delivery as T2
@@ -115,6 +119,7 @@
on T6.id = T7.definition_id
and T7.delete_flag = '0'
AND T7.condition_value = T1.lot_number
AND T7.condition_code = '1'--1:批号进价
left join adm_organization T8
on T1.source_location_id = T8.id
and T8.delete_flag = '0'

157
openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/StocktakingReportMapper.xml
View File

@@ -9,24 +9,38 @@
T9.name, --名称
T9.total_volume, --规格
T9.manufacturer_text, --厂家
-- T9.item_table, --类型
T9.lot_number, --产品批号
T9.location_name, --目的仓库
T9.unit_code, --小单位
T9.item_quantity, --数量
T9.approval_time, --审批时间
T9.supply_bus_no,--单据号
T9.purpose_location_id,-- 目的仓库id
T9.price,--采购单价
T9.location_store_name,--仓库货位
T9.total_price,--报损金额
T9.name AS supplier,--供应商
T9.approver_id, --审核人
T9.occurrence_time, --制单日期
T9.tenant_id -- 租户ID
FROM (SELECT T1.id, --ID
T2.bus_no, --编码
T2.name, --名称
T3.total_volume, --规格
T2.manufacturer_text, --厂家
-- T2.category_code AS item_table, --类型
T4.lot_number, --产品批号
T1.lot_number, --产品批号
T5.name AS location_name, --目的仓库
T1.unit_code, --小单位
T1.item_quantity, --盈亏数量
T1.approval_time, --审批时间
T1.bus_no AS supply_bus_no,--单据号
T1.purpose_location_id,-- 目的仓库id
T1.price,--采购单价
T4.name AS location_store_name,--仓库货位
T1.total_price,--报损金额
T9.name AS supplier,--供应商
T1.approver_id, --审核人
T1.occurrence_time, --制单日期
T1.tenant_id -- 租户ID
FROM wor_supply_request AS T1
INNER JOIN wor_supply_delivery AS T8
@@ -39,14 +53,15 @@
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 T5
ON T1.purpose_location_id = T5.id
AND T5.delete_flag = '0'
LEFT JOIN adm_location AS T4
ON T4.id = T1.purpose_location_store_id
AND T4.delete_flag = '0'
LEFT JOIN adm_supplier AS T9
ON T9.id = T1.supplier_id
AND T9.delete_flag = '0'
WHERE T1.type_enum in (#{stocktakingReport}, #{stocktakingBatchReport})
AND T1.status_enum = #{supplyStatus}
AND T1.item_table = #{medicationTableName}
@@ -57,12 +72,19 @@
T6.name, --名称
T6.size AS total_volume, --规格（器材规格）
T6.manufacturer_text, --厂家
-- T6.category_code AS item_table, --类型
T4.lot_number, --产品批号
T1.lot_number, --产品批号
T5.name AS location_name, --目的仓库
T1.unit_code, --小单位
T1.item_quantity, --盈亏数量
T1.approval_time, --审批时间
T1.bus_no AS supply_bus_no,--单据号
T1.purpose_location_id,-- 目的仓库id
T1.price,--采购单价
T4.name AS location_store_name,--仓库货位
T1.total_price,--报损金额
T9.name AS supplier,--供应商
T1.approver_id, --审核人
T1.occurrence_time, --制单日期
T1.tenant_id -- 租户ID
FROM wor_supply_request AS T1
INNER JOIN wor_supply_delivery AS T8
@@ -72,19 +94,122 @@
LEFT JOIN adm_device_definition AS T6
ON T1.item_id = T6.id
AND T6.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 T5
ON T1.purpose_location_id = T5.id
AND T5.delete_flag = '0'
LEFT JOIN adm_location AS T4
ON T4.id = T1.purpose_location_store_id
AND T4.delete_flag = '0'
LEFT JOIN adm_supplier AS T9
ON T9.id = T1.supplier_id
AND T9.delete_flag = '0'
WHERE T1.type_enum in (#{stocktakingReport}, #{stocktakingBatchReport})
AND T1.status_enum = #{supplyStatus}
AND T1.item_table = #{deviceTableName}
AND T1.delete_flag = '0') AS T9
${ew.customSqlSegment}
ORDER BY T9.bus_no DESC
ORDER BY T9.supply_bus_no DESC
</select>
<select id="selectAutoStocktakingReportPage"
resultType="com.openhis.web.reportmanage.dto.StocktakingReportPageDto">
SELECT T9.id, --ID
T9.bus_no, --编码
T9.name, --名称
T9.total_volume, --规格
T9.manufacturer_text, --厂家
T9.lot_number, --产品批号
T9.location_name, --目的仓库
T9.unit_code, --小单位
T9.item_quantity, --数量
T9.approval_time, --审批时间
T9.supply_bus_no,--单据号
T9.purpose_location_id,-- 目的仓库id
T9.price,--采购单价
T9.location_store_name,--仓库货位
T9.total_price,--报损金额
T9.name AS supplier,--供应商
T9.approver_id, --审核人
T9.occurrence_time, --制单日期
T9.tenant_id -- 租户ID
FROM (SELECT T1.id, --ID
T2.bus_no, --编码
T2.name, --名称
T3.total_volume, --规格
T2.manufacturer_text, --厂家
T1.lot_number, --产品批号
T5.name AS location_name, --目的仓库
T1.unit_code, --小单位
T1.item_quantity, --盈亏数量
T1.approval_time, --审批时间
T1.bus_no AS supply_bus_no,--单据号
T1.purpose_location_id,-- 目的仓库id
T1.price,--采购单价
T4.name AS location_store_name,--仓库货位
T1.total_price,--报损金额
T9.name AS supplier,--供应商
T1.approver_id, --审核人
T1.occurrence_time, --制单日期
T1.tenant_id -- 租户ID
FROM wor_aut_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 adm_location T5
ON T1.purpose_location_id = T5.id
AND T5.delete_flag = '0'
LEFT JOIN adm_location AS T4
ON T4.id = T1.purpose_location_store_id
AND T4.delete_flag = '0'
LEFT JOIN adm_supplier AS T9
ON T9.id = T1.supplier_id
AND T9.delete_flag = '0'
WHERE T1.type_enum = #{stocktakingReport}
AND T1.status_enum = #{supplyStatus}
AND T1.item_table = #{medicationTableName}
AND T1.delete_flag = '0'
AND TO_CHAR(T1.occurrence_time, 'yyyy-MM-dd HH24:mi:ss') = #{time}
UNION
SELECT T1.id, --ID
T6.bus_no, --编码
T6.name, --名称
T6.size AS total_volume, --规格（器材规格）
T6.manufacturer_text, --厂家
T1.lot_number, --产品批号
T5.name AS location_name, --目的仓库
T1.unit_code, --小单位
T1.item_quantity, --盈亏数量
T1.approval_time, --审批时间
T1.bus_no AS supply_bus_no,--单据号
T1.purpose_location_id,-- 目的仓库id
T1.price,--采购单价
T4.name AS location_store_name,--仓库货位
T1.total_price,--报损金额
T9.name AS supplier,--供应商
T1.approver_id, --审核人
T1.occurrence_time, --制单日期
T1.tenant_id -- 租户ID
FROM wor_aut_supply_request AS T1
LEFT JOIN adm_device_definition AS T6
ON T1.item_id = T6.id
AND T6.delete_flag = '0'
LEFT JOIN adm_location T5
ON T1.purpose_location_id = T5.id
AND T5.delete_flag = '0'
LEFT JOIN adm_location AS T4
ON T4.id = T1.purpose_location_store_id
AND T4.delete_flag = '0'
LEFT JOIN adm_supplier AS T9
ON T9.id = T1.supplier_id
AND T9.delete_flag = '0'
WHERE T1.type_enum = #{stocktakingReport}
AND T1.status_enum = #{supplyStatus}
AND T1.item_table = #{deviceTableName}
AND T1.delete_flag = '0'
AND TO_CHAR(T1.occurrence_time, 'yyyy-MM-dd HH24:mi:ss') = #{time}) AS T9
ORDER BY T9.supply_bus_no DESC
</select>
</mapper>

6
openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/TransferReportMapper.xml
View File

@@ -23,7 +23,7 @@
T6.total_price, -- 总价
T6.applicant_id, -- 申请人（制单人）
T6.approver_id, -- 审核人
T6.create_time, -- 制单日期
T6.occurrence_time, -- 制单日期
T6.apply_time, -- 申请日期
T6.approval_time, -- 审批时间（调拨日期）
T6.tenant_id -- 租户ID
@@ -46,7 +46,7 @@
T1.total_price, -- 总价
T1.applicant_id, -- 申请人（制单人）
T1.approver_id, -- 审核人
T1.create_time, -- 制单日期
T1.occurrence_time, -- 制单日期
T1.apply_time, -- 申请日期
T1.approval_time, -- 审批时间（调拨日期）
T1.tenant_id -- 租户ID
@@ -94,7 +94,7 @@
T1.total_price, -- 总价
T1.applicant_id, -- 申请人（制单人）
T1.approver_id, -- 审核人
T1.create_time, -- 制单日期
T1.occurrence_time, -- 制单日期
T1.apply_time, -- 申请日期
T1.approval_time, -- 审批时间（调拨日期）
T1.tenant_id -- 租户ID