diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysTenantOption.java b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysTenantOption.java
index afb2acdd..5adc708a 100644
--- a/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysTenantOption.java
+++ b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysTenantOption.java
@@ -66,4 +66,6 @@ public class SysTenantOption implements Serializable {
     @TableField(fill = FieldFill.UPDATE)
     private Date updateTime;
 
+    
+
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java
index 092b0a71..42b99c85 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java
@@ -177,28 +177,9 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                     List<
                             AdviceInventoryDto> inventoryList =
                             adviceInventory.stream()
-<<<<<<< HEAD
-                                .filter(e -> baseDto.getAdviceDefinitionId().equals(e.getItemId())
-                                    && baseDto.getAdviceTableName().equals(e.getItemTable()))
-                                .collect(Collectors.toList());
-                    // 当存在按科室配置时：仅保留被允许的药房/药库的库存；
-                    // 若该药品类别未在配置中出现，则视为不可开立（清空库存以便前端过滤掉）
-                    if (!allowedLocByCategory.isEmpty()) {
-                        Set<Long> allowedLoc =
-                            allowedLocByCategory.get(String.valueOf(baseDto.getCategoryCode()));
-                        if (allowedLoc == null || allowedLoc.isEmpty()) {
-                            inventoryList = Collections.emptyList();
-                        } else {
-                            inventoryList = inventoryList.stream()
-                                .filter(inv -> allowedLoc.contains(inv.getLocationId()))
-                                .collect(Collectors.toList());
-                        }
-                    }
-=======
                                     .filter(e -> baseDto.getAdviceDefinitionId().equals(e.getItemId())
                                             && baseDto.getAdviceTableName().equals(e.getItemTable()))
                                     .collect(Collectors.toList());
->>>>>>> upstream/develop
                     // 库存信息
                     baseDto.setInventoryList(inventoryList);
                     // 设置默认产品批号
@@ -210,17 +191,6 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                             baseDto.setDefaultLotNumber(hasInventoryList.get(0).getLotNumber());
                         }
                     }
-<<<<<<< HEAD
-                    if (!inventoryList.isEmpty() && !allowedLocByCategory.isEmpty()) {
-                        Set<Long> allowedLoc =
-                            allowedLocByCategory.get(String.valueOf(baseDto.getCategoryCode()));
-                        if (allowedLoc != null && !allowedLoc.isEmpty()) {
-                            AdviceInventoryDto hit = inventoryList.stream()
-                                .filter(inv -> allowedLoc.contains(inv.getLocationId()))
-                                .findFirst().orElse(null);
-                            if (hit != null && hit.getLotNumber() != null) {
-                                baseDto.setDefaultLotNumber(hit.getLotNumber());
-=======
                     if (!inventoryList.isEmpty() && !medLocationConfig.isEmpty()) {
                         // 第一步：在medLocationConfig中匹配categoryCode
                         AdviceInventoryDto result1 = medLocationConfig.stream()
@@ -233,7 +203,6 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                                     .orElse(null);
                             if (result2 != null && result2.getLotNumber() != null) {
                                 baseDto.setDefaultLotNumber(result2.getLotNumber());
->>>>>>> upstream/develop
                             }
                         }
                     }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/PaymentReconciliationController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/PaymentReconciliationController.java
index eee110f0..60461bc1 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/PaymentReconciliationController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/PaymentReconciliationController.java
@@ -179,15 +179,9 @@ public class PaymentReconciliationController {
      * @return 操做结果
      */
     @PostMapping("/reg-pay")
-<<<<<<< HEAD
-    public R<?> regPay(@Valid @RequestBody OutpatientRegistrationSettleParam outpatientRegistrationSettleParam) {
-        R<?> result = paymentReconciliationService.regPay(outpatientRegistrationSettleParam,
-                outpatientRegistrationSettleParam.getChrgBchno(), outpatientRegistrationSettleParam.getPaymentDetails());
-=======
     public R<?> regPay(@Valid @RequestBody OutpatientRegistrationSettleParam outpatientRegistrationAddParam) {
         R<?> result = paymentReconciliationService.regPay(outpatientRegistrationAddParam,
             outpatientRegistrationAddParam.getChrgBchno(), outpatientRegistrationAddParam.getPaymentDetails());
->>>>>>> upstream/develop
         // 付款成功后，开具发票
         if (result.getCode() == 200) {
             PaymentReconciliation paymentRecon = null;
diff --git a/openhis-server-new/openhis-application/src/main/resources/application-test.yml b/openhis-server-new/openhis-application/src/main/resources/application-test.yml
index ce841649..b4401162 100644
--- a/openhis-server-new/openhis-application/src/main/resources/application-test.yml
+++ b/openhis-server-new/openhis-application/src/main/resources/application-test.yml
@@ -62,11 +62,7 @@ spring:
   # redis 配置
   redis:
     # 地址
-<<<<<<< HEAD:openhis-server-new/openhis-application/src/main/resources/application-test.yml
     host: 192.168.110.252
-=======
-    host: localhost
->>>>>>> upstream/develop:openhis-server-new/openhis-application/src/main/resources/application-local.yml
     # 端口，默认为6379
     port: 6379
     # 数据库索引
diff --git a/openhis-server-new/openhis-application/src/main/resources/application.yml b/openhis-server-new/openhis-application/src/main/resources/application.yml
index 35c92f6d..a8228c06 100644
--- a/openhis-server-new/openhis-application/src/main/resources/application.yml
+++ b/openhis-server-new/openhis-application/src/main/resources/application.yml
@@ -49,11 +49,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-<<<<<<< HEAD
     active: dev
-=======
-    active: local  # （本地）local （生产）prod
->>>>>>> upstream/develop
   # 文件上传
   servlet:
     multipart:
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/PurchaseInventoryMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/PurchaseInventoryMapper.xml
index 0bf5f91f..feea11d5 100644
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/PurchaseInventoryMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/PurchaseInventoryMapper.xml
@@ -77,11 +77,7 @@
                T2."name" AS item_name,
                T2.id AS item_id,
                T2.part_percent,
-<<<<<<< HEAD
-               T2.manufacturer_text AS manufacturer_text,
-=======
                T2.manufacturer_text,
->>>>>>> upstream/develop
                T3.total_volume,
                T5."name" AS practitioner_name,
                T6."name" AS purpose_location_name,
@@ -97,23 +93,6 @@
                ) AS total_quantity,
                T10."name" AS supplier_name
         FROM wor_supply_request T1
-<<<<<<< HEAD
-            INNER JOIN med_medication_definition T2
-                ON T1.item_id = T2.id
-            LEFT JOIN med_medication T3
-                ON T3.medication_def_id = T2.id
-            LEFT JOIN adm_practitioner T5
-                ON T1.practitioner_id = T5.id
-            LEFT JOIN adm_location T6
-                ON T1.purpose_location_id = T6.id
-            LEFT JOIN adm_location T7
-                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
-            LEFT JOIN adm_supplier T10
-                ON T1.supplier_id = T10.id
-=======
                  INNER JOIN med_medication_definition T2
                             ON T1.item_id = T2.id
                                 AND T2.delete_flag = '0'
@@ -136,7 +115,6 @@
                  LEFT JOIN adm_supplier T10
                            ON T1.supplier_id = T10.id
                                AND T10.delete_flag = '0'
->>>>>>> upstream/develop
         WHERE T1.bus_no = #{busNo}
           AND T1.delete_flag = '0'
         UNION
@@ -158,11 +136,7 @@
                T8."name" AS item_name,
                T8.id AS item_id,
                T8.part_percent,
-<<<<<<< HEAD
-               T8.manufacturer_text AS manufacturer_text,
-=======
                T8.manufacturer_text,
->>>>>>> upstream/develop
                T8."size" AS total_volume,
                T5."name" AS practitioner_name,
                T6."name" AS purpose_location_name,
@@ -175,118 +149,8 @@
                 FROM wor_inventory_item T9
                 WHERE T9.item_id = T1.item_id
                   AND T9.location_id = T1.purpose_location_id
-<<<<<<< HEAD
-               ) AS total_quantity
-        FROM wor_supply_request T1
-            INNER JOIN adm_device_definition T8
-                ON T1.item_id = T8.id
-            LEFT JOIN adm_practitioner T5
-                ON T1.practitioner_id = T5.id
-            LEFT JOIN adm_location T6
-                ON T1.purpose_location_id = T6.id
-            LEFT JOIN adm_location T7
-                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
-            LEFT JOIN adm_supplier T10
-                ON T1.supplier_id = T10.id
-        WHERE T1.bus_no = #{busNo}
-            AND T1.delete_flag = '0'
-    </select>
-    <select id="getMonthlySettlementDetail" resultType="com.openhis.web.inventorymanage.dto.ReceiptDetailDto">
-        SELECT T1.id,
-               T1.bus_no,
-               T1.item_quantity,
-               T1.item_table,
-               T1.unit_code,
-               T1.remake,
-               T1.purpose_type_enum,
-               T1.occurrence_time,
-               T1.lot_number,
-               T1.trace_no,
-               T1.invoice_no,
-               T1.start_time,
-               T1.end_time,
-               T1.price,
-               T1.total_price,
-               T2."name" AS item_name,
-               T2.id AS item_id,
-               T2.part_percent,
-               T2.manufacturer_text AS manufacturer_text,
-               T3.total_volume,
-               T5."name" AS practitioner_name,
-               T6."name" AS purpose_location_name,
-               T6."id" AS purpose_location_id,
-               T7."name" AS purpose_location_store_name,
-               T1.supplier_id AS supplierId,
-               T10."name" AS supplier_name,
-               (SELECT SUM(T9.quantity)
-                FROM wor_inventory_item T9
-                WHERE T9.item_id = T1.item_id
-                  AND T9.location_id = T1.purpose_location_id
-               ) AS total_quantity
-        FROM wor_supply_request T1
-                 INNER JOIN med_medication_definition T2
-                            ON T1.item_id = T2.id
-                 LEFT JOIN med_medication T3
-                           ON T3.medication_def_id = T2.id
-                 LEFT JOIN adm_practitioner T5
-                           ON T1.practitioner_id = T5.id
-                 LEFT JOIN adm_location T6
-                           ON T1.purpose_location_id = T6.id
-                 LEFT JOIN adm_location T7
-                           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
-                 LEFT JOIN adm_supplier T10
-                           ON T1.supplier_id = T10.id
-        WHERE  T1.purpose_location_id = #{locationId}
-           AND T1.status_enum = #{statusEnum}
-           AND T1.type_enum IN
-           <foreach collection="typeEnum" item="item" separator="," open="(" close=")">
-               #{item}
-           </foreach>
-           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
-        SELECT T1.id,
-               T1.bus_no,
-               T1.item_quantity,
-               T1.item_table,
-               T1.unit_code,
-               T1.remake,
-               T1.purpose_type_enum,
-               T1.occurrence_time,
-               T1.lot_number,
-               T1.trace_no,
-               T1.invoice_no,
-               T1.start_time,
-               T1.end_time,
-               T1.price,
-               T1.total_price,
-               T8."name" AS item_name,
-               T8.id AS item_id,
-               T8.part_percent,
-               T8.manufacturer_text AS manufacturer_text,
-               T8."size" AS total_volume,
-               T5."name" AS practitioner_name,
-               T6."name" AS purpose_location_name,
-               T6."id" AS purpose_location_id,
-               T7."name" AS purpose_location_store_name,
-               T1.supplier_id AS supplierId,
-               T10."name" AS supplier_name,
-               (SELECT SUM(T9.quantity)
-                FROM wor_inventory_item T9
-                WHERE T9.item_id = T1.item_id
-                  AND T9.location_id = T1.purpose_location_id
-               ) AS total_quantity
-=======
                ) AS total_quantity,
                T10."name" AS supplier_name
->>>>>>> upstream/develop
         FROM wor_supply_request T1
                  INNER JOIN adm_device_definition T8
                             ON T1.item_id = T8.id
@@ -303,10 +167,6 @@
                  LEFT JOIN wor_inventory_item T9
                            ON T1.item_id = T9.item_id
                                AND T1.purpose_location_id = T9.location_id
-<<<<<<< HEAD
-                 LEFT JOIN adm_supplier T10
-                           ON T1.supplier_id = T10.id
-=======
                                 AND T9.delete_flag = '0'
                  LEFT JOIN adm_supplier T10
                            ON T1.supplier_id = T10.id
@@ -358,7 +218,6 @@
         LEFT JOIN wor_inventory_item T9
         ON T1.item_id = T9.item_id
         AND T1.purpose_location_id = T9.location_id
->>>>>>> upstream/develop
         WHERE  T1.purpose_location_id = #{locationId}
         AND T1.status_enum = #{statusEnum}
         AND T1.type_enum IN
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml
index 9069e8d3..2da9c530 100644
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml
@@ -93,19 +93,7 @@
                         T13.charge_item_ids,
                         T13.id             AS payment_id,
                         ai.picture_url     AS picture_url,
-<<<<<<< HEAD
-                        T8.birth_date     AS birth_date,
-                        -- 退号相关信息
-                        T14.bill_date      AS return_date,
-                        T14.refund_reason  AS return_reason,
-                        T15."name"         AS operator_name,
-                        T17.user_name      AS operator_id,
-                        ABS(T14.display_amount) AS refund_amount,
-                        T6.contract_no     AS contract_no,
-                        T16.refund_method  AS refund_method
-=======
                         T8.birth_date      AS birth_date
->>>>>>> upstream/develop
                  FROM adm_encounter AS T1
                           LEFT JOIN adm_organization AS T2 ON T1.organization_id = T2.ID AND T2.delete_flag = '0'
                           LEFT JOIN adm_healthcare_service AS T3 ON T1.service_type_id = T3.ID AND T3.delete_flag = '0'
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml
index 8ed55751..fbde8058 100644
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml
@@ -43,368 +43,6 @@
         abi.restricted_scope,
         abi.dosage_instruction
         from (
-<<<<<<< HEAD
-        <!-- 改进SQL逻辑，确保所有情况都能正确处理，避免空的FROM子查询 -->
-        <!-- 当adviceTypes包含4或不在1-3范围内时，或者adviceTypes为空/null时，查询所有类型 -->
-        <choose>
-            <!-- 检查adviceTypes是否为null、空列表，或者包含4、5或其他不在1-3范围内的值 -->
-            <when test="adviceTypes == null or adviceTypes.isEmpty() or adviceTypes.contains(4) or adviceTypes.contains(5)">
-                <!-- 查询所有类型 -->
-                SELECT T1.tenant_id,
-                1 AS advice_type,
-                T1.category_code AS category_code,
-                T1.pharmacology_category_code AS pharmacology_category_code,
-                T1.part_percent AS part_percent,
-                T1.unit_conversion_ratio AS unit_conversion_ratio,
-                T1.part_attribute_enum AS part_attribute_enum,
-                T1.tho_part_attribute_enum AS tho_part_attribute_enum,
-                T1.skin_test_flag AS skin_test_flag,
-                T1.inject_flag AS inject_flag,
-                T1.ID AS advice_definition_id,
-                T1.NAME AS advice_name,
-                T1.bus_no AS advice_bus_no,
-                T1.py_str AS py_str,
-                T1.wb_str AS wb_str,
-                T1.yb_no AS yb_no,
-                T1.merchandise_name AS product_name,
-                0 AS activity_type,
-                T1.unit_code AS unit_code,
-                T1.min_unit_code AS min_unit_code,
-                T2.total_volume AS volume,
-                T2.method_code AS method_code,
-                T2.rate_code AS rate_code,
-                T2.org_id AS org_id,
-                T2.location_id AS location_id,
-                CAST(T2.dose AS TEXT) AS dose,
-                T2.dose_unit_code AS dose_unit_code,
-                T3.NAME AS supplier,
-                T3.id AS supplier_id,
-                T1.manufacturer_text AS manufacturer,
-                T5.id AS charge_item_definition_id,
-                T5.instance_table AS advice_table_name,
-                T6.def_location_id AS position_id,
-                t1.restricted_flag AS restricted_flag,
-                t1.restricted_scope AS restricted_scope
-                FROM med_medication_definition AS t1
-                INNER JOIN med_medication AS T2 ON T2.medication_def_id = T1.ID
-                AND T2.delete_flag = '0' AND T2.status_enum = #{statusEnum}
-                LEFT JOIN adm_supplier AS T3
-                ON T3.ID = T1.supply_id
-                AND T3.delete_flag = '0'
-                LEFT JOIN adm_charge_item_definition AS T5 ON T5.instance_id = T1.ID
-                AND T5.delete_flag = '0'
-                LEFT JOIN adm_organization_location AS T6
-                ON T6.distribution_category_code = T1.category_code
-                AND T6.delete_flag = '0' AND T6.organization_id = #{organizationId} AND
-                (CURRENT_TIME :: time (6) BETWEEN T6.start_time AND T6.end_time)
-                WHERE T1.delete_flag = '0'
-                AND T2.status_enum = #{statusEnum}
-                <if test="pricingFlag ==1">
-                    AND 1 = 2
-                </if>
-                <if test="adviceDefinitionIdParamList != null and !adviceDefinitionIdParamList.isEmpty()">
-                    AND T1.id IN
-                    <foreach collection="adviceDefinitionIdParamList" item="itemId" open="(" separator="," close=")">
-                        #{itemId}
-                    </foreach>
-                </if>
-                AND T5.instance_table = #{medicationTableName}
-                UNION ALL
-                SELECT T1.tenant_id,
-                2 AS advice_type,
-                T1.category_code AS category_code,
-                '' AS pharmacology_category_code,
-                T1.part_percent AS part_percent,
-                0 AS unit_conversion_ratio,
-                null AS part_attribute_enum,
-                null AS tho_part_attribute_enum,
-                null AS skin_test_flag,
-                null AS inject_flag,
-                T1.ID AS advice_definition_id,
-                T1.NAME AS advice_name,
-                T1.bus_no AS advice_bus_no,
-                T1.py_str AS py_str,
-                T1.wb_str AS wb_str,
-                T1.yb_no AS yb_no,
-                '' AS product_name,
-                0 AS activity_type,
-                T1.unit_code AS unit_code,
-                T1.min_unit_code AS min_unit_code,
-                T1.SIZE AS volume,
-                '' AS method_code,
-                '' AS rate_code,
-                T1.org_id AS org_id,
-                T1.location_id AS location_id,
-                '' AS dose,
-                '' AS dose_unit_code,
-                T2.NAME AS supplier,
-                T2.id AS supplier_id,
-                T1.manufacturer_text AS manufacturer,
-                T4.id AS charge_item_definition_id,
-                T4.instance_table AS advice_table_name,
-                T5.def_location_id AS position_id,
-                0 AS restricted_flag,
-                '' AS restricted_scope
-                FROM adm_device_definition AS T1
-                LEFT JOIN adm_supplier AS T2
-                ON T2.ID = T1.supply_id
-                AND T2.delete_flag = '0'
-                LEFT JOIN adm_charge_item_definition AS T4 ON T4.instance_id = T1.ID
-                AND T4.delete_flag = '0'
-                LEFT JOIN adm_organization_location AS T5 ON T5.distribution_category_code = T1.category_code
-                AND T5.delete_flag = '0' AND T5.organization_id = #{organizationId} AND
-                (CURRENT_TIME :: time (6) BETWEEN T5.start_time AND T5.end_time)
-                WHERE T1.delete_flag = '0'
-                <if test="adviceDefinitionIdParamList != null and !adviceDefinitionIdParamList.isEmpty()">
-                    AND T1.id IN
-                    <foreach collection="adviceDefinitionIdParamList" item="itemId" open="(" separator="," close=")">
-                        #{itemId}
-                    </foreach>
-                </if>
-                AND T4.instance_table = #{deviceTableName}
-                AND T1.category_code = #{singleUse}
-                AND T1.status_enum = #{statusEnum}
-                UNION ALL
-                SELECT T1.tenant_id,
-                3 AS advice_type,
-                T1.category_code AS category_code,
-                '' AS pharmacology_category_code,
-                1 AS part_percent,
-                0 AS unit_conversion_ratio,
-                null AS part_attribute_enum,
-                null AS tho_part_attribute_enum,
-                null AS skin_test_flag,
-                null AS inject_flag,
-                T1.ID AS advice_definition_id,
-                T1.NAME AS advice_name,
-                T1.bus_no AS advice_bus_no,
-                T1.py_str AS py_str,
-                T1.wb_str AS wb_str,
-                T1.yb_no AS yb_no,
-                '' AS product_name,
-                T1.type_enum AS activity_type,
-                '' AS unit_code,
-                '' AS min_unit_code,
-                '' AS volume,
-                '' AS method_code,
-                '' AS rate_code,
-                T1.org_id AS org_id,
-                T1.location_id AS location_id,
-                '' AS dose,
-                '' AS dose_unit_code,
-                '' AS supplier,
-                null AS supplier_id,
-                '' AS manufacturer,
-                T2.ID AS charge_item_definition_id,
-                T2.instance_table AS advice_table_name,
-                COALESCE(T3.organization_id, T1.org_id) AS position_id,
-                0 AS restricted_flag,
-                '' AS restricted_scope
-                FROM wor_activity_definition AS T1
-                LEFT JOIN adm_charge_item_definition AS T2
-                ON T2.instance_id = T1.ID
-                AND T2.delete_flag = '0'
-                LEFT JOIN adm_organization_location AS T3 ON T3.activity_definition_id = T1.ID
-                AND T3.delete_flag = '0' AND (CURRENT_TIME :: time (6) BETWEEN T3.start_time AND T3.end_time)
-                WHERE T1.delete_flag = '0'
-                <if test="pricingFlag ==1">
-                    AND T1.pricing_flag = #{pricingFlag}
-                </if>
-                <if test="adviceDefinitionIdParamList != null and !adviceDefinitionIdParamList.isEmpty()">
-                    AND T1.id IN
-                    <foreach collection="adviceDefinitionIdParamList" item="itemId" open="(" separator="," close=")">
-                        #{itemId}
-                    </foreach>
-                </if>
-                AND T1.status_enum = #{statusEnum}
-                AND T2.instance_table = #{activityTableName}
-            </when>
-            <otherwise>
-                <!-- 当adviceTypes不为null且不为空，且只包含1、2、3时，根据选中的类型查询 -->
-                <!-- 确保至少有一个类型被选中，避免空查询 -->
-                <if test="adviceTypes.contains(1) or adviceTypes.contains(2) or adviceTypes.contains(3)">
-                    <if test="adviceTypes.contains(1)">
-                        SELECT T1.tenant_id,
-                        1 AS advice_type,
-                        T1.category_code AS category_code,
-                        T1.pharmacology_category_code AS pharmacology_category_code,
-                        T1.part_percent AS part_percent,
-                        T1.unit_conversion_ratio AS unit_conversion_ratio,
-                        T1.part_attribute_enum AS part_attribute_enum,
-                        T1.tho_part_attribute_enum AS tho_part_attribute_enum,
-                        T1.skin_test_flag AS skin_test_flag,
-                        T1.inject_flag AS inject_flag,
-                        T1.ID AS advice_definition_id,
-                        T1.NAME AS advice_name,
-                        T1.bus_no AS advice_bus_no,
-                        T1.py_str AS py_str,
-                        T1.wb_str AS wb_str,
-                        T1.yb_no AS yb_no,
-                        T1.merchandise_name AS product_name,
-                        0 AS activity_type,
-                        T1.unit_code AS unit_code,
-                        T1.min_unit_code AS min_unit_code,
-                        T2.total_volume AS volume,
-                        T2.method_code AS method_code,
-                        T2.rate_code AS rate_code,
-                        T2.org_id AS org_id,
-                        T2.location_id AS location_id,
-                        CAST(T2.dose AS TEXT) AS dose,
-                        T2.dose_unit_code AS dose_unit_code,
-                        T3.NAME AS supplier,
-                        T3.id AS supplier_id,
-                        T1.manufacturer_text AS manufacturer,
-                        T5.id AS charge_item_definition_id,
-                        T5.instance_table AS advice_table_name,
-                        T6.def_location_id AS position_id,
-                        t1.restricted_flag AS restricted_flag,
-                        t1.restricted_scope AS restricted_scope
-                        FROM med_medication_definition AS t1
-                        INNER JOIN med_medication AS T2 ON T2.medication_def_id = T1.ID
-                        AND T2.delete_flag = '0' AND T2.status_enum = #{statusEnum}
-                        LEFT JOIN adm_supplier AS T3
-                        ON T3.ID = T1.supply_id
-                        AND T3.delete_flag = '0'
-                        LEFT JOIN adm_charge_item_definition AS T5 ON T5.instance_id = T1.ID
-                        AND T5.delete_flag = '0'
-                        LEFT JOIN adm_organization_location AS T6
-                        ON T6.distribution_category_code = T1.category_code
-                        AND T6.delete_flag = '0' AND T6.organization_id = #{organizationId} AND
-                        (CURRENT_TIME :: time (6) BETWEEN T6.start_time AND T6.end_time)
-                        WHERE T1.delete_flag = '0'
-                        AND T2.status_enum = #{statusEnum}
-                        <if test="pricingFlag ==1">
-                            AND 1 = 2
-                        </if>
-                        <if test="adviceDefinitionIdParamList != null and !adviceDefinitionIdParamList.isEmpty()">
-                            AND T1.id IN
-                            <foreach collection="adviceDefinitionIdParamList" item="itemId" open="(" separator="," close=")">
-                                #{itemId}
-                            </foreach>
-                        </if>
-                        AND T5.instance_table = #{medicationTableName}
-                    </if>
-
-                    <if test="adviceTypes.contains(1) and (adviceTypes.contains(2) or adviceTypes.contains(3))">UNION ALL</if>
-
-                    <if test="adviceTypes.contains(2)">
-                        SELECT T1.tenant_id,
-                        2 AS advice_type,
-                        T1.category_code AS category_code,
-                        '' AS pharmacology_category_code,
-                        T1.part_percent AS part_percent,
-                        0 AS unit_conversion_ratio,
-                        null AS part_attribute_enum,
-                        null AS tho_part_attribute_enum,
-                        null AS skin_test_flag,
-                        null AS inject_flag,
-                        T1.ID AS advice_definition_id,
-                        T1.NAME AS advice_name,
-                        T1.bus_no AS advice_bus_no,
-                        T1.py_str AS py_str,
-                        T1.wb_str AS wb_str,
-                        T1.yb_no AS yb_no,
-                        '' AS product_name,
-                        0 AS activity_type,
-                        T1.unit_code AS unit_code,
-                        T1.min_unit_code AS min_unit_code,
-                        T1.SIZE AS volume,
-                        '' AS method_code,
-                        '' AS rate_code,
-                        T1.org_id AS org_id,
-                        T1.location_id AS location_id,
-                        '' AS dose,
-                        '' AS dose_unit_code,
-                        T2.NAME AS supplier,
-                        T2.id AS supplier_id,
-                        T1.manufacturer_text AS manufacturer,
-                        T4.id AS charge_item_definition_id,
-                        T4.instance_table AS advice_table_name,
-                        T5.def_location_id AS position_id,
-                        0 AS restricted_flag,
-                        '' AS restricted_scope
-                        FROM adm_device_definition AS T1
-                        LEFT JOIN adm_supplier AS T2
-                        ON T2.ID = T1.supply_id
-                        AND T2.delete_flag = '0'
-                        LEFT JOIN adm_charge_item_definition AS T4 ON T4.instance_id = T1.ID
-                        AND T4.delete_flag = '0'
-                        LEFT JOIN adm_organization_location AS T5 ON T5.distribution_category_code = T1.category_code
-                        AND T5.delete_flag = '0' AND T5.organization_id = #{organizationId} AND
-                        (CURRENT_TIME :: time (6) BETWEEN T5.start_time AND T5.end_time)
-                        WHERE T1.delete_flag = '0'
-                        <if test="adviceDefinitionIdParamList != null and !adviceDefinitionIdParamList.isEmpty()">
-                            AND T1.id IN
-                            <foreach collection="adviceDefinitionIdParamList" item="itemId" open="(" separator="," close=")">
-                                #{itemId}
-                            </foreach>
-                        </if>
-                        AND T4.instance_table = #{deviceTableName}
-                        AND T1.category_code = #{singleUse}
-                        AND T1.status_enum = #{statusEnum}
-                    </if>
-
-                    <if test="adviceTypes.contains(2) and adviceTypes.contains(3)">UNION ALL</if>
-
-                    <if test="adviceTypes.contains(3)">
-                        SELECT T1.tenant_id,
-                        3 AS advice_type,
-                        T1.category_code AS category_code,
-                        '' AS pharmacology_category_code,
-                        1 AS part_percent,
-                        0 AS unit_conversion_ratio,
-                        null AS part_attribute_enum,
-                        null AS tho_part_attribute_enum,
-                        null AS skin_test_flag,
-                        null AS inject_flag,
-                        T1.ID AS advice_definition_id,
-                        T1.NAME AS advice_name,
-                        T1.bus_no AS advice_bus_no,
-                        T1.py_str AS py_str,
-                        T1.wb_str AS wb_str,
-                        T1.yb_no AS yb_no,
-                        '' AS product_name,
-                        T1.type_enum AS activity_type,
-                        '' AS unit_code,
-                        '' AS min_unit_code,
-                        '' AS volume,
-                        '' AS method_code,
-                        '' AS rate_code,
-                        T1.org_id AS org_id,
-                        T1.location_id AS location_id,
-                        '' AS dose,
-                        '' AS dose_unit_code,
-                        '' AS supplier,
-                        null AS supplier_id,
-                        '' AS manufacturer,
-                        T2.ID AS charge_item_definition_id,
-                        T2.instance_table AS advice_table_name,
-                        COALESCE(T3.organization_id, T1.org_id) AS position_id,
-                        0 AS restricted_flag,
-                        '' AS restricted_scope
-                        FROM wor_activity_definition AS T1
-                        LEFT JOIN adm_charge_item_definition AS T2
-                        ON T2.instance_id = T1.ID
-                        AND T2.delete_flag = '0'
-                        LEFT JOIN adm_organization_location AS T3 ON T3.activity_definition_id = T1.ID
-                        AND T3.delete_flag = '0' AND (CURRENT_TIME :: time (6) BETWEEN T3.start_time AND T3.end_time)
-                        WHERE T1.delete_flag = '0'
-                        <if test="pricingFlag ==1">
-                            AND T1.pricing_flag = #{pricingFlag}
-                        </if>
-                        <if test="adviceDefinitionIdParamList != null and !adviceDefinitionIdParamList.isEmpty()">
-                            AND T1.id IN
-                            <foreach collection="adviceDefinitionIdParamList" item="itemId" open="(" separator="," close=")">
-                                #{itemId}
-                            </foreach>
-                        </if>
-                        AND T1.status_enum = #{statusEnum}
-                        AND T2.instance_table = #{activityTableName}
-                    </if>
-                </if>
-            </otherwise>
-        </choose>
-=======
         <if test="adviceTypes == null or adviceTypes.contains(1)">
             (SELECT
             DISTINCT ON (T1.ID)
@@ -603,7 +241,6 @@
             AND T2.instance_table = #{activityTableName}
             )
         </if>
->>>>>>> upstream/develop
         ) AS abi
         ${ew.customSqlSegment}
     </select>
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/InventoryProductReportMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/InventoryProductReportMapper.xml
index b259f5bd..492d07d0 100644
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/InventoryProductReportMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/InventoryProductReportMapper.xml
@@ -4,159 +4,6 @@
 
     <select id="selectProductReportPage"
             resultType="com.openhis.web.reportmanage.dto.InventoryProductReportPageDto">
-<<<<<<< HEAD
-        SELECT *
-        FROM (
-               SELECT T8.id,                                                --ID
-               T8.bus_no,                                            --药品编码
-               T8.name,                                              --药品名称
-               T8.lot_number,                                        --批次号
-               T8.manufacturer_text,                                 --厂家
-               T8.item_table,                                        --药品类型
-               T8.item_quantity,                                     --库存数量
-               T8.unit_code,                                         --计量单位
-               T8.min_package_quantity,                              --小包装库存数
-               T8.min_package_unit,                                  --小包装单位
-               T8.price,                                             --进价
-               T8.sale_price,                                        --售价
-               T8.price * T8.part_percent       AS part_price,       --拆零进价
-               T8.sale_price * T8.part_percent  AS part_sale_price,  --拆零售价
-               T8.price * T8.item_quantity      AS total_price,      --进价金额（总价）
-               T8.sale_price * T8.item_quantity AS total_sale_price, --售价金额（总价）
-               T8.purpose_type_enum,                                 --仓库类型
-               T8.location_name,                                     --仓库名称
-               T8.location_store_name,                               --货位名称
-               T8.purpose_location_id,                               --仓库ID
-               T8.expiration_date,                                   --有效期
-               T8.yb_no,                                              --医保编码
-               T8.tenant_id,               -- 租户ID
-               CAST(T8.item_table AS INTEGER) AS category_type          -- 项目类型（按分类编码，整型）
-        FROM (SELECT T1.id,                                                 --ID
-                     T2.bus_no,                                             --药品编码
-                     T2.name,                                               --药品名称
-                     T1.lot_number,                                         --批次号
-                     T2.manufacturer_text,                                  --厂家
-                     T2.category_code              AS item_table,           --药品类型
-                     T1.quantity AS item_quantity,                          --库存数量
-                     T2.unit_code,                                          --计量单位
-                     T1.quantity                   AS min_package_quantity, --小包装库存数
-                     T2.min_unit_code              AS min_package_unit,     --小包装单位
-                     T1.price,                                              --进价
-                     CASE
-                         WHEN T4.condition_code = #{lotNumber}
-                             AND T4.condition_value = T1.lot_number
-                             THEN T4.amount
-                         ELSE T3.price END         AS sale_price,           --售价
-                     T2.part_percent,                                       --拆零比
-                     T6.form_enum AS purpose_type_enum,                     --仓库类型
-                     T6.name                       AS location_name,        --仓库名称
-                     T7.name                       AS location_store_name,  --货位名称
-                     T1.location_id                AS purpose_location_id,  --仓库ID
-                     T1.expiration_date,                                    --有效期
-                     T2.yb_no,                                               --医保编码
-                     T1.tenant_id                -- 租户ID
-              FROM wor_inventory_item AS T1
-                       INNER JOIN med_medication_definition AS T2
-                                  ON T2.id = T1.item_id
-                                      AND T2.delete_flag = '0'
-                       INNER JOIN adm_charge_item_definition AS T3
-                                  ON T3.instance_id = T2.id
-                                      AND T3.delete_flag = '0'
-                       LEFT JOIN adm_charge_item_def_detail AS T4
-                                 ON T4.definition_id = T3.id
-                                     AND T4.delete_flag = '0'
-                       LEFT JOIN adm_location T6
-                                 ON T1.location_id = T6.id
-                                     AND T6.delete_flag = '0'
-                       LEFT JOIN adm_location T7
-                                 ON T1.location_store_id = T7.id
-                                     AND T7.delete_flag = '0'
-              WHERE T1.delete_flag = '0') AS T8
-        UNION
-        SELECT T10.id,                                                 --ID
-               T10.bus_no,                                             --器材编码
-               T10.name,                                               --器材名称
-               T10.lot_number,                                         --批次号
-               T10.manufacturer_text,                                  --厂家
-               T10.item_table,                                         --器材类型
-               T10.item_quantity,                                      --库存数量
-               T10.unit_code,                                          --计量单位
-               T10.min_package_quantity,                               --小包装库存数
-               T10.min_package_unit,                                   --小包装单位
-               T10.price,                                              --进价
-               T10.sale_price,                                         --售价
-               T10.price * T10.part_percent       AS part_price,       --拆零进价
-               T10.sale_price * T10.part_percent  AS part_sale_price,  --拆零售价
-               T10.price * T10.item_quantity      AS total_price,      --进价金额（总价）
-               T10.sale_price * T10.item_quantity AS total_sale_price, --售价金额（总价）
-               T10.purpose_type_enum,                                  --仓库类型
-               T10.location_name,                                      --仓库名称
-               T10.location_store_name,                                --货位名称
-               T10.purpose_location_id,                                --仓库ID
-               T10.expiration_date,                                    --有效期
-               T10.yb_no,                                               --医保编码
-               T10.tenant_id,               -- 租户ID
-               CAST(T10.item_table AS INTEGER) AS category_type           -- 项目类型（按分类编码，整型）
-        FROM (SELECT T1.id,                                                 --ID
-                     T9.bus_no,                                           --药品编码
-                     T9.name,                                               --药品名称
-                     T1.lot_number,                                         --批次号
-                     T9.manufacturer_text,                                  --厂家
-                     T9.category_code              AS item_table,           --药品类型
-                     T1.quantity AS item_quantity,                         --库存数量
-                     T9.unit_code,                                          --计量单位
-                     T1.quantity                   AS min_package_quantity, --小包装库存数
-                     T9.min_unit_code              AS min_package_unit,     --小包装单位
-                     T1.price,                                              --进价
-                     CASE
-                         WHEN T4.condition_code = #{lotNumber}
-                             AND T4.condition_value = T1.lot_number
-                             THEN T4.amount
-                         ELSE T3.price END         AS sale_price,           --售价
-                     T9.part_percent,                                       --拆零比
-                     T6.form_enum AS purpose_type_enum,                     --仓库类型
-                     T6.name                       AS location_name,        --仓库名称
-                     T7.name                       AS location_store_name,  --货位名称
-                     T1.location_id                AS purpose_location_id,  --仓库ID
-                     T1.expiration_date,                                    --有效期
-                     T9.yb_no,                                               --医保编码
-                     T1.tenant_id                -- 租户ID
-              FROM wor_inventory_item AS T1
-                       INNER JOIN adm_device_definition AS T9
-                                  ON T9.id = T1.item_id
-                                      AND T9.delete_flag = '0'
-                       INNER JOIN adm_charge_item_definition AS T3
-                                  ON T3.instance_id = T9.id
-                                      AND T3.delete_flag = '0'
-                       LEFT JOIN adm_charge_item_def_detail AS T4
-                                 ON T4.definition_id = T3.id
-                                     AND T4.delete_flag = '0'
-                       LEFT JOIN adm_location T6
-                                 ON T1.location_id = T6.id
-                                     AND T6.delete_flag = '0'
-                       LEFT JOIN adm_location T7
-                                 ON T1.location_store_id = T7.id
-                                     AND T7.delete_flag = '0'
-             WHERE T1.delete_flag = '0') AS T10
-            ) AS T
-            ${ew.customSqlSegment}
-            <if test="inventoryScope != null">
-                <choose>
-                    <when test="inventoryScope == 2">
-                        AND item_quantity = 0
-                    </when>
-                    <when test="inventoryScope == 3">
-                        AND item_quantity > 0
-                    </when>
-                    <when test="inventoryScope == 4">
-                        AND item_quantity <![CDATA[ <= ]]> 20
-                    </when>
-                    <when test="inventoryScope == 5">
-                        AND item_quantity <![CDATA[ <= ]]> 50
-                    </when>
-                </choose>
-            </if>
-=======
 --         SELECT T8.id,                                                --ID
 --                T8.bus_no,                                            --药品编码
 --                T8.name,                                              --药品名称
@@ -282,6 +129,5 @@
 --                                      AND T7.delete_flag = '0'
 --               WHERE T1.delete_flag = '0') AS T10
 --             ${ew.customSqlSegment}
->>>>>>> upstream/develop
     </select>
 </mapper>
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentReconciliation.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentReconciliation.java
index 847f20d2..16fb5d2e 100644
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentReconciliation.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentReconciliation.java
@@ -102,13 +102,10 @@ public class PaymentReconciliation extends HisBaseEntity {
     private String ybSettleIds;// 记录医保结算id
 
     /** 医保清算标志 */
-<<<<<<< HEAD
     private Integer ybClearFlag;//默认值0 未清算
 
     /** 退号/退费原因 */
     @TableField("refund_reason")
     private String refundReason;
-=======
-    private Integer ybClearFlag;// 默认值0 未清算
->>>>>>> upstream/develop
+    
 }
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/OrganizationMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/OrganizationMapper.xml
index 658afa70..a40d0260 100644
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/OrganizationMapper.xml
+++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/OrganizationMapper.xml
@@ -3,19 +3,6 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.openhis.administration.mapper.OrganizationMapper">
-<<<<<<< HEAD
-    
-    <!-- 自定义selectById方法，确保包含所有字段，包括新增字段 -->
-    <select id="selectById" parameterType="java.lang.Long" resultType="com.openhis.administration.domain.Organization">
-        SELECT id, bus_no, name, active_flag, type_enum, class_enum, py_str, wb_str, 
-               yb_no, yb_name, caty, display_order, medins_id, medins_admdvs, 
-               medins_type, medins_lv, def_doctor_id, create_by, create_time, 
-               update_by, update_time, tenant_id, delete_flag,
-               register_flag, location, intro, remark 
-        FROM adm_organization 
-        WHERE id = #{id} AND delete_flag = '0'
-    </select>
-=======
 
     <select id="searchOrgDataByHealth" resultType="com.openhis.administration.dto.OrgDataDto">
         SELECT org.id AS orgId, org.name AS orgName
@@ -27,5 +14,4 @@
                GROUP BY heal.offered_org_id)
     </select>
 
->>>>>>> upstream/develop
 </mapper>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionMedicineList.vue b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionMedicineList.vue
index 4775e4a8..81e9c968 100644
--- a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionMedicineList.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionMedicineList.vue
@@ -15,7 +15,6 @@
       <el-table-column label="规格" align="center" prop="volume" /> -->
       <!-- <el-table-column label="用法" align="center" prop="methodCode_dictText" />
       <el-table-column label="单次剂量" align="center" prop="dose" />
-<<<<<<< HEAD
       <el-table-column
         label="剂量单位"
         align="center"
diff --git a/迁移记录-DB变更记录/202509081020add_table_tmp_orders_group_package.sql b/迁移记录-DB变更记录/202509081020add_table_tmp_orders_group_package.sql
index 0a25302b..4d94e7d9 100644
--- a/迁移记录-DB变更记录/202509081020add_table_tmp_orders_group_package.sql
+++ b/迁移记录-DB变更记录/202509081020add_table_tmp_orders_group_package.sql
@@ -7,7 +7,7 @@
 		CACHE 1;
 
 
-CREATE TABLE "public"."tmp_orders_group_package" (
+CREATE TABLE "tmp_orders_group_package" (
   "id" int8 NOT NULL DEFAULT nextval('tmp_orders_group_package_id_seq'::regclass),
   "name" varchar(255) COLLATE "pg_catalog"."default" DEFAULT ''::character varying,
   "package_type_enum" int4 NOT NULL,
@@ -23,32 +23,32 @@ CREATE TABLE "public"."tmp_orders_group_package" (
 )
 ;
 
-ALTER TABLE "public"."tmp_orders_group_package" 
+ALTER TABLE "tmp_orders_group_package" 
   OWNER TO "postgres";
 
-COMMENT ON COLUMN "public"."tmp_orders_group_package"."id" IS 'ID';
+COMMENT ON COLUMN "tmp_orders_group_package"."id" IS 'ID';
 
-COMMENT ON COLUMN "public"."tmp_orders_group_package"."name" IS '名称';
+COMMENT ON COLUMN "tmp_orders_group_package"."name" IS '名称';
 
-COMMENT ON COLUMN "public"."tmp_orders_group_package"."package_type_enum" IS '组套包类型';
+COMMENT ON COLUMN "tmp_orders_group_package"."package_type_enum" IS '组套包类型';
 
-COMMENT ON COLUMN "public"."tmp_orders_group_package"."organization_id" IS '科室id';
+COMMENT ON COLUMN "tmp_orders_group_package"."organization_id" IS '科室id';
 
-COMMENT ON COLUMN "public"."tmp_orders_group_package"."practitioner_id" IS '参与者id';
+COMMENT ON COLUMN "tmp_orders_group_package"."practitioner_id" IS '参与者id';
 
-COMMENT ON COLUMN "public"."tmp_orders_group_package"."tenant_id" IS '租户ID';
+COMMENT ON COLUMN "tmp_orders_group_package"."tenant_id" IS '租户ID';
 
-COMMENT ON COLUMN "public"."tmp_orders_group_package"."delete_flag" IS '删除状态';
+COMMENT ON COLUMN "tmp_orders_group_package"."delete_flag" IS '删除状态';
 
-COMMENT ON COLUMN "public"."tmp_orders_group_package"."create_by" IS '创建人';
+COMMENT ON COLUMN "tmp_orders_group_package"."create_by" IS '创建人';
 
-COMMENT ON COLUMN "public"."tmp_orders_group_package"."create_time" IS '创建时间';
+COMMENT ON COLUMN "tmp_orders_group_package"."create_time" IS '创建时间';
 
-COMMENT ON COLUMN "public"."tmp_orders_group_package"."update_by" IS '更新人';
+COMMENT ON COLUMN "tmp_orders_group_package"."update_by" IS '更新人';
 
-COMMENT ON COLUMN "public"."tmp_orders_group_package"."update_time" IS '更新时间';
+COMMENT ON COLUMN "tmp_orders_group_package"."update_time" IS '更新时间';
 
-COMMENT ON TABLE "public"."tmp_orders_group_package" IS '医嘱组合套餐';	
+COMMENT ON TABLE "tmp_orders_group_package" IS '医嘱组合套餐';	
 
 -- 插入添加临时订单分组包表的迁移记录
 INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
diff --git a/迁移记录-DB变更记录/202509081022add_table_tmp_orders_group_package_detail.sql b/迁移记录-DB变更记录/202509081022add_table_tmp_orders_group_package_detail.sql
index e46e460f..7691a876 100644
--- a/迁移记录-DB变更记录/202509081022add_table_tmp_orders_group_package_detail.sql
+++ b/迁移记录-DB变更记录/202509081022add_table_tmp_orders_group_package_detail.sql
@@ -7,7 +7,7 @@
 		CACHE 1;
 
 
-CREATE TABLE "public"."tmp_orders_group_package_detail" (
+CREATE TABLE "tmp_orders_group_package_detail" (
   "id" int8 NOT NULL DEFAULT nextval('tmp_orders_group_package_detail_id_seq'::regclass),
   "group_package_id" int8 NOT NULL,
   "order_definition_id" int8 NOT NULL,
@@ -24,34 +24,34 @@ CREATE TABLE "public"."tmp_orders_group_package_detail" (
 )
 ;
 
-ALTER TABLE "public"."tmp_orders_group_package_detail" 
+ALTER TABLE "tmp_orders_group_package_detail" 
   OWNER TO "postgres";
 
-COMMENT ON COLUMN "public"."tmp_orders_group_package_detail"."id" IS 'ID';
+COMMENT ON COLUMN "tmp_orders_group_package_detail"."id" IS 'ID';
 
-COMMENT ON COLUMN "public"."tmp_orders_group_package_detail"."group_package_id" IS '组合套餐id';
+COMMENT ON COLUMN "tmp_orders_group_package_detail"."group_package_id" IS '组合套餐id';
 
-COMMENT ON COLUMN "public"."tmp_orders_group_package_detail"."order_definition_id" IS '医嘱定义id';
+COMMENT ON COLUMN "tmp_orders_group_package_detail"."order_definition_id" IS '医嘱定义id';
 
-COMMENT ON COLUMN "public"."tmp_orders_group_package_detail"."order_definition_table" IS '医嘱定义表名';
+COMMENT ON COLUMN "tmp_orders_group_package_detail"."order_definition_table" IS '医嘱定义表名';
 
-COMMENT ON COLUMN "public"."tmp_orders_group_package_detail"."quantity" IS '数量';
+COMMENT ON COLUMN "tmp_orders_group_package_detail"."quantity" IS '数量';
 
-COMMENT ON COLUMN "public"."tmp_orders_group_package_detail"."unit_code" IS '单位编码';
+COMMENT ON COLUMN "tmp_orders_group_package_detail"."unit_code" IS '单位编码';
 
-COMMENT ON COLUMN "public"."tmp_orders_group_package_detail"."tenant_id" IS '租户ID';
+COMMENT ON COLUMN "tmp_orders_group_package_detail"."tenant_id" IS '租户ID';
 
-COMMENT ON COLUMN "public"."tmp_orders_group_package_detail"."delete_flag" IS '删除状态';
+COMMENT ON COLUMN "tmp_orders_group_package_detail"."delete_flag" IS '删除状态';
 
-COMMENT ON COLUMN "public"."tmp_orders_group_package_detail"."create_by" IS '创建人';
+COMMENT ON COLUMN "tmp_orders_group_package_detail"."create_by" IS '创建人';
 
-COMMENT ON COLUMN "public"."tmp_orders_group_package_detail"."create_time" IS '创建时间';
+COMMENT ON COLUMN "tmp_orders_group_package_detail"."create_time" IS '创建时间';
 
-COMMENT ON COLUMN "public"."tmp_orders_group_package_detail"."update_by" IS '更新人';
+COMMENT ON COLUMN "tmp_orders_group_package_detail"."update_by" IS '更新人';
 
-COMMENT ON COLUMN "public"."tmp_orders_group_package_detail"."update_time" IS '更新时间';
+COMMENT ON COLUMN "tmp_orders_group_package_detail"."update_time" IS '更新时间';
 
-COMMENT ON TABLE "public"."tmp_orders_group_package_detail" IS '医嘱组合套餐明细';	
+COMMENT ON TABLE "tmp_orders_group_package_detail" IS '医嘱组合套餐明细';	
 
 -- 插入添加临时订单分组包详情表的迁移记录
 INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
diff --git a/迁移记录-DB变更记录/202509101025add_column_adm_practitioner.sql b/迁移记录-DB变更记录/202509101025add_column_adm_practitioner.sql
index c4275494..38de83b0 100644
--- a/迁移记录-DB变更记录/202509101025add_column_adm_practitioner.sql
+++ b/迁移记录-DB变更记录/202509101025add_column_adm_practitioner.sql
@@ -1,6 +1,6 @@
-   ALTER TABLE "public"."adm_practitioner" 
+   ALTER TABLE "adm_practitioner" 
    ADD COLUMN "signature" text COLLATE "pg_catalog"."default" DEFAULT ''::character varying;
-   COMMENT ON COLUMN "public"."adm_practitioner"."signature" IS '签名图片';
+   COMMENT ON COLUMN "adm_practitioner"."signature" IS '签名图片';
    
    -- 插入为adm_practitioner表添加列的迁移记录
 INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
diff --git a/迁移记录-DB变更记录/202509101030add_column_wor_service_request.sql b/迁移记录-DB变更记录/202509101030add_column_wor_service_request.sql
index f66513b3..08dcfd9e 100644
--- a/迁移记录-DB变更记录/202509101030add_column_wor_service_request.sql
+++ b/迁移记录-DB变更记录/202509101030add_column_wor_service_request.sql
@@ -1,7 +1,7 @@
 
-   ALTER TABLE "public"."wor_service_request" 
+   ALTER TABLE "wor_service_request" 
    ADD COLUMN "parent_id" int8  DEFAULT NULL;
-   COMMENT ON COLUMN "public"."wor_service_request"."parent_id" IS '父id(适用诊疗套餐)';
+   COMMENT ON COLUMN "wor_service_request"."parent_id" IS '父id(适用诊疗套餐)';
    
    -- 插入为wor_service_request表添加列的迁移记录
 INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
diff --git a/迁移记录-DB变更记录/202509161311 add_column_cli_reservation_record.sql b/迁移记录-DB变更记录/202509161311 add_column_cli_reservation_record.sql
index 280f35e9..87142f40 100644
--- a/迁移记录-DB变更记录/202509161311 add_column_cli_reservation_record.sql	
+++ b/迁移记录-DB变更记录/202509161311 add_column_cli_reservation_record.sql	
@@ -1,7 +1,7 @@
 
-    ALTER TABLE "public"."cli_reservation_record" 
+    ALTER TABLE "cli_reservation_record" 
    ADD COLUMN "tooth_position" varchar(500) COLLATE "pg_catalog"."default" DEFAULT ''::character varying;
-   COMMENT ON COLUMN "public"."cli_reservation_record"."tooth_position" IS '牙位';
+   COMMENT ON COLUMN "cli_reservation_record"."tooth_position" IS '牙位';
 
    -- 插入为cli_reservation_record表添加列的迁移记录
 INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
diff --git a/迁移记录-DB变更记录/202509191411 add_column_tmp_activity_device.sql b/迁移记录-DB变更记录/202509191411 add_column_tmp_activity_device.sql
index 053b1600..de518efb 100644
--- a/迁移记录-DB变更记录/202509191411 add_column_tmp_activity_device.sql	
+++ b/迁移记录-DB变更记录/202509191411 add_column_tmp_activity_device.sql	
@@ -1,6 +1,6 @@
-   ALTER TABLE "public"."tmp_activity_device" 
+   ALTER TABLE "tmp_activity_device" 
    ADD COLUMN "unit_code" varchar(3) COLLATE "pg_catalog"."default" DEFAULT ''::character varying;
-   COMMENT ON COLUMN "public"."tmp_activity_device"."unit_code" IS '单位';
+   COMMENT ON COLUMN "tmp_activity_device"."unit_code" IS '单位';
 
    -- 插入为tmp_activity_device表添加列的迁移记录
 INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
diff --git a/迁移记录-DB变更记录/202509231011 add_table_nd_review_prescription_records.sql b/迁移记录-DB变更记录/202509231011 add_table_nd_review_prescription_records.sql
index 49f5c2bc..cfc879ee 100644
--- a/迁移记录-DB变更记录/202509231011 add_table_nd_review_prescription_records.sql	
+++ b/迁移记录-DB变更记录/202509231011 add_table_nd_review_prescription_records.sql	
@@ -9,7 +9,7 @@
 		CACHE 1;
 
 
-CREATE TABLE "public"."nd_review_prescription_records" (
+CREATE TABLE "nd_review_prescription_records" (
   "id" int8 NOT NULL DEFAULT nextval('nd_review_prescription_records_id_seq'::regclass),
   "prescription_no" varchar(255) COLLATE "pg_catalog"."default" DEFAULT ''::character varying,
   "encounter_id" int8 DEFAULT NULL,
@@ -27,36 +27,36 @@ CREATE TABLE "public"."nd_review_prescription_records" (
 )
 ;
 
-ALTER TABLE "public"."nd_review_prescription_records" 
+ALTER TABLE "nd_review_prescription_records" 
   OWNER TO "postgres";
 
-COMMENT ON COLUMN "public"."nd_review_prescription_records"."id" IS 'ID';
+COMMENT ON COLUMN "nd_review_prescription_records"."id" IS 'ID';
 
-COMMENT ON COLUMN "public"."nd_review_prescription_records"."prescription_no" IS '处方号';
+COMMENT ON COLUMN "nd_review_prescription_records"."prescription_no" IS '处方号';
 
-COMMENT ON COLUMN "public"."nd_review_prescription_records"."encounter_id" IS '就诊id';
+COMMENT ON COLUMN "nd_review_prescription_records"."encounter_id" IS '就诊id';
 
-COMMENT ON COLUMN "public"."nd_review_prescription_records"."med_request_ids" IS '药品请求ids';
+COMMENT ON COLUMN "nd_review_prescription_records"."med_request_ids" IS '药品请求ids';
 
-COMMENT ON COLUMN "public"."nd_review_prescription_records"."pass_flag" IS '通过标识';
+COMMENT ON COLUMN "nd_review_prescription_records"."pass_flag" IS '通过标识';
 
-COMMENT ON COLUMN "public"."nd_review_prescription_records"."reason_text" IS '原因';
+COMMENT ON COLUMN "nd_review_prescription_records"."reason_text" IS '原因';
 
-COMMENT ON COLUMN "public"."nd_review_prescription_records"."practitioner_id" IS '审方人id';
+COMMENT ON COLUMN "nd_review_prescription_records"."practitioner_id" IS '审方人id';
 
-COMMENT ON COLUMN "public"."nd_review_prescription_records"."tenant_id" IS '租户ID';
+COMMENT ON COLUMN "nd_review_prescription_records"."tenant_id" IS '租户ID';
 
-COMMENT ON COLUMN "public"."nd_review_prescription_records"."delete_flag" IS '删除状态';
+COMMENT ON COLUMN "nd_review_prescription_records"."delete_flag" IS '删除状态';
 
-COMMENT ON COLUMN "public"."nd_review_prescription_records"."create_by" IS '创建人';
+COMMENT ON COLUMN "nd_review_prescription_records"."create_by" IS '创建人';
 
-COMMENT ON COLUMN "public"."nd_review_prescription_records"."create_time" IS '创建时间';
+COMMENT ON COLUMN "nd_review_prescription_records"."create_time" IS '创建时间';
 
-COMMENT ON COLUMN "public"."nd_review_prescription_records"."update_by" IS '更新人';
+COMMENT ON COLUMN "nd_review_prescription_records"."update_by" IS '更新人';
 
-COMMENT ON COLUMN "public"."nd_review_prescription_records"."update_time" IS '更新时间';
+COMMENT ON COLUMN "nd_review_prescription_records"."update_time" IS '更新时间';
 
-COMMENT ON TABLE "public"."nd_review_prescription_records" IS '农大审方记录';	
+COMMENT ON TABLE "nd_review_prescription_records" IS '农大审方记录';	
 
 
 
diff --git a/迁移记录-DB变更记录/202509261212 add_column _doc_statistics_definition.sql b/迁移记录-DB变更记录/202509261212 add_column _doc_statistics_definition.sql
index 1cab1228..39d5a29e 100644
--- a/迁移记录-DB变更记录/202509261212 add_column _doc_statistics_definition.sql	
+++ b/迁移记录-DB变更记录/202509261212 add_column _doc_statistics_definition.sql	
@@ -1,10 +1,10 @@
-ALTER TABLE "public"."doc_statistics_definition" 
+ALTER TABLE "doc_statistics_definition" 
   ADD COLUMN "dict_name" varchar(50),
   ADD COLUMN "dict_type" varchar(50);
 
-COMMENT ON COLUMN "public"."doc_statistics_definition"."dict_name" IS '字典名称';
+COMMENT ON COLUMN "doc_statistics_definition"."dict_name" IS '字典名称';
 
-COMMENT ON COLUMN "public"."doc_statistics_definition"."dict_type" IS '字典类型';
+COMMENT ON COLUMN "doc_statistics_definition"."dict_type" IS '字典类型';
 
 
 
diff --git a/迁移记录-DB变更记录/202510131311 add_column_elep_medication_request.sql b/迁移记录-DB变更记录/202510131311 add_column_elep_medication_request.sql
index dc8b641d..d0718314 100644
--- a/迁移记录-DB变更记录/202510131311 add_column_elep_medication_request.sql	
+++ b/迁移记录-DB变更记录/202510131311 add_column_elep_medication_request.sql	
@@ -1,10 +1,10 @@
-ALTER TABLE "public"."elep_medication_request" 
+ALTER TABLE "elep_medication_request" 
   ADD COLUMN "condition_def_id" int8,
   ADD COLUMN "opsp_dise_code" varchar(255);
 
-COMMENT ON COLUMN "public"."elep_medication_request"."condition_def_id" IS '诊断定义id';
+COMMENT ON COLUMN "elep_medication_request"."condition_def_id" IS '诊断定义id';
 
-COMMENT ON COLUMN "public"."elep_medication_request"."opsp_dise_code" IS '慢病编码';
+COMMENT ON COLUMN "elep_medication_request"."opsp_dise_code" IS '慢病编码';
 
 
    -- 插入为tmp_activity_device表添加列的迁移记录
diff --git a/迁移记录-DB变更记录/202510131411 add_column_adm_charge_item.sql b/迁移记录-DB变更记录/202510131411 add_column_adm_charge_item.sql
index 0549c9e8..bee24f52 100644
--- a/迁移记录-DB变更记录/202510131411 add_column_adm_charge_item.sql	
+++ b/迁移记录-DB变更记录/202510131411 add_column_adm_charge_item.sql	
@@ -1,5 +1,5 @@
-ALTER TABLE public.adm_charge_item ADD procedure_id int8 NULL;
-COMMENT ON COLUMN public.adm_charge_item.procedure_id IS '执行id';
+ALTER TABLE adm_charge_item ADD procedure_id int8 NULL;
+COMMENT ON COLUMN adm_charge_item.procedure_id IS '执行id';
 
 
    -- 插入为tmp_activity_device表添加列的迁移记录
diff --git a/迁移记录-DB变更记录/202510151011 alter_table_request.sql b/迁移记录-DB变更记录/202510151011 alter_table_request.sql
index ee7452b0..2071da47 100644
--- a/迁移记录-DB变更记录/202510151011 alter_table_request.sql	
+++ b/迁移记录-DB变更记录/202510151011 alter_table_request.sql	
@@ -1,20 +1,20 @@
-ALTER TABLE public.wor_device_request ADD based_on_table varchar(255) NULL;
-COMMENT ON COLUMN public.wor_device_request.based_on_table IS '请求基于什么';
+ALTER TABLE wor_device_request ADD based_on_table varchar(255) NULL;
+COMMENT ON COLUMN wor_device_request.based_on_table IS '请求基于什么';
 
-ALTER TABLE public.wor_device_request ADD based_on_id int8 NULL;
-COMMENT ON COLUMN public.wor_device_request.based_on_id IS '请求基于什么的ID';
+ALTER TABLE wor_device_request ADD based_on_id int8 NULL;
+COMMENT ON COLUMN wor_device_request.based_on_id IS '请求基于什么的ID';
 
-ALTER TABLE public.wor_device_dispense ADD procedure_id int8 NULL;
-COMMENT ON COLUMN public.wor_device_dispense.procedure_id IS '执行id';
+ALTER TABLE wor_device_dispense ADD procedure_id int8 NULL;
+COMMENT ON COLUMN wor_device_dispense.procedure_id IS '执行id';
 
-ALTER TABLE public.med_medication_request ADD based_on_table varchar(255) NULL;
-COMMENT ON COLUMN public.med_medication_request.based_on_table IS '请求基于什么';
+ALTER TABLE med_medication_request ADD based_on_table varchar(255) NULL;
+COMMENT ON COLUMN med_medication_request.based_on_table IS '请求基于什么';
 
-ALTER TABLE public.med_medication_request ADD based_on_id int8 NULL;
-COMMENT ON COLUMN public.med_medication_request.based_on_id IS '请求基于什么的ID';
+ALTER TABLE med_medication_request ADD based_on_id int8 NULL;
+COMMENT ON COLUMN med_medication_request.based_on_id IS '请求基于什么的ID';
 
-ALTER TABLE public.med_medication_dispense ADD procedure_id int8 NULL;
-COMMENT ON COLUMN public.med_medication_dispense.procedure_id IS '执行id';
+ALTER TABLE med_medication_dispense ADD procedure_id int8 NULL;
+COMMENT ON COLUMN med_medication_dispense.procedure_id IS '执行id';
 
 
    -- 插入为tmp_activity_device表添加列的迁移记录
diff --git a/迁移记录-DB变更记录/202510151413 add_talble_cli_condition_no_definition.sql b/迁移记录-DB变更记录/202510151413 add_talble_cli_condition_no_definition.sql
index 7bcfdc30..0c0b92a8 100644
--- a/迁移记录-DB变更记录/202510151413 add_talble_cli_condition_no_definition.sql	
+++ b/迁移记录-DB变更记录/202510151413 add_talble_cli_condition_no_definition.sql	
@@ -1,6 +1,6 @@
 
 
-CREATE TABLE PUBLIC.cli_condition_no_definition (
+CREATE TABLE cli_condition_no_definition (
   gl_no VARCHAR (255) NULL,
   id bigserial NOT NULL,
   tenant_id INT8 NULL,
@@ -13,19 +13,19 @@ CREATE TABLE PUBLIC.cli_condition_no_definition (
   icd10_no VARCHAR (255) NULL,
   icd10_name VARCHAR (255) NULL
 );
-COMMENT ON TABLE PUBLIC.cli_condition_no_definition IS '诊断各种编码定义表';
+COMMENT ON TABLE cli_condition_no_definition IS '诊断各种编码定义表';
 -- Column comments
-COMMENT ON COLUMN PUBLIC.cli_condition_no_definition.gl_no IS '国临疾病编码';
-COMMENT ON COLUMN PUBLIC.cli_condition_no_definition.id IS 'ID';
-COMMENT ON COLUMN PUBLIC.cli_condition_no_definition.tenant_id IS '租户id';
-COMMENT ON COLUMN PUBLIC.cli_condition_no_definition.delete_flag IS '删除状态';
-COMMENT ON COLUMN PUBLIC.cli_condition_no_definition.create_by IS '创建人';
-COMMENT ON COLUMN PUBLIC.cli_condition_no_definition.create_time IS '创建时间';
-COMMENT ON COLUMN PUBLIC.cli_condition_no_definition.update_by IS '更新人';
-COMMENT ON COLUMN PUBLIC.cli_condition_no_definition.update_time IS '更新时间';
-COMMENT ON COLUMN PUBLIC.cli_condition_no_definition.gl_name IS '国临疾病名称';
-COMMENT ON COLUMN PUBLIC.cli_condition_no_definition.icd10_no IS 'icd10编码';
-COMMENT ON COLUMN PUBLIC.cli_condition_no_definition.icd10_name IS 'icd10名称';
+COMMENT ON COLUMN cli_condition_no_definition.gl_no IS '国临疾病编码';
+COMMENT ON COLUMN cli_condition_no_definition.id IS 'ID';
+COMMENT ON COLUMN cli_condition_no_definition.tenant_id IS '租户id';
+COMMENT ON COLUMN cli_condition_no_definition.delete_flag IS '删除状态';
+COMMENT ON COLUMN cli_condition_no_definition.create_by IS '创建人';
+COMMENT ON COLUMN cli_condition_no_definition.create_time IS '创建时间';
+COMMENT ON COLUMN cli_condition_no_definition.update_by IS '更新人';
+COMMENT ON COLUMN cli_condition_no_definition.update_time IS '更新时间';
+COMMENT ON COLUMN cli_condition_no_definition.gl_name IS '国临疾病名称';
+COMMENT ON COLUMN cli_condition_no_definition.icd10_no IS 'icd10编码';
+COMMENT ON COLUMN cli_condition_no_definition.icd10_name IS 'icd10名称';
 
 
    -- 插入为tmp_activity_device表添加列的迁移记录
diff --git a/迁移记录-DB变更记录/202510211012 add_column_tmp_orders_group_package_detail.sql b/迁移记录-DB变更记录/202510211012 add_column_tmp_orders_group_package_detail.sql
index ed6fe6f6..5dda7dd2 100644
--- a/迁移记录-DB变更记录/202510211012 add_column_tmp_orders_group_package_detail.sql	
+++ b/迁移记录-DB变更记录/202510211012 add_column_tmp_orders_group_package_detail.sql	
@@ -1,18 +1,18 @@
 
-ALTER TABLE public.tmp_orders_group_package_detail ADD dose numeric(20,6) NULL;
-COMMENT ON COLUMN public.tmp_orders_group_package_detail.dose IS '单次剂量';
+ALTER TABLE tmp_orders_group_package_detail ADD dose numeric(20,6) NULL;
+COMMENT ON COLUMN tmp_orders_group_package_detail.dose IS '单次剂量';
 
 
-ALTER TABLE public.tmp_orders_group_package_detail ADD rate_code varchar(255) NULL;
-COMMENT ON COLUMN public.tmp_orders_group_package_detail.rate_code IS '用药频次';
+ALTER TABLE tmp_orders_group_package_detail ADD rate_code varchar(255) NULL;
+COMMENT ON COLUMN tmp_orders_group_package_detail.rate_code IS '用药频次';
 
 
-ALTER TABLE public.tmp_orders_group_package_detail ADD dispense_per_duration int4 NULL;
-COMMENT ON COLUMN public.tmp_orders_group_package_detail.dispense_per_duration IS '用药天数';	
+ALTER TABLE tmp_orders_group_package_detail ADD dispense_per_duration int4 NULL;
+COMMENT ON COLUMN tmp_orders_group_package_detail.dispense_per_duration IS '用药天数';	
 
 
-ALTER TABLE public.tmp_orders_group_package_detail ADD method_code varchar(255) NULL;
-COMMENT ON COLUMN public.tmp_orders_group_package_detail.method_code IS '给药途径';	
+ALTER TABLE tmp_orders_group_package_detail ADD method_code varchar(255) NULL;
+COMMENT ON COLUMN tmp_orders_group_package_detail.method_code IS '给药途径';	
 
 
    -- 插入为tmp_activity_device表添加列的迁移记录
diff --git a/迁移记录-DB变更记录/202510211414 add_column_med_medication_dispense.sql b/迁移记录-DB变更记录/202510211414 add_column_med_medication_dispense.sql
index bfe7406d..9cd53904 100644
--- a/迁移记录-DB变更记录/202510211414 add_column_med_medication_dispense.sql	
+++ b/迁移记录-DB变更记录/202510211414 add_column_med_medication_dispense.sql	
@@ -1,5 +1,5 @@
-ALTER TABLE public.med_medication_dispense ADD summary_no varchar(255) DEFAULT ''::character varying NULL;
-COMMENT ON COLUMN public.med_medication_dispense.summary_no IS '汇总编号';
+ALTER TABLE med_medication_dispense ADD summary_no varchar(255) DEFAULT ''::character varying NULL;
+COMMENT ON COLUMN med_medication_dispense.summary_no IS '汇总编号';
 
 
    -- 插入为tmp_activity_device表添加列的迁移记录
diff --git a/迁移记录-DB变更记录/202510211414 alter_table_med_medication_dispense.sql b/迁移记录-DB变更记录/202510211414 alter_table_med_medication_dispense.sql
index bfe7406d..9cd53904 100644
--- a/迁移记录-DB变更记录/202510211414 alter_table_med_medication_dispense.sql	
+++ b/迁移记录-DB变更记录/202510211414 alter_table_med_medication_dispense.sql	
@@ -1,5 +1,5 @@
-ALTER TABLE public.med_medication_dispense ADD summary_no varchar(255) DEFAULT ''::character varying NULL;
-COMMENT ON COLUMN public.med_medication_dispense.summary_no IS '汇总编号';
+ALTER TABLE med_medication_dispense ADD summary_no varchar(255) DEFAULT ''::character varying NULL;
+COMMENT ON COLUMN med_medication_dispense.summary_no IS '汇总编号';
 
 
    -- 插入为tmp_activity_device表添加列的迁移记录
diff --git a/迁移记录-DB变更记录/202510211511 alter_column_wor_supply_delivery.sql b/迁移记录-DB变更记录/202510211511 alter_column_wor_supply_delivery.sql
index d6e106d8..24de7691 100644
--- a/迁移记录-DB变更记录/202510211511 alter_column_wor_supply_delivery.sql	
+++ b/迁移记录-DB变更记录/202510211511 alter_column_wor_supply_delivery.sql	
@@ -1,4 +1,4 @@
-ALTER TABLE public.wor_supply_delivery ALTER COLUMN supplier_id DROP NOT NULL;
+ALTER TABLE wor_supply_delivery ALTER COLUMN supplier_id DROP NOT NULL;
 
 
    -- 插入为tmp_activity_device表添加列的迁移记录
diff --git a/迁移记录-DB变更记录/202510221011 add_column_tmp_orders_group_package_detail.sql b/迁移记录-DB变更记录/202510221011 add_column_tmp_orders_group_package_detail.sql
index bc2f59ed..a1354d52 100644
--- a/迁移记录-DB变更记录/202510221011 add_column_tmp_orders_group_package_detail.sql	
+++ b/迁移记录-DB变更记录/202510221011 add_column_tmp_orders_group_package_detail.sql	
@@ -1,5 +1,5 @@
-ALTER TABLE public.tmp_orders_group_package_detail ADD dose_quantity numeric(20,6) NULL;
-COMMENT ON COLUMN public.tmp_orders_group_package_detail.dose_quantity IS '小单位单次剂量';
+ALTER TABLE tmp_orders_group_package_detail ADD dose_quantity numeric(20,6) NULL;
+COMMENT ON COLUMN tmp_orders_group_package_detail.dose_quantity IS '小单位单次剂量';
 
 
    -- 插入为tmp_activity_device表添加列的迁移记录
diff --git a/迁移记录-DB变更记录/202510271011  add_column_ med_medication_definition&med_medication_request.sql b/迁移记录-DB变更记录/202510271011  add_column_ med_medication_definition&med_medication_request.sql
index b33db798..00e240da 100644
--- a/迁移记录-DB变更记录/202510271011  add_column_ med_medication_definition&med_medication_request.sql	
+++ b/迁移记录-DB变更记录/202510271011  add_column_ med_medication_definition&med_medication_request.sql	
@@ -1,9 +1,9 @@
-		ALTER TABLE public.med_medication_definition ADD dosage_instruction varchar(255) NULL;
-		COMMENT ON COLUMN public.med_medication_definition.dosage_instruction IS '用药说明';
+		ALTER TABLE med_medication_definition ADD dosage_instruction varchar(255) NULL;
+		COMMENT ON COLUMN med_medication_definition.dosage_instruction IS '用药说明';
 		
 				
-		ALTER TABLE public.med_medication_request ADD dosage_instruction varchar(255) NULL;
-		COMMENT ON COLUMN public.med_medication_request.dosage_instruction IS '用药说明';
+		ALTER TABLE med_medication_request ADD dosage_instruction varchar(255) NULL;
+		COMMENT ON COLUMN med_medication_request.dosage_instruction IS '用药说明';
 
 
    -- 插入为tmp_activity_device表添加列的迁移记录
diff --git a/迁移记录-DB变更记录/202510271311 add_column_requests.sql b/迁移记录-DB变更记录/202510271311 add_column_requests.sql
index 27e5b9af..7863f567 100644
--- a/迁移记录-DB变更记录/202510271311 add_column_requests.sql	
+++ b/迁移记录-DB变更记录/202510271311 add_column_requests.sql	
@@ -1,11 +1,11 @@
-	ALTER TABLE public.med_medication_request ADD generate_source_enum int4 NOT NULL DEFAULT 1;
-	COMMENT ON COLUMN public.med_medication_request.generate_source_enum IS '生成来源';	
+	ALTER TABLE med_medication_request ADD generate_source_enum int4 NOT NULL DEFAULT 1;
+	COMMENT ON COLUMN med_medication_request.generate_source_enum IS '生成来源';	
 	
-	ALTER TABLE public.wor_device_request ADD generate_source_enum int4 NOT NULL DEFAULT 1;
-	COMMENT ON COLUMN public.wor_device_request.generate_source_enum IS '生成来源';	
+	ALTER TABLE wor_device_request ADD generate_source_enum int4 NOT NULL DEFAULT 1;
+	COMMENT ON COLUMN wor_device_request.generate_source_enum IS '生成来源';	
 	
-	ALTER TABLE public.wor_service_request ADD generate_source_enum int4 NOT NULL DEFAULT 1;
-	COMMENT ON COLUMN public.wor_service_request.generate_source_enum IS '生成来源';	
+	ALTER TABLE wor_service_request ADD generate_source_enum int4 NOT NULL DEFAULT 1;
+	COMMENT ON COLUMN wor_service_request.generate_source_enum IS '生成来源';	
 
    -- 插入为tmp_activity_device表添加列的迁移记录
 INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
diff --git a/迁移记录-DB变更记录/202510281101 add_column_adm_practitioner.sql b/迁移记录-DB变更记录/202510281101 add_column_adm_practitioner.sql
index 995646a6..dd54ce1e 100644
--- a/迁移记录-DB变更记录/202510281101 add_column_adm_practitioner.sql	
+++ b/迁移记录-DB变更记录/202510281101 add_column_adm_practitioner.sql	
@@ -1,7 +1,7 @@
-ALTER TABLE "public"."adm_practitioner" 
+ALTER TABLE "adm_practitioner" 
   ADD COLUMN "pos_no" varchar(255) DEFAULT '';
 
-COMMENT ON COLUMN "public"."adm_practitioner"."pos_no" IS 'pos机编号';
+COMMENT ON COLUMN "adm_practitioner"."pos_no" IS 'pos机编号';
    -- 插入为tmp_activity_device表添加列的迁移记录
 INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
 VALUES ('202510281101 add_column_adm_practitioner', '1.0.0');
\ No newline at end of file
diff --git a/迁移记录-DB变更记录/202510301113 add_column adm_healthcare_service.sql b/迁移记录-DB变更记录/202510301113 add_column adm_healthcare_service.sql
index da0a66cd..3ad5cfb3 100644
--- a/迁移记录-DB变更记录/202510301113 add_column adm_healthcare_service.sql	
+++ b/迁移记录-DB变更记录/202510301113 add_column adm_healthcare_service.sql	
@@ -1,7 +1,7 @@
-ALTER TABLE "public"."adm_healthcare_service" 
+ALTER TABLE "adm_healthcare_service" 
   ADD COLUMN "bus_no" varchar(255);
 
-COMMENT ON COLUMN "public"."adm_healthcare_service"."bus_no" IS '编码';
+COMMENT ON COLUMN "adm_healthcare_service"."bus_no" IS '编码';
    -- 插入为tmp_activity_device表添加列的迁移记录
 INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
 VALUES ('202510301113 add_column adm_healthcare_service', '1.0.0');
\ No newline at end of file
diff --git a/迁移记录-DB变更记录/202511031415 add_column tmp_orders_group_package_detail.sql b/迁移记录-DB变更记录/202511031415 add_column tmp_orders_group_package_detail.sql
index 9df9308f..5ba4c7ab 100644
--- a/迁移记录-DB变更记录/202511031415 add_column tmp_orders_group_package_detail.sql	
+++ b/迁移记录-DB变更记录/202511031415 add_column tmp_orders_group_package_detail.sql	
@@ -1,5 +1,5 @@
-ALTER TABLE public.tmp_orders_group_package_detail ADD group_id int8 NULL;
-COMMENT ON COLUMN public.tmp_orders_group_package_detail.group_id IS '组号';
+ALTER TABLE tmp_orders_group_package_detail ADD group_id int8 NULL;
+COMMENT ON COLUMN tmp_orders_group_package_detail.group_id IS '组号';
    -- 插入为tmp_activity_device表添加列的迁移记录
 INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
 VALUES ('202511031415 add_column tmp_orders_group_package_detail', '1.0.0');
\ No newline at end of file
diff --git a/迁移记录-DB变更记录/202511031515 add_column adm_charge_item.sql b/迁移记录-DB变更记录/202511031515 add_column adm_charge_item.sql
index 22d35e09..f5581f82 100644
--- a/迁移记录-DB变更记录/202511031515 add_column adm_charge_item.sql	
+++ b/迁移记录-DB变更记录/202511031515 add_column adm_charge_item.sql	
@@ -1,8 +1,8 @@
-ALTER TABLE public.adm_charge_item ADD dispense_table varchar(255) DEFAULT ''::character varying NULL;
-COMMENT ON COLUMN public.adm_charge_item.dispense_table IS '发放所在表';
+ALTER TABLE adm_charge_item ADD dispense_table varchar(255) DEFAULT ''::character varying NULL;
+COMMENT ON COLUMN adm_charge_item.dispense_table IS '发放所在表';
 
-ALTER TABLE public.adm_charge_item ADD dispense_id int8 NULL;
-COMMENT ON COLUMN public.adm_charge_item.dispense_id IS '发放ID';
+ALTER TABLE adm_charge_item ADD dispense_id int8 NULL;
+COMMENT ON COLUMN adm_charge_item.dispense_id IS '发放ID';
    -- 插入为tmp_activity_device表添加列的迁移记录
 INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
 VALUES ('202511031515 add_column adm_charge_item', '1.0.0');
\ No newline at end of file
diff --git a/迁移记录-DB变更记录/202511041214 add_table doc_inventory_item_static.sql b/迁移记录-DB变更记录/202511041214 add_table doc_inventory_item_static.sql
index 5f003a8b..7cc2abc8 100644
--- a/迁移记录-DB变更记录/202511041214 add_table doc_inventory_item_static.sql	
+++ b/迁移记录-DB变更记录/202511041214 add_table doc_inventory_item_static.sql	
@@ -1,50 +1,50 @@
--- public.doc_inventory_item_static definition
+-- doc_inventory_item_static definition
 
 -- Drop table
 
--- DROP TABLE public.doc_inventory_item_static;
+-- DROP TABLE doc_inventory_item_static;
 
-CREATE TABLE public.doc_inventory_item_static ( id bigserial NOT NULL, category_code varchar(255) DEFAULT '0'::character varying NOT NULL, "name" varchar(255) DEFAULT ''::character varying NOT NULL, inventory_status_enum int4 DEFAULT 0 NOT NULL, supplier_id int8 NOT NULL, description_text varchar(2000) NULL, unit_code varchar(255) DEFAULT ''::character varying NOT NULL, quantity numeric(20, 6) DEFAULT 0 NOT NULL, lot_number varchar(255) DEFAULT ''::character varying NOT NULL, production_date timestamptz(6) NULL, expiration_date timestamptz(6) NULL, location_store_id int8 NULL, location_id int8 NOT NULL, trace_no varchar(50000) DEFAULT ''::character varying NOT NULL, packaging_levels int4 DEFAULT 1 NOT NULL, tenant_id int8 NOT NULL, delete_flag int4 DEFAULT 0 NOT NULL, create_by varchar(32) DEFAULT ''::character varying NOT NULL, create_time timestamptz(6) NOT NULL, update_by varchar(32) NULL, update_time timestamptz(6) NULL, item_table varchar(255) DEFAULT ''::character varying NOT NULL, item_id int8 NOT NULL, price numeric(20, 6) NULL, sale_price numeric(20, 6) NULL, bus_no varchar(255) DEFAULT ''::character varying NOT NULL, min_unit_code varchar(255) DEFAULT ''::character varying NOT NULL, part_percent numeric(20, 6) DEFAULT 0 NOT NULL, supplier_name varchar(255) DEFAULT ''::character varying NOT NULL, location_name varchar(255) DEFAULT ''::character varying NOT NULL, location_store_name varchar(255) DEFAULT ''::character varying NOT NULL, manufacturer_text varchar(2000) NULL, chrgitm_lv int4 DEFAULT 3 NOT NULL, total_volume varchar(255) DEFAULT ''::character varying NOT NULL, py_str varchar(255) DEFAULT ''::character varying NOT NULL, wb_str varchar(255) DEFAULT ''::character varying NOT NULL, CONSTRAINT doc_inventory_item_static_pkey PRIMARY KEY (id));
-COMMENT ON TABLE public.doc_inventory_item_static IS '库存项目管理';
+CREATE TABLE doc_inventory_item_static ( id bigserial NOT NULL, category_code varchar(255) DEFAULT '0'::character varying NOT NULL, "name" varchar(255) DEFAULT ''::character varying NOT NULL, inventory_status_enum int4 DEFAULT 0 NOT NULL, supplier_id int8 NOT NULL, description_text varchar(2000) NULL, unit_code varchar(255) DEFAULT ''::character varying NOT NULL, quantity numeric(20, 6) DEFAULT 0 NOT NULL, lot_number varchar(255) DEFAULT ''::character varying NOT NULL, production_date timestamptz(6) NULL, expiration_date timestamptz(6) NULL, location_store_id int8 NULL, location_id int8 NOT NULL, trace_no varchar(50000) DEFAULT ''::character varying NOT NULL, packaging_levels int4 DEFAULT 1 NOT NULL, tenant_id int8 NOT NULL, delete_flag int4 DEFAULT 0 NOT NULL, create_by varchar(32) DEFAULT ''::character varying NOT NULL, create_time timestamptz(6) NOT NULL, update_by varchar(32) NULL, update_time timestamptz(6) NULL, item_table varchar(255) DEFAULT ''::character varying NOT NULL, item_id int8 NOT NULL, price numeric(20, 6) NULL, sale_price numeric(20, 6) NULL, bus_no varchar(255) DEFAULT ''::character varying NOT NULL, min_unit_code varchar(255) DEFAULT ''::character varying NOT NULL, part_percent numeric(20, 6) DEFAULT 0 NOT NULL, supplier_name varchar(255) DEFAULT ''::character varying NOT NULL, location_name varchar(255) DEFAULT ''::character varying NOT NULL, location_store_name varchar(255) DEFAULT ''::character varying NOT NULL, manufacturer_text varchar(2000) NULL, chrgitm_lv int4 DEFAULT 3 NOT NULL, total_volume varchar(255) DEFAULT ''::character varying NOT NULL, py_str varchar(255) DEFAULT ''::character varying NOT NULL, wb_str varchar(255) DEFAULT ''::character varying NOT NULL, CONSTRAINT doc_inventory_item_static_pkey PRIMARY KEY (id));
+COMMENT ON TABLE doc_inventory_item_static IS '库存项目管理';
 
 -- Column comments
 
-COMMENT ON COLUMN public.doc_inventory_item_static.id IS 'ID';
-COMMENT ON COLUMN public.doc_inventory_item_static.category_code IS '物品类别';
-COMMENT ON COLUMN public.doc_inventory_item_static."name" IS '名称';
-COMMENT ON COLUMN public.doc_inventory_item_static.inventory_status_enum IS '库存状态';
-COMMENT ON COLUMN public.doc_inventory_item_static.supplier_id IS '供应商id';
-COMMENT ON COLUMN public.doc_inventory_item_static.description_text IS '说明书';
-COMMENT ON COLUMN public.doc_inventory_item_static.unit_code IS '最小单位';
-COMMENT ON COLUMN public.doc_inventory_item_static.quantity IS '当前库存数量(最小单位数量)';
-COMMENT ON COLUMN public.doc_inventory_item_static.lot_number IS '产品批号';
-COMMENT ON COLUMN public.doc_inventory_item_static.production_date IS '生产日期';
-COMMENT ON COLUMN public.doc_inventory_item_static.expiration_date IS '失效日期';
-COMMENT ON COLUMN public.doc_inventory_item_static.location_store_id IS '库位';
-COMMENT ON COLUMN public.doc_inventory_item_static.location_id IS '仓库';
-COMMENT ON COLUMN public.doc_inventory_item_static.trace_no IS '追溯码';
-COMMENT ON COLUMN public.doc_inventory_item_static.packaging_levels IS '追溯码包装层级';
-COMMENT ON COLUMN public.doc_inventory_item_static.tenant_id IS '租户ID';
-COMMENT ON COLUMN public.doc_inventory_item_static.delete_flag IS '删除状态';
-COMMENT ON COLUMN public.doc_inventory_item_static.create_by IS '创建人';
-COMMENT ON COLUMN public.doc_inventory_item_static.create_time IS '创建时间';
-COMMENT ON COLUMN public.doc_inventory_item_static.update_by IS '更新人';
-COMMENT ON COLUMN public.doc_inventory_item_static.update_time IS '更新时间';
-COMMENT ON COLUMN public.doc_inventory_item_static.item_table IS '项目';
-COMMENT ON COLUMN public.doc_inventory_item_static.item_id IS '物品编码';
-COMMENT ON COLUMN public.doc_inventory_item_static.price IS '采购单价(包装单位)';
-COMMENT ON COLUMN public.doc_inventory_item_static.sale_price IS '销售单价(包装单位)';
-COMMENT ON COLUMN public.doc_inventory_item_static.bus_no IS '项目编号';
-COMMENT ON COLUMN public.doc_inventory_item_static.min_unit_code IS '最小单位';
-COMMENT ON COLUMN public.doc_inventory_item_static.part_percent IS '拆零比';
-COMMENT ON COLUMN public.doc_inventory_item_static.supplier_name IS '供应商名称';
-COMMENT ON COLUMN public.doc_inventory_item_static.location_name IS '库房名称';
-COMMENT ON COLUMN public.doc_inventory_item_static.location_store_name IS '货位名称';
-COMMENT ON COLUMN public.doc_inventory_item_static.manufacturer_text IS '生产厂商文本';
-COMMENT ON COLUMN public.doc_inventory_item_static.chrgitm_lv IS '医保等级';
-COMMENT ON COLUMN public.doc_inventory_item_static.total_volume IS '规格';
-COMMENT ON COLUMN public.doc_inventory_item_static.py_str IS '药品名称拼音码';
-COMMENT ON COLUMN public.doc_inventory_item_static.wb_str IS '药品五笔码';
+COMMENT ON COLUMN doc_inventory_item_static.id IS 'ID';
+COMMENT ON COLUMN doc_inventory_item_static.category_code IS '物品类别';
+COMMENT ON COLUMN doc_inventory_item_static."name" IS '名称';
+COMMENT ON COLUMN doc_inventory_item_static.inventory_status_enum IS '库存状态';
+COMMENT ON COLUMN doc_inventory_item_static.supplier_id IS '供应商id';
+COMMENT ON COLUMN doc_inventory_item_static.description_text IS '说明书';
+COMMENT ON COLUMN doc_inventory_item_static.unit_code IS '最小单位';
+COMMENT ON COLUMN doc_inventory_item_static.quantity IS '当前库存数量(最小单位数量)';
+COMMENT ON COLUMN doc_inventory_item_static.lot_number IS '产品批号';
+COMMENT ON COLUMN doc_inventory_item_static.production_date IS '生产日期';
+COMMENT ON COLUMN doc_inventory_item_static.expiration_date IS '失效日期';
+COMMENT ON COLUMN doc_inventory_item_static.location_store_id IS '库位';
+COMMENT ON COLUMN doc_inventory_item_static.location_id IS '仓库';
+COMMENT ON COLUMN doc_inventory_item_static.trace_no IS '追溯码';
+COMMENT ON COLUMN doc_inventory_item_static.packaging_levels IS '追溯码包装层级';
+COMMENT ON COLUMN doc_inventory_item_static.tenant_id IS '租户ID';
+COMMENT ON COLUMN doc_inventory_item_static.delete_flag IS '删除状态';
+COMMENT ON COLUMN doc_inventory_item_static.create_by IS '创建人';
+COMMENT ON COLUMN doc_inventory_item_static.create_time IS '创建时间';
+COMMENT ON COLUMN doc_inventory_item_static.update_by IS '更新人';
+COMMENT ON COLUMN doc_inventory_item_static.update_time IS '更新时间';
+COMMENT ON COLUMN doc_inventory_item_static.item_table IS '项目';
+COMMENT ON COLUMN doc_inventory_item_static.item_id IS '物品编码';
+COMMENT ON COLUMN doc_inventory_item_static.price IS '采购单价(包装单位)';
+COMMENT ON COLUMN doc_inventory_item_static.sale_price IS '销售单价(包装单位)';
+COMMENT ON COLUMN doc_inventory_item_static.bus_no IS '项目编号';
+COMMENT ON COLUMN doc_inventory_item_static.min_unit_code IS '最小单位';
+COMMENT ON COLUMN doc_inventory_item_static.part_percent IS '拆零比';
+COMMENT ON COLUMN doc_inventory_item_static.supplier_name IS '供应商名称';
+COMMENT ON COLUMN doc_inventory_item_static.location_name IS '库房名称';
+COMMENT ON COLUMN doc_inventory_item_static.location_store_name IS '货位名称';
+COMMENT ON COLUMN doc_inventory_item_static.manufacturer_text IS '生产厂商文本';
+COMMENT ON COLUMN doc_inventory_item_static.chrgitm_lv IS '医保等级';
+COMMENT ON COLUMN doc_inventory_item_static.total_volume IS '规格';
+COMMENT ON COLUMN doc_inventory_item_static.py_str IS '药品名称拼音码';
+COMMENT ON COLUMN doc_inventory_item_static.wb_str IS '药品五笔码';
    -- 插入为tmp_activity_device表添加列的迁移记录
 INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
 VALUES ('202511041214 add_table doc_inventory_item_static', '1.0.0');
\ No newline at end of file
diff --git a/迁移记录-DB变更记录/202511051215 add_table adm_change_price_record.sql b/迁移记录-DB变更记录/202511051215 add_table adm_change_price_record.sql
index 91b216b1..9f6e04aa 100644
--- a/迁移记录-DB变更记录/202511051215 add_table adm_change_price_record.sql	
+++ b/迁移记录-DB变更记录/202511051215 add_table adm_change_price_record.sql	
@@ -1,38 +1,38 @@
--- public.adm_change_price_record definition
+-- adm_change_price_record definition
 
 -- Drop table
 
--- DROP TABLE public.adm_change_price_record;
+-- DROP TABLE adm_change_price_record;
 
-CREATE TABLE public.adm_change_price_record ( id bigserial NOT NULL, location_id int8 NULL, applicant_id int8 NULL, item_category_enum int4 NULL, item_id int8 NULL, origin_buying_price numeric(20, 6) NULL, origin_retail_price numeric(20, 6) NULL, approver_id int8 NULL, approval_time timestamptz(6) NULL, tenant_id int8 NULL, delete_flag bpchar(1) DEFAULT '0' NULL, create_by varchar(32) DEFAULT ''::character varying NOT NULL, create_time timestamptz(6) NOT NULL, update_by varchar NULL, update_time timestamptz(6) NULL, item_quantity numeric(20, 6) NULL, difference_retail_price numeric(20, 6) NULL, bus_no varchar(255) DEFAULT ''::character varying NULL, description varchar(255) NULL, applicant_time timestamptz NULL, item_table varchar(50) DEFAULT ''::character varying NULL, new_buying_price numeric(20, 6) NULL, new_retail_price numeric(20, 6) NULL, unit_code varchar(255) DEFAULT ''::character varying NULL, status_enum int4 DEFAULT 0 NULL, lot_number varchar(255) DEFAULT ''::character varying NULL, reason varchar(2000) NULL, difference_buying_price numeric(20, 6) NULL, CONSTRAINT adm_change_price_record_pkey PRIMARY KEY (id));
-COMMENT ON TABLE public.adm_change_price_record IS '修改价格记录表';
+CREATE TABLE adm_change_price_record ( id bigserial NOT NULL, location_id int8 NULL, applicant_id int8 NULL, item_category_enum int4 NULL, item_id int8 NULL, origin_buying_price numeric(20, 6) NULL, origin_retail_price numeric(20, 6) NULL, approver_id int8 NULL, approval_time timestamptz(6) NULL, tenant_id int8 NULL, delete_flag bpchar(1) DEFAULT '0' NULL, create_by varchar(32) DEFAULT ''::character varying NOT NULL, create_time timestamptz(6) NOT NULL, update_by varchar NULL, update_time timestamptz(6) NULL, item_quantity numeric(20, 6) NULL, difference_retail_price numeric(20, 6) NULL, bus_no varchar(255) DEFAULT ''::character varying NULL, description varchar(255) NULL, applicant_time timestamptz NULL, item_table varchar(50) DEFAULT ''::character varying NULL, new_buying_price numeric(20, 6) NULL, new_retail_price numeric(20, 6) NULL, unit_code varchar(255) DEFAULT ''::character varying NULL, status_enum int4 DEFAULT 0 NULL, lot_number varchar(255) DEFAULT ''::character varying NULL, reason varchar(2000) NULL, difference_buying_price numeric(20, 6) NULL, CONSTRAINT adm_change_price_record_pkey PRIMARY KEY (id));
+COMMENT ON TABLE adm_change_price_record IS '修改价格记录表';
 
 -- Column comments
 
-COMMENT ON COLUMN public.adm_change_price_record.id IS '本表id';
-COMMENT ON COLUMN public.adm_change_price_record.location_id IS '批次号';
-COMMENT ON COLUMN public.adm_change_price_record.applicant_id IS '改价申请人id';
-COMMENT ON COLUMN public.adm_change_price_record.item_category_enum IS '目标枚举 药品、耗材、诊疗、挂号';
-COMMENT ON COLUMN public.adm_change_price_record.item_id IS '药品ID、耗材ID、诊疗ID、挂号ID';
-COMMENT ON COLUMN public.adm_change_price_record.origin_buying_price IS '原进货价';
-COMMENT ON COLUMN public.adm_change_price_record.origin_retail_price IS '原新价格';
-COMMENT ON COLUMN public.adm_change_price_record.approver_id IS '审批人ID';
-COMMENT ON COLUMN public.adm_change_price_record.approval_time IS '审批时间';
-COMMENT ON COLUMN public.adm_change_price_record.tenant_id IS '租户ID';
-COMMENT ON COLUMN public.adm_change_price_record.delete_flag IS '删除标识 默认 0 未删除';
-COMMENT ON COLUMN public.adm_change_price_record.item_quantity IS '当前品库存量';
-COMMENT ON COLUMN public.adm_change_price_record.difference_retail_price IS '零售价盈负差';
-COMMENT ON COLUMN public.adm_change_price_record.bus_no IS '当前业务批次号';
-COMMENT ON COLUMN public.adm_change_price_record.description IS '改价原因';
-COMMENT ON COLUMN public.adm_change_price_record.applicant_time IS '改价申请时间';
-COMMENT ON COLUMN public.adm_change_price_record.item_table IS '业务表名药品、耗材、诊疗、挂号';
-COMMENT ON COLUMN public.adm_change_price_record.new_buying_price IS '新进货价';
-COMMENT ON COLUMN public.adm_change_price_record.new_retail_price IS '新零售价';
-COMMENT ON COLUMN public.adm_change_price_record.unit_code IS '物品计量单位';
-COMMENT ON COLUMN public.adm_change_price_record.status_enum IS '审批状态';
-COMMENT ON COLUMN public.adm_change_price_record.lot_number IS '批次号';
-COMMENT ON COLUMN public.adm_change_price_record.reason IS '条件理由';
-COMMENT ON COLUMN public.adm_change_price_record.difference_buying_price IS '进货价盈负差';
+COMMENT ON COLUMN adm_change_price_record.id IS '本表id';
+COMMENT ON COLUMN adm_change_price_record.location_id IS '批次号';
+COMMENT ON COLUMN adm_change_price_record.applicant_id IS '改价申请人id';
+COMMENT ON COLUMN adm_change_price_record.item_category_enum IS '目标枚举 药品、耗材、诊疗、挂号';
+COMMENT ON COLUMN adm_change_price_record.item_id IS '药品ID、耗材ID、诊疗ID、挂号ID';
+COMMENT ON COLUMN adm_change_price_record.origin_buying_price IS '原进货价';
+COMMENT ON COLUMN adm_change_price_record.origin_retail_price IS '原新价格';
+COMMENT ON COLUMN adm_change_price_record.approver_id IS '审批人ID';
+COMMENT ON COLUMN adm_change_price_record.approval_time IS '审批时间';
+COMMENT ON COLUMN adm_change_price_record.tenant_id IS '租户ID';
+COMMENT ON COLUMN adm_change_price_record.delete_flag IS '删除标识 默认 0 未删除';
+COMMENT ON COLUMN adm_change_price_record.item_quantity IS '当前品库存量';
+COMMENT ON COLUMN adm_change_price_record.difference_retail_price IS '零售价盈负差';
+COMMENT ON COLUMN adm_change_price_record.bus_no IS '当前业务批次号';
+COMMENT ON COLUMN adm_change_price_record.description IS '改价原因';
+COMMENT ON COLUMN adm_change_price_record.applicant_time IS '改价申请时间';
+COMMENT ON COLUMN adm_change_price_record.item_table IS '业务表名药品、耗材、诊疗、挂号';
+COMMENT ON COLUMN adm_change_price_record.new_buying_price IS '新进货价';
+COMMENT ON COLUMN adm_change_price_record.new_retail_price IS '新零售价';
+COMMENT ON COLUMN adm_change_price_record.unit_code IS '物品计量单位';
+COMMENT ON COLUMN adm_change_price_record.status_enum IS '审批状态';
+COMMENT ON COLUMN adm_change_price_record.lot_number IS '批次号';
+COMMENT ON COLUMN adm_change_price_record.reason IS '条件理由';
+COMMENT ON COLUMN adm_change_price_record.difference_buying_price IS '进货价盈负差';
    -- 插入为tmp_activity_device表添加列的迁移记录
 INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
 VALUES ('202511051215 add_table adm_change_price_record', '1.0.0');
\ No newline at end of file