Yajentine/his
2
2
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决报表管理-》院内库房情况查询报表-》库存商品明细查询报表bug

Browse Source
This commit is contained in:
王志康
2025-11-07 09:56:50 +08:00
parent f7de87860b
commit 945182c6f8
3 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InventoryProductReportSearchParam.java
View File

@@ -38,4 +38,10 @@ public class InventoryProductReportSearchParam {
/** 供应商 */ /** 供应商 */
private Long supplierId; private Long supplierId;
/** 厂家/产地（供应商名称） */
private String manufacturerText;
/** 仓库ID（药房ID） */
private Long purposeLocationId;
} }

13
openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/InventoryProductReportMapper.xml
View File

@@ -4,6 +4,8 @@
<select id="selectProductReportPage" <select id="selectProductReportPage"
resultType="com.openhis.web.reportmanage.dto.InventoryProductReportPageDto"> resultType="com.openhis.web.reportmanage.dto.InventoryProductReportPageDto">
SELECT *
FROM (
SELECT T8.id, --ID SELECT T8.id, --ID
T8.bus_no, --药品编码 T8.bus_no, --药品编码
T8.name, --药品名称 T8.name, --药品名称
@@ -23,9 +25,11 @@
T8.purpose_type_enum, --仓库类型 T8.purpose_type_enum, --仓库类型
T8.location_name, --仓库名称 T8.location_name, --仓库名称
T8.location_store_name, --货位名称 T8.location_store_name, --货位名称
T8.purpose_location_id, --仓库ID
T8.expiration_date, --有效期 T8.expiration_date, --有效期
T8.yb_no, --医保编码 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 FROM (SELECT T1.id, --ID
T2.bus_no, --药品编码 T2.bus_no, --药品编码
T2.name, --药品名称 T2.name, --药品名称
@@ -46,6 +50,7 @@
T6.form_enum AS purpose_type_enum, --仓库类型 T6.form_enum AS purpose_type_enum, --仓库类型
T6.name AS location_name, --仓库名称 T6.name AS location_name, --仓库名称
T7.name AS location_store_name, --货位名称 T7.name AS location_store_name, --货位名称
T1.location_id AS purpose_location_id, --仓库ID
T1.expiration_date, --有效期 T1.expiration_date, --有效期
T2.yb_no, --医保编码 T2.yb_no, --医保编码
T1.tenant_id -- 租户ID T1.tenant_id -- 租户ID
@@ -86,9 +91,11 @@
T10.purpose_type_enum, --仓库类型 T10.purpose_type_enum, --仓库类型
T10.location_name, --仓库名称 T10.location_name, --仓库名称
T10.location_store_name, --货位名称 T10.location_store_name, --货位名称
T10.purpose_location_id, --仓库ID
T10.expiration_date, --有效期 T10.expiration_date, --有效期
T10.yb_no, --医保编码 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 FROM (SELECT T1.id, --ID
T9.bus_no, --药品编码 T9.bus_no, --药品编码
T9.name, --药品名称 T9.name, --药品名称
@@ -109,6 +116,7 @@
T6.form_enum AS purpose_type_enum, --仓库类型 T6.form_enum AS purpose_type_enum, --仓库类型
T6.name AS location_name, --仓库名称 T6.name AS location_name, --仓库名称
T7.name AS location_store_name, --货位名称 T7.name AS location_store_name, --货位名称
T1.location_id AS purpose_location_id, --仓库ID
T1.expiration_date, --有效期 T1.expiration_date, --有效期
T9.yb_no, --医保编码 T9.yb_no, --医保编码
T1.tenant_id -- 租户ID T1.tenant_id -- 租户ID
@@ -129,6 +137,7 @@
ON T1.location_store_id = T7.id ON T1.location_store_id = T7.id
AND T7.delete_flag = '0' AND T7.delete_flag = '0'
WHERE T1.delete_flag = '0') AS T10 WHERE T1.delete_flag = '0') AS T10
) AS T
${ew.customSqlSegment} ${ew.customSqlSegment}
</select> </select>
</mapper> </mapper>

10
openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/inventoryProductDetails.vue
View File

@@ -73,9 +73,9 @@
/> />
</el-select> </el-select>
</el-form-item> --> </el-form-item> -->
<el-form-item label="药房：" prop="purposeTypeEnum" label-width="80px"> <el-form-item label="药房：" prop="purposeLocationId" label-width="80px">
<el-select <el-select
v-model="queryParams.purposeTypeEnum" v-model="queryParams.purposeLocationId"
placeholder="" placeholder=""
clearable clearable
style="width: 150px" style="width: 150px"
@@ -103,9 +103,9 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="供应商：" prop="supplierId"> <el-form-item label="供应商：" prop="manufacturerText">
<el-input <el-input
v-model="queryParams.supplierId" v-model="queryParams.manufacturerText"
placeholder="回车查询" placeholder="回车查询"
clearable clearable
style="width: 200px" style="width: 200px"
@@ -363,7 +363,7 @@ const data = reactive({
busNo:undefined, busNo:undefined,
name: undefined, name: undefined,
categoryType:undefined, categoryType:undefined,
purposeTypeEnum:undefined, purposeLocationId:undefined,
inventoryScope: undefined, inventoryScope: undefined,
supplierId: undefined, supplierId: undefined,
// occurrenceTimeSTime:undefined, // occurrenceTimeSTime:undefined,