From 323d6ffd51a236a424ba60caf1dcb7690d386e7b Mon Sep 17 00:00:00 2001 From: "Zhang.WH" Date: Tue, 4 Mar 2025 10:10:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=88=86=E9=A1=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=8C=E6=96=B0=E5=BB=BA=E8=A1=A8=E5=90=8D=E5=B8=B8?= =?UTF-8?q?=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ItemDefinitionController.java | 10 ++++++---- .../PurchaseInventoryController.java | 18 ++++++++++-------- .../mapper/InventoryManageMapper.java | 18 ++++++++++++++++++ .../InventoryManage/InventoryManageMapper.xml | 5 +++++ .../common/constant/CommonConstants.java | 15 +++++++++++++++ 5 files changed, 54 insertions(+), 12 deletions(-) create mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/InventoryManageMapper.java create mode 100644 openhis-server/openhis-application/src/main/resources/mapper/InventoryManage/InventoryManageMapper.xml diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/ItemDefinitionController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/ItemDefinitionController.java index 3f699bc7..84d028f7 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/ItemDefinitionController.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/ItemDefinitionController.java @@ -30,6 +30,7 @@ import com.openhis.administration.domain.ChargeItemDefApp; import com.openhis.administration.domain.ChargeItemDefinition; import com.openhis.administration.service.IChargeItemDefAppService; import com.openhis.administration.service.IChargeItemDefinitionService; +import com.openhis.common.constant.CommonConstants; import com.openhis.common.constant.PromptMsgConstant; import com.openhis.common.enums.PublicationStatus; import com.openhis.web.datadictionary.dto.ChargeItemDefPageDto; @@ -68,7 +69,7 @@ public class ItemDefinitionController { */ @GetMapping(value = "/init") public R getInitDefinitionOptions(ItemDefSearchParam itemDefSearchParam) { - /// TODO: 2025/2/26 收费项目下拉框 暂未做成用枚举代替，后续替换 + /// TODO: 2025/2/26 收费项目下拉框 暂未做成用枚举代替，后续替换 List chargeItemOptions = new ArrayList<>(); if (DefinitionTypeEnum.MEDICATION.getCode().equals(itemDefSearchParam.getDefinitionType())) { // 西药 @@ -155,13 +156,14 @@ public class ItemDefinitionController { } // 通过 DefinitionType 区分药品定价/器具定价/活动定价 if (DefinitionTypeEnum.MEDICATION.getCode().equals(chargeItemDefPageDto.getDefinitionType())) { - queryWrapper.eq(ChargeItemDefPageDto::getInstanceTable, "med_medication_definition"); + queryWrapper.eq(ChargeItemDefPageDto::getInstanceTable, + CommonConstants.TableName.MED_MEDICATION_DEFINITION); chargeItemDefinitionPage = chargeItemDefSearchMapper.getMedList(new Page<>(pageNo, pageSize), queryWrapper); } else if (DefinitionTypeEnum.DEVICE.getCode().equals(chargeItemDefPageDto.getDefinitionType())) { - queryWrapper.eq(ChargeItemDefPageDto::getInstanceTable, "adm_device_definition"); + queryWrapper.eq(ChargeItemDefPageDto::getInstanceTable, CommonConstants.TableName.ADM_DEVICE_DEFINITION); chargeItemDefinitionPage = chargeItemDefSearchMapper.getDevList(new Page<>(pageNo, pageSize), queryWrapper); } else if (DefinitionTypeEnum.ACTIVITY.getCode().equals(chargeItemDefPageDto.getDefinitionType())) { - queryWrapper.eq(ChargeItemDefPageDto::getInstanceTable, "wor_activity_definition"); + queryWrapper.eq(ChargeItemDefPageDto::getInstanceTable, CommonConstants.TableName.WOR_ACTIVITY_DEFINITION); chargeItemDefinitionPage = chargeItemDefSearchMapper.getActList(new Page<>(pageNo, pageSize), queryWrapper); } return R.ok(chargeItemDefinitionPage, MessageUtils.createMessage(PromptMsgConstant.Common.M00009, null)); diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PurchaseInventoryController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PurchaseInventoryController.java index 4f92b975..81041ad2 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PurchaseInventoryController.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PurchaseInventoryController.java @@ -3,7 +3,9 @@ */ package com.openhis.web.inventorymanage.controller; +import java.util.ArrayList; import java.util.HashSet; +import java.util.List; import javax.servlet.http.HttpServletRequest; @@ -14,6 +16,7 @@ import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.utils.MessageUtils; import com.core.common.utils.bean.BeanUtils; @@ -25,12 +28,10 @@ import com.openhis.administration.service.IPatientService; import com.openhis.administration.service.ISupplierService; import com.openhis.common.constant.CommonConstants; import com.openhis.common.constant.PromptMsgConstant; +import com.openhis.common.utils.HisPageUtils; import com.openhis.common.utils.HisQueryUtils; import com.openhis.medication.service.IMedicationService; -import com.openhis.web.inventorymanage.dto.InventoryDto; -import com.openhis.web.inventorymanage.dto.InventoryReceiptInitDto; -import com.openhis.web.inventorymanage.dto.InventorySearchParam; -import com.openhis.web.inventorymanage.dto.SaveInventoryReceiptDto; +import com.openhis.web.inventorymanage.dto.*; import com.openhis.workflow.domain.SupplyRequest; import com.openhis.workflow.mapper.SupplyRequestMapper; import com.openhis.workflow.service.ISupplyRequestService; @@ -103,12 +104,13 @@ public class PurchaseInventoryController { searchFields.add(CommonConstants.FieldName.BusNo); // 构建查询条件 - QueryWrapper queryWrapper = + QueryWrapper queryWrapper = HisQueryUtils.buildQueryWrapper(inventorySearchParam, searchKey, searchFields, request); + // 查询入库单据分页列表 + Page inventoryReceiptPage = + HisPageUtils.selectPage(supplyRequestMapper, queryWrapper, pageNo, pageSize, InventoryReceiptDto.class); - // Page inventoryReceiptPage= supplyRequestService.page(new - // Page<>(pageNo,pageSize),queryWrapper); - return R.ok(); + return R.ok(inventoryReceiptPage); } /** diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/InventoryManageMapper.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/InventoryManageMapper.java new file mode 100644 index 00000000..30045125 --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/InventoryManageMapper.java @@ -0,0 +1,18 @@ +/* + * Copyright ©2023 CJB-CNIT Team. All rights reserved + */ +package com.openhis.web.inventorymanage.mapper; + +import org.springframework.stereotype.Repository; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.openhis.workflow.domain.SupplyRequest; + +/** + * 库存管理查询用 mapper + * + * @author zwh + * @date 2025-02-25 + */ +@Repository +public interface InventoryManageMapper extends BaseMapper {} diff --git a/openhis-server/openhis-application/src/main/resources/mapper/InventoryManage/InventoryManageMapper.xml b/openhis-server/openhis-application/src/main/resources/mapper/InventoryManage/InventoryManageMapper.xml new file mode 100644 index 00000000..1371c254 --- /dev/null +++ b/openhis-server/openhis-application/src/main/resources/mapper/InventoryManage/InventoryManageMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/constant/CommonConstants.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/constant/CommonConstants.java index 98bd3628..6f64b55d 100644 --- a/openhis-server/openhis-common/src/main/java/com/openhis/common/constant/CommonConstants.java +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/constant/CommonConstants.java @@ -36,6 +36,21 @@ public class CommonConstants { * 服务管理 */ String ADM_HEALTHCARE_SERVICE = "adm_healthcare_service"; + + /** + * 药品定义 + */ + String MED_MEDICATION_DEFINITION = "med_medication_definition"; + + /** + * 器材定义 + */ + String ADM_DEVICE_DEFINITION = "adm_device_definition"; + + /** + * 活动定义 + */ + String WOR_ACTIVITY_DEFINITION = "wor_activity_definition"; } /**