From c24ec3965826214f60798fa58dfe671f13364c7e Mon Sep 17 00:00:00 2001 From: "Zhang.WH" Date: Thu, 20 Feb 2025 11:25:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B5=8B=E8=AF=95=E7=B1=BB?= =?UTF-8?q?=EF=BC=8C=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- openhis-server/openhis-application/pom.xml | 5 + .../PurchaseInventoryController.java | 92 +++++++++++++++++++ .../openhis/MedicationApplicationTests.java | 27 ++++++ .../service/IServiceRequestService.java | 1 + .../impl/ServiceRequestServiceImpl.java | 3 +- 5 files changed, 127 insertions(+), 1 deletion(-) create mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/controller/PurchaseInventoryController.java create mode 100644 openhis-server/openhis-application/src/test/java/com/openhis/MedicationApplicationTests.java diff --git a/openhis-server/openhis-application/pom.xml b/openhis-server/openhis-application/pom.xml index 88e6a828..990d883c 100644 --- a/openhis-server/openhis-application/pom.xml +++ b/openhis-server/openhis-application/pom.xml @@ -30,6 +30,11 @@ liteflow-spring-boot-starter 2.12.4.1 + + junit + junit + test + 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 new file mode 100644 index 00000000..24f7b738 --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/controller/PurchaseInventoryController.java @@ -0,0 +1,92 @@ +/* + * Copyright ©2023 CJB-CNIT Team. All rights reserved + */ +package com.openhis.web.InventoryManage.controller; + +import javax.servlet.http.HttpServletRequest; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.openhis.workflow.service.ISupplyRequestService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.openhis.web.InventoryManage.dto.SupplySearchParam; +import com.openhis.workflow.domain.SupplyRequest; + +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; + +/** + * 采购入库 controller + * + * @author zwh + * @date 2025-02-18 + */ +@RestController +@RequestMapping("/purchase-inventory") +@Slf4j +@AllArgsConstructor +public class PurchaseInventoryController { + + private final ISupplyRequestService supplyRequestService; + + /** + * 入库单据分页列表 + * + * @param supplySearchParam 查询条件 + * @param pageNo 当前页码 + * @param pageSize 查询条数 + * @param request 请求数据 + * @return 入库单据分页列表 + */ + @GetMapping(value = "/inventory-receipt-page") + public Page getPage(SupplySearchParam supplySearchParam, + @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) { + // 查询supply_request相关信息并返回分页列表 + + return supplyRequestService.page(new Page<>(pageNo,pageSize)); + } + + // 添加入库单据之前需要 + // 1.supplier供应商信息列表 + // 2.location信息列表包括（药房，药库，材料柜，护理站） + // 3.practitioner_role与practitioner联查获取对应location的管理员列表 + // 4.查询选定对应药品类型的药品信息列表 + + /** + * 添加入库单据（生成供应请求） + * + * @param supplyRequest 供应请求信息 + */ + @PostMapping("/add-supply-request") + public void addSupplyRequest(@Validated @RequestBody SupplyRequest supplyRequest) { + // 生成待发送的入库单据supply_request + // 生成收费项目charge_item + + // 如果采购单价被修改了，需要根据批次号更新采购单价子表价格 + } + + /** + * 编辑入库单据 + * + * @param supplyRequest 供应请求信息 + */ + @PutMapping("/edit-supply-request") + public void editSupplyRequest(@Validated @RequestBody SupplyRequest supplyRequest) { + // 更新supply_request信息 + // 更新收费项目charge_item + } + + /** + * 单据提交申请 + * + * @param supplyRequest 供应请求信息 + */ + public void submitExamine(SupplyRequest supplyRequest) { + + // 更改供应请求单据状态 + // 生成供应分发supply_delivery + } +} diff --git a/openhis-server/openhis-application/src/test/java/com/openhis/MedicationApplicationTests.java b/openhis-server/openhis-application/src/test/java/com/openhis/MedicationApplicationTests.java new file mode 100644 index 00000000..0ef1809a --- /dev/null +++ b/openhis-server/openhis-application/src/test/java/com/openhis/MedicationApplicationTests.java @@ -0,0 +1,27 @@ +/* + * Copyright ©2023 CJB-CNIT Team. All rights reserved + */ +package com.openhis; + +import java.io.IOException; + +import org.junit.Test; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; + +import lombok.extern.slf4j.Slf4j; + +/** + * 测试类 + * + * @author zwh + * @date 2024-12-03 + */ +@Slf4j +@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}, scanBasePackages = {"com.openhis"}) +public class MedicationApplicationTests { + @Test + public void contextLoads() throws IOException { + + } +} diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/IServiceRequestService.java b/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/IServiceRequestService.java index 966b51d3..c0dabacd 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/IServiceRequestService.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/IServiceRequestService.java @@ -1,5 +1,6 @@ package com.openhis.workflow.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.openhis.workflow.domain.ServiceRequest; diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ServiceRequestServiceImpl.java b/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ServiceRequestServiceImpl.java index df135ef5..c8430b7f 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ServiceRequestServiceImpl.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ServiceRequestServiceImpl.java @@ -14,6 +14,7 @@ import com.openhis.workflow.service.IServiceRequestService; * @date 2025-02-20 */ @Service -public class ServiceRequestServiceImpl extends ServiceImpl implements IServiceRequestService { +public class ServiceRequestServiceImpl extends ServiceImpl + implements IServiceRequestService { } \ No newline at end of file