From 945182c6f89a587f35df39d89fc08b02e6a9bc8b Mon Sep 17 00:00:00 2001
From: wzk <2438381872@qq.com>
Date: Fri, 7 Nov 2025 09:56:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=8A=A5=E8=A1=A8=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E3=80=8B=E9=99=A2=E5=86=85=E5=BA=93=E6=88=BF?=
 =?UTF-8?q?=E6=83=85=E5=86=B5=E6=9F=A5=E8=AF=A2=E6=8A=A5=E8=A1=A8-?=
 =?UTF-8?q?=E3=80=8B=E5=BA=93=E5=AD=98=E5=95=86=E5=93=81=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8A=A5=E8=A1=A8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/InventoryProductReportSearchParam.java  |  6 ++++++
 .../InventoryProductReportMapper.xml            | 17 +++++++++++++----
 .../inventoryProductDetails.vue                 | 10 +++++-----
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InventoryProductReportSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InventoryProductReportSearchParam.java
index 0e541cd7..3b50e6cf 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InventoryProductReportSearchParam.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InventoryProductReportSearchParam.java
@@ -38,4 +38,10 @@ public class InventoryProductReportSearchParam {
 
     /** 供应商 */
     private Long supplierId;
+
+    /** 厂家/产地（供应商名称） */
+    private String manufacturerText;
+
+    /** 仓库ID（药房ID） */
+    private Long purposeLocationId;
 }
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 748a5175..a75f02db 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,7 +4,9 @@
 
     <select id="selectProductReportPage"
             resultType="com.openhis.web.reportmanage.dto.InventoryProductReportPageDto">
-        SELECT T8.id,                                                --ID
+        SELECT *
+        FROM (
+               SELECT T8.id,                                                --ID
                T8.bus_no,                                            --药品编码
                T8.name,                                              --药品名称
                T8.lot_number,                                        --批次号
@@ -23,9 +25,11 @@
                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
+               T8.tenant_id,               -- 租户ID
+               CAST(T8.item_table AS INTEGER) AS category_type          -- 项目类型（按分类编码，整型）
         FROM (SELECT T1.id,                                                 --ID
                      T2.bus_no,                                             --药品编码
                      T2.name,                                               --药品名称
@@ -46,6 +50,7 @@
                      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
@@ -86,9 +91,11 @@
                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
+               T10.tenant_id,               -- 租户ID
+               CAST(T10.item_table AS INTEGER) AS category_type           -- 项目类型（按分类编码，整型）
         FROM (SELECT T1.id,                                                 --ID
                      T9.bus_no,                                           --药品编码
                      T9.name,                                               --药品名称
@@ -109,6 +116,7 @@
                      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
@@ -128,7 +136,8 @@
                        LEFT JOIN adm_location T7
                                  ON T1.location_store_id = T7.id
                                      AND T7.delete_flag = '0'
-              WHERE T1.delete_flag = '0') AS T10
+             WHERE T1.delete_flag = '0') AS T10
+            ) AS T
             ${ew.customSqlSegment}
     </select>
 </mapper>
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/inventoryProductDetails.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/inventoryProductDetails.vue
index d62e3a30..eed7145f 100644
--- a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/inventoryProductDetails.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/inventoryProductDetails.vue
@@ -73,9 +73,9 @@
           />
         </el-select>
       </el-form-item> -->
-      <el-form-item label="药房：" prop="purposeTypeEnum" label-width="80px">
+      <el-form-item label="药房：" prop="purposeLocationId" label-width="80px">
         <el-select
-          v-model="queryParams.purposeTypeEnum"
+          v-model="queryParams.purposeLocationId"
           placeholder=""
           clearable
           style="width: 150px"
@@ -103,9 +103,9 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="供应商：" prop="supplierId">
+      <el-form-item label="供应商：" prop="manufacturerText">
         <el-input
-          v-model="queryParams.supplierId"
+          v-model="queryParams.manufacturerText"
           placeholder="回车查询"
           clearable
           style="width: 200px"
@@ -363,7 +363,7 @@ const data = reactive({
     busNo:undefined, 
     name: undefined,
     categoryType:undefined,
-    purposeTypeEnum:undefined,
+        purposeLocationId:undefined,
     inventoryScope: undefined,
     supplierId: undefined, 
     // occurrenceTimeSTime:undefined,