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

Merge branch 'master' of https://codeup.aliyun.com/61c0318acd8b75daa5a125f7/medical/openhis

Browse Source
This commit is contained in:
liuhongrui
2025-03-19 10:26:42 +08:00
parent 6eef43314b 804d3968b3
commit 1c381e1fa2
2 changed files with 75 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/PurchaseInventoryAppServiceImpl.java
View File

@@ -144,7 +144,10 @@ public class PurchaseInventoryAppServiceImpl implements IPurchaseInventoryAppSer
@Override @Override
public R<?> getDetail(String busNo) { public R<?> getDetail(String busNo) {
List<ReceiptDetailDto> receiptDetailList = purchaseInventoryMapper.selectDetail(busNo); List<ReceiptDetailDto> receiptDetailList = purchaseInventoryMapper.selectDetail(busNo);
return null; if (receiptDetailList.isEmpty()){
return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00006,null));
}
return R.ok(receiptDetailList);
} }
/** /**

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

@@ -41,7 +41,37 @@
${ew.customSqlSegment} ${ew.customSqlSegment}
</select> </select>
<select id="selectDetail" resultType="com.openhis.web.inventorymanage.dto.ReceiptDetailDto"> <select id="selectDetail" resultType="com.openhis.web.inventorymanage.dto.ReceiptDetailDto">
SELECT * SELECT T1.id,
T1.bus_no,
T1.item_quantity,
T1.unit_code,
T1.detail_json,
T1.purpose_type_enum,
T1.apply_time,
T1.lot_number,
T1.trace_no,
T1.invoice_no,
T1.start_time,
T1.end_time,
T1.price,
T1.total_price,
T1.sell_price,
T1.min_sell_price,
T2."name" AS item_name,
T3.total_volume,
T4."name" AS supplier_name,
T5."name" AS practitioner_name,
T6."name" AS purpose_location_name,
T7."name" AS purpose_location_store_name,
(SELECT COALESCE(SUM(CASE
WHEN T1.unit_code = T9.base_unit_code THEN T9.base_quantity
WHEN T1.unit_code = T9.min_unit_code THEN T9.min_quantity
ELSE 0 END ), 0)
FROM wor_inventory_item T9
WHERE T9.item_id = T1.item_id
AND T9.location_id = T1.purpose_location_id
AND T9.location_store_id = T1.purpose_location_store_id
) AS total_quantity
FROM wor_supply_request T1 FROM wor_supply_request T1
LEFT JOIN med_medication_definition T2 LEFT JOIN med_medication_definition T2
ON T1.item_id = T2.id ON T1.item_id = T2.id
@@ -55,10 +85,44 @@
ON T1.purpose_location_id = T6.id ON T1.purpose_location_id = T6.id
LEFT JOIN adm_location T7 LEFT JOIN adm_location T7
ON T1.purpose_location_store_id = T7.id ON T1.purpose_location_store_id = T7.id
LEFT JOIN wor_inventory_item T9
ON T1.item_id = T9.item_id
AND T1.purpose_location_id = T9.location_id
AND T1.purpose_location_store_id = T9.location_store_id
WHERE T1.bus_no = #{busNo} WHERE T1.bus_no = #{busNo}
AND T1.delete_flag = '0' AND T1.delete_flag = '0'
UNION ALL UNION
SELECT * SELECT T1.id,
T1.bus_no,
T1.item_quantity,
T1.unit_code,
T1.detail_json,
T1.purpose_type_enum,
T1.apply_time,
T1.lot_number,
T1.trace_no,
T1.invoice_no,
T1.start_time,
T1.end_time,
T1.price,
T1.total_price,
T1.sell_price,
T1.min_sell_price,
T8."name" AS item_name,
T8."size" AS total_volume,
T4."name" AS supplier_name,
T5."name" AS practitioner_name,
T6."name" AS purpose_location_name,
T7."name" AS purpose_location_store_name,
(SELECT COALESCE(SUM(CASE
WHEN T1.unit_code = T9.base_unit_code THEN T9.base_quantity
WHEN T1.unit_code = T9.min_unit_code THEN T9.min_quantity
ELSE 0 END ), 0)
FROM wor_inventory_item T9
WHERE T9.item_id = T1.item_id
AND T9.location_id = T1.purpose_location_id
AND T9.location_store_id = T1.purpose_location_store_id
) AS total_quantity
FROM wor_supply_request T1 FROM wor_supply_request T1
LEFT JOIN adm_device_definition T8 LEFT JOIN adm_device_definition T8
ON T1.item_id = T8.id ON T1.item_id = T8.id
@@ -70,6 +134,10 @@
ON T1.purpose_location_id = T6.id ON T1.purpose_location_id = T6.id
LEFT JOIN adm_location T7 LEFT JOIN adm_location T7
ON T1.purpose_location_store_id = T7.id ON T1.purpose_location_store_id = T7.id
LEFT JOIN wor_inventory_item T9
ON T1.item_id = T9.item_id
AND T1.purpose_location_id = T9.location_id
AND T1.purpose_location_store_id = T9.location_store_id
WHERE T1.bus_no = #{busNo} WHERE T1.bus_no = #{busNo}
AND T1.delete_flag = '0' AND T1.delete_flag = '0'
</select> </select>