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

fix(pharmacy): 修复所有药房模块XML DTO引用路径

Browse Source
This commit is contained in:
chenqi
2026-06-21 04:48:08 +08:00
parent 8be86da14d
commit 38346f47cf
9 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
healthlink-his-server/healthlink-his-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryCommonMapper.xml
View File

@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.healthlink.his.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryCommonMapper">
<select id="getMedicationInfo"
resultType="com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensaryMedicationInfoDto">
resultType="com.healthlink.his.web.pharmacy.dispensary.dto.PharmacyDispensaryMedicationInfoDto">
SELECT T6.id,--物品id
T6.bus_no,-- 药品编号
T6.name,-- 物品名称
@@ -172,7 +172,7 @@
${ew.customSqlSegment}
</select>
<select id="getPage"
resultType="com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDto">
resultType="com.healthlink.his.web.pharmacy.dispensary.dto.PharmacyDispensaryDto">
SELECT T4.tenant_id,
T4.supply_bus_no, --单据号
T4.type_enum, --类型
@@ -233,7 +233,7 @@
${ew.customSqlSegment}
</select>
<select id="getDetailPage"
resultType="com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto">
resultType="com.healthlink.his.web.pharmacy.dispensary.dto.PharmacyDispensaryDetailDto">
SELECT T1.id, --ID
T1.bus_no, --单据号
T2.bus_no AS item_bus_no, --药品编码

2
healthlink-his-server/healthlink-his-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryDispensingOrderMapper.xml
View File

@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.healthlink.his.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryDispensingOrderMapper">
<select id="getInfo"
resultType="com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto">
resultType="com.healthlink.his.web.pharmacy.dispensary.dto.PharmacyDispensaryDetailDto">
SELECT string_agg(T1.id::text, ',' ORDER BY T1.id) AS dispense_ids,--药品发放id
T1.status_enum,--发放状态
CASE T3.category_enum

6
healthlink-his-server/healthlink-his-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseCommonMapper.xml
View File

@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.healthlink.his.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseCommonMapper">
<select id="getMedicationInfo"
resultType="com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseMedicationInfoDto">
resultType="com.healthlink.his.web.pharmacy.warehouse.dto.PharmacyWarehouseMedicationInfoDto">
SELECT T6.id,--物品id
T6.bus_no,-- 药品编号
T6.name,-- 物品名称
@@ -175,7 +175,7 @@
${ew.customSqlSegment}
</select>
<select id="getPage"
resultType="com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDto">
resultType="com.healthlink.his.web.pharmacy.warehouse.dto.PharmacyWarehouseDto">
SELECT T4.tenant_id,
T4.supply_bus_no, --单据号
T4.type_enum, --类型
@@ -238,7 +238,7 @@
${ew.customSqlSegment}
</select>
<select id="getDetailPage"
resultType="com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto">
resultType="com.healthlink.his.web.pharmacy.warehouse.dto.PharmacyWarehouseDetailDto">
SELECT T1.id, --ID
T1.bus_no, --单据号
T2.bus_no AS item_bus_no, --药品编码

4
healthlink-his-server/healthlink-his-application/src/main/resources/mapper/pharmacymanage/InHospitalReturnMedicineAppMapper.xml
View File

@@ -1,7 +1,7 @@
<?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.healthlink.his.web.pharmacymanage.mapper.InHospitalReturnMedicineAppMapper">
<select id="selectEncounterInfoListPage" resultType="com.healthlink.his.web.pharmacymanage.dto.EncounterInfoDto">
<select id="selectEncounterInfoListPage" resultType="com.healthlink.his.web.pharmacy.dispense.dto.EncounterInfoDto">
SELECT MAX(ii.reception_time) AS reception_time,
MAX(ii.start_time) AS start_time,
ii.encounter_id,
@@ -102,7 +102,7 @@
ORDER BY reception_time DESC
</select>
<select id="selectReturnMedicineInfo"
resultType="com.healthlink.his.web.pharmacymanage.dto.ReturnMedicineInfoDto">
resultType="com.healthlink.his.web.pharmacy.dispense.dto.ReturnMedicineInfoDto">
<if test="itemTable == null or itemTable == medMedicationDefinition">
SELECT mmd.status_enum AS refund_enum,
mmd.quantity,

4
healthlink-his-server/healthlink-his-application/src/main/resources/mapper/pharmacymanage/MedicalDeviceDispenseMapper.xml
View File

@@ -1,7 +1,7 @@
<?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.healthlink.his.web.pharmacymanage.mapper.MedicalDeviceDispenseMapper">
<select id="selectEncounterInfoListPage" resultType="com.healthlink.his.web.pharmacymanage.dto.EncounterInfoDto">
<select id="selectEncounterInfoListPage" resultType="com.healthlink.his.web.pharmacy.dispense.dto.EncounterInfoDto">
SELECT ii.encounter_id,
ii.encounter_no,
ii.department_name,
@@ -67,7 +67,7 @@
ii.status_enum
ORDER BY ii.reception_time DESC
</select>
<select id="selectDeviceDispenseOrderPage" resultType="com.healthlink.his.web.pharmacymanage.dto.ItemDispenseOrderDto">
<select id="selectDeviceDispenseOrderPage" resultType="com.healthlink.his.web.pharmacy.dispense.dto.ItemDispenseOrderDto">
SELECT ii.department_name,
ii.doctor_name,
ii.item_type,

2
healthlink-his-server/healthlink-his-application/src/main/resources/mapper/pharmacymanage/MedicationDetailsMapper.xml
View File

@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.healthlink.his.web.pharmacymanage.mapper.MedicationDetailsMapper">
<select id="selectAmbPractitionerDetailPage"
resultType="com.healthlink.his.web.pharmacymanage.dto.MedDetailedAccountPageDto">
resultType="com.healthlink.his.web.pharmacy.dispense.dto.MedDetailedAccountPageDto">
select A.outpatient_no,
A.prescription_no,
A.patient_name,

2
healthlink-his-server/healthlink-his-application/src/main/resources/mapper/pharmacymanage/PendingMedicationDetailsMapper.xml
View File

@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.healthlink.his.web.pharmacymanage.mapper.PendingMedicationDetailsMapper">
<select id="selectPendingMedicationDetailsPage"
resultType="com.healthlink.his.web.pharmacymanage.dto.PendingMedicationPageDto">
resultType="com.healthlink.his.web.pharmacy.dispense.dto.PendingMedicationPageDto">
SELECT T7.medicine_no, --药品编码
T7.medicine_name, --药品名称
T7.py_str, --药品拼音

8
healthlink-his-server/healthlink-his-application/src/main/resources/mapper/pharmacymanage/ReturnMedicineMapper.xml
View File

@@ -1,7 +1,7 @@
<?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.healthlink.his.web.pharmacymanage.mapper.ReturnMedicineMapper">
<select id="selectEncounterInfoListPage" resultType="com.healthlink.his.web.pharmacymanage.dto.EncounterInfoDto">
<select id="selectEncounterInfoListPage" resultType="com.healthlink.his.web.pharmacy.dispense.dto.EncounterInfoDto">
SELECT ii.reception_time,
ii.start_time,
ii.encounter_id,
@@ -78,7 +78,7 @@
ORDER BY ii.reception_time DESC
</select>
<select id="selectInventoryInfoList"
resultType="com.healthlink.his.web.pharmacymanage.dto.UnDispenseInventoryDto">
resultType="com.healthlink.his.web.pharmacy.dispense.dto.UnDispenseInventoryDto">
<choose>
<when test="(medDispenseIdList != null and !medDispenseIdList.isEmpty())
or (devDispenseIdList != null and !devDispenseIdList.isEmpty())">
@@ -158,7 +158,7 @@
</choose>
</select>
<select id="selectReturnMedicineInfo"
resultType="com.healthlink.his.web.pharmacymanage.dto.ReturnMedicineInfoDto">
resultType="com.healthlink.his.web.pharmacy.dispense.dto.ReturnMedicineInfoDto">
SELECT mmd.status_enum AS refund_enum,
mmr.refund_medicine_id,
mmr.id AS request_id,
@@ -237,7 +237,7 @@
</if>
AND wdr.delete_flag = '0'
</select>
<select id="selectReturnItemDetail" resultType="com.healthlink.his.web.pharmacymanage.dto.DispenseInventoryDto">
<select id="selectReturnItemDetail" resultType="com.healthlink.his.web.pharmacy.dispense.dto.DispenseInventoryDto">
<choose>
<when test="(medDispenseIdList != null and !medDispenseIdList.isEmpty())
or (devDispenseIdList != null and !devDispenseIdList.isEmpty())">

8
healthlink-his-server/healthlink-his-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml
View File

@@ -1,7 +1,7 @@
<?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.healthlink.his.web.pharmacymanage.mapper.WesternMedicineDispenseMapper">
<resultMap id="medicineDispenseOrderMap" type="com.healthlink.his.web.pharmacymanage.dto.ItemDispenseOrderDto">
<resultMap id="medicineDispenseOrderMap" type="com.healthlink.his.web.pharmacy.dispense.dto.ItemDispenseOrderDto">
<result property="lotNumber" column="lot_number"/>
<result property="departmentName" column="department_name"/>
<result property="doctorId" column="doctor_id"/>
@@ -42,7 +42,7 @@
<result property="traceNo" column="trace_no"/>
<result property="partAttributeEnum" column="part_attribute_enum"/>
<result property="dispenseEnum" column="dispense_enum"/>
<collection property="inventoryDetailList" ofType="com.healthlink.his.web.pharmacymanage.dto.InventoryDetailDto">
<collection property="inventoryDetailList" ofType="com.healthlink.his.web.pharmacy.dispense.dto.InventoryDetailDto">
<result property="inventoryId" column="inventory_id"/>
<result property="maxUnitCode" column="max_unit_code"/>
<result property="partPercent" column="part_percent"/>
@@ -52,7 +52,7 @@
<result property="expirationDate" column="expiration_date"/>
</collection>
</resultMap>
<select id="selectEncounterInfoListPage" resultType="com.healthlink.his.web.pharmacymanage.dto.EncounterInfoDto">
<select id="selectEncounterInfoListPage" resultType="com.healthlink.his.web.pharmacy.dispense.dto.EncounterInfoDto">
SELECT ii.encounter_id,
ii.encounter_no,
ii.department_name,
@@ -301,7 +301,7 @@
su.status
</select>
<select id="selectMedicineInventoryDetail"
resultType="com.healthlink.his.web.pharmacymanage.dto.InventoryDetailDto">
resultType="com.healthlink.his.web.pharmacy.dispense.dto.InventoryDetailDto">
SELECT wii.expiration_date ,
wii.location_id ,
wii.item_id ,