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

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

@@ -126,6 +126,7 @@
AND T1.inventory_status_enum = #{inventoryStatusEnum}
AND T1.location_id = #{sourceLocationId}
AND T1.item_table = #{medicationTableName}
AND T1.quantity > 0
UNION ALL
SELECT T1.tenant_id,
#{device} AS medication_type,
@@ -174,6 +175,7 @@
AND T1.inventory_status_enum = #{inventoryStatusEnum}
AND T1.location_id = #{sourceLocationId}
AND T1.item_table = #{deviceTableName}
AND T1.quantity > 0
) AS A
${ew.customSqlSegment}
</select>
@@ -210,6 +212,7 @@
T1.item_id, -- 项目id
T2.part_percent, -- 拆零比
T1.remake, -- 备注
T1.occurrence_time,
T9.quantity AS total_source_quantity, -- 库存数量(源库存)
T12.quantity AS total_purpose_quantity -- 库存数量(目的库存)
FROM wor_supply_request T1
@@ -281,6 +284,7 @@
T1.item_id, -- 项目id
T2.part_percent, -- 拆零比
T1.remake, -- 备注
T1.occurrence_time,
T9.quantity AS total_source_quantity, -- 总库存数量(源库存)
T12.quantity AS total_purpose_quantity -- 总库存数量(目的库存)
FROM wor_supply_request T1

2
openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/PurchaseInventoryMapper.xml
View File

@@ -80,6 +80,7 @@
T6."name" AS purpose_location_name,
T6."id" AS purpose_location_id,
T7."name" AS purpose_location_store_name,
T1.occurrence_time,
(SELECT SUM(T9.quantity)
FROM wor_inventory_item T9
WHERE T9.item_id = T1.item_id
@@ -126,6 +127,7 @@
T6."name" AS purpose_location_name,
T6."id" AS purpose_location_id,
T7."name" AS purpose_location_store_name,
T1.occurrence_time,
(SELECT SUM(T9.quantity)
FROM wor_inventory_item T9
WHERE T9.item_id = T1.item_id

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

@@ -94,6 +94,7 @@
THEN T1.practitioner_id
ELSE NULL
END AS practitioner_id, --经手人
T1.occurrence_time,
T4.part_percent --拆零比
FROM wor_supply_request T1
LEFT JOIN wor_inventory_item T2
@@ -223,6 +224,7 @@
THEN T1.practitioner_id
ELSE NULL
END AS practitioner_id, --经手人
T1.occurrence_time,
T4.part_percent --拆零比
FROM wor_supply_request T1
LEFT JOIN wor_inventory_item T2
@@ -266,7 +268,7 @@
T1.practitioner_id,
T1.applicant_id,
T1.approver_id,
MIN(T1.create_time) AS create_time, -- 制单时间
MIN(T1.occurrence_time) AS occurrence_time, -- 制单时间
T1.approval_time
FROM wor_supply_request AS T1
WHERE T1.original_bus_no = #{busNo}

7
openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/ReceiptApprovalMapper.xml
View File

@@ -125,9 +125,14 @@
FROM adm_charge_item_definition AS T1
LEFT JOIN adm_charge_item_def_detail AS T2
ON T1.id = T2.definition_id
AND T2.delete_flag = '0'
LEFT JOIN med_medication_definition AS T3
ON T1.instance_id = T3.id
WHERE T1.instance_id IN
AND T3.delete_flag = '0'
LEFT JOIN adm_device_definition AS T4
ON T1.instance_id = T4.id
AND T4.delete_flag = '0'
WHERE T1.instance_id IN
<foreach collection="itemIdList" item="itemId" separator="," open="(" close=")">
#{itemId}
</foreach>

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

@@ -87,6 +87,7 @@
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
@@ -157,6 +158,7 @@
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
@@ -264,12 +266,7 @@
<foreach collection="typeEnum" item="item" separator="," open="(" close=")">
#{item}
</foreach>
<if test="endTime == null">
AND TO_CHAR(T1.occurrence_time, 'yyyy-MM-dd HH24:mi:ss') = #{startTime}
</if>
<if test="endTime != null">
AND TO_CHAR(T1.occurrence_time, 'yyyy-MM-dd HH24:mi:ss') BETWEEN #{startTime} AND #{endTime}
</if>
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

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

@@ -87,6 +87,7 @@
T7."name" AS purpose_location_store_name, -- 目的仓位
T8."name" AS source_location_name, -- 源仓库
T9."name" AS source_location_store_name, -- 源仓位
T1.occurrence_time,
T1.remake -- 备注
FROM wor_supply_request T1
LEFT JOIN med_medication_definition T2
@@ -157,6 +158,7 @@
T7."name" AS source_location_store_name, -- 源仓位
T8."name" AS purpose_location_name, -- 目的仓库
T9."name" AS purpose_location_store_name, -- 目的货位
T1.occurrence_time,
T1.remake -- 备注
FROM wor_supply_request T1
LEFT JOIN adm_device_definition T2