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

解决合并冲突

Browse Source
This commit is contained in:
chenqi
2025-12-10 14:20:24 +08:00
parent e1385cb3e6
commit 18f6a845e6
804 changed files with 61881 additions and 13577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
openhis-server-new/openhis-application/src/main/resources/mapper/adjustprice/AdjustPriceMapper.xml Normal file
View File

@@ -0,0 +1,95 @@
<?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.adjustprice.mapper.AdjustPriceMapper">
<select id="selectInventoryReceiptPage"
resultType="com.openhis.web.inventorymanage.dto.ReceiptPageDto">
SELECT T2.supply_bus_no,
T2.status_enum,
T2.type_enum,
T2.supplier_id,
T2.approver_id,
T2.approval_time,
T2.applicant_id,
T2.create_time,
T2.practitioner_id,
T2.item_table,
T2.purpose_type_enum,
T2.category_enum,
CASE
WHEN EXISTS(
SELECT 1
FROM wor_supply_request AS T3
WHERE T3.original_bus_no = T2.supply_bus_no
AND T3.delete_flag = '0'
) THEN 1
ELSE 0
END AS return_status, --退库状态
T2.tenant_id
FROM (SELECT T1.bus_no AS supply_bus_no,
T1.status_enum,
T1.type_enum,
T1.supplier_id,
T1.approver_id,
T1.approval_time,
T1.applicant_id,
MIN(T1.create_time) AS create_time,
T1.practitioner_id,
T1.item_table,
T1.purpose_type_enum,
T1.tenant_id,
T1.category_enum
FROM wor_supply_request AS T1
WHERE type_enum = #{medTypeEnum}
OR type_enum = #{deviceTypeEnum}
OR type_enum = #{activityTypeEnum}
OR type_enum = #{healthTypeEnum}
AND T1.delete_flag = '0'
GROUP BY T1.bus_no,
T1.status_enum,
T1.type_enum,
T1.supplier_id,
T1.approver_id,
T1.approval_time,
T1.applicant_id,
T1.practitioner_id,
T1.item_table,
T1.purpose_type_enum,
T1.tenant_id,
T1.category_enum
ORDER BY T1.bus_no desc) AS T2
${ew.customSqlSegment}
</select>
<select id="searchChangePriceDataToPage" resultType="com.openhis.web.adjustprice.dto.ChangePricePageDto">
select t2.bus_no,
t2.status_enum,
t2.approver_id,
t2.approval_time,
t2.applicant_id,
t2.applicant_time,
t2.create_time,
t2.item_category_enum,
t2.tenant_id
from (select t1.bus_no,
t1.status_enum,
t1.approver_id,
min(t1.approval_time) as approval_time,
t1.applicant_id,
min(t1.applicant_time) as applicant_time,
min(t1.create_time) as create_time,
t1.item_category_enum,
t1.tenant_id
FROM adm_change_price_record t1
where t1.delete_flag = '0'
and t1.applicant_id = #{applicantId}
and (item_category_enum = #{medCategory}
OR item_category_enum = #{deviceCategory}
OR item_category_enum = #{activityCategory}
OR item_category_enum = #{healthCategory})
GROUP BY t1.bus_no, t1.status_enum, t1.approver_id, t1.applicant_id, t1.item_category_enum, t1.tenant_id
ORDER BY t1.bus_no desc) as t2
${ew.customSqlSegment}
</select>
</mapper>

9
openhis-server-new/openhis-application/src/main/resources/mapper/adjustprice/SupplyMapper.xml
View File

@@ -1,9 +0,0 @@
<?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.adjustprice.mapper.SupplyMapper">
<select id="searchAllSupplyList" resultType="com.openhis.web.adjustprice.dto.SupplyListDto">
SELECT id as supplyId,name as supplyName
FROM adm_supplier
</select>
</mapper>