diff --git a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryCommonMapper.xml b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryCommonMapper.xml
index b9153b351..d7f4797af 100755
--- a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryCommonMapper.xml
+++ b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryCommonMapper.xml
@@ -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,   --药品编码
diff --git a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryDispensingOrderMapper.xml b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryDispensingOrderMapper.xml
index e96b72583..d3ec5374c 100755
--- a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryDispensingOrderMapper.xml
+++ b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryDispensingOrderMapper.xml
@@ -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
diff --git a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseCommonMapper.xml b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseCommonMapper.xml
index ce7dd80a8..1d6b97ff6 100755
--- a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseCommonMapper.xml
+++ b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseCommonMapper.xml
@@ -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,   --药品编码
diff --git a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/pharmacymanage/InHospitalReturnMedicineAppMapper.xml b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/pharmacymanage/InHospitalReturnMedicineAppMapper.xml
index 4889a0762..c70d0583a 100755
--- a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/pharmacymanage/InHospitalReturnMedicineAppMapper.xml
+++ b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/pharmacymanage/InHospitalReturnMedicineAppMapper.xml
@@ -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,
diff --git a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/pharmacymanage/MedicalDeviceDispenseMapper.xml b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/pharmacymanage/MedicalDeviceDispenseMapper.xml
index fc76bbbae..b8d839ecd 100755
--- a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/pharmacymanage/MedicalDeviceDispenseMapper.xml
+++ b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/pharmacymanage/MedicalDeviceDispenseMapper.xml
@@ -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,
diff --git a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/pharmacymanage/MedicationDetailsMapper.xml b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/pharmacymanage/MedicationDetailsMapper.xml
index 92e989349..a36420d5a 100755
--- a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/pharmacymanage/MedicationDetailsMapper.xml
+++ b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/pharmacymanage/MedicationDetailsMapper.xml
@@ -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,
diff --git a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/pharmacymanage/PendingMedicationDetailsMapper.xml b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/pharmacymanage/PendingMedicationDetailsMapper.xml
index 984e2cb06..dda4c235b 100755
--- a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/pharmacymanage/PendingMedicationDetailsMapper.xml
+++ b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/pharmacymanage/PendingMedicationDetailsMapper.xml
@@ -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,    --药品拼音
diff --git a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/pharmacymanage/ReturnMedicineMapper.xml b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/pharmacymanage/ReturnMedicineMapper.xml
index 83925ef6f..19941df80 100755
--- a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/pharmacymanage/ReturnMedicineMapper.xml
+++ b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/pharmacymanage/ReturnMedicineMapper.xml
@@ -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())">
diff --git a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml
index e9167ce55..b8c856fda 100755
--- a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml
+++ b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml
@@ -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 ,