From c24ec3965826214f60798fa58dfe671f13364c7e Mon Sep 17 00:00:00 2001 From: "Zhang.WH" Date: Thu, 20 Feb 2025 11:25:43 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=B1=BB=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 From b53272714bf0da1d9b71ea59a140c025adb5d831 Mon Sep 17 00:00:00 2001 From: "Zhang.WH" Date: Thu, 20 Feb 2025 11:39:12 +0800 Subject: [PATCH 02/17] =?UTF-8?q?dto=E8=A1=A5=E5=85=85=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchaseInventoryController.java | 5 ++--- .../dto/InventoryReceiptDto.java | 18 ++++++++++++++++++ .../InventoryManage/dto/SupplySearchParam.java | 17 +++++++++++++++++ 3 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/InventoryReceiptDto.java create mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/SupplySearchParam.java 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 24f7b738..a12d3aa9 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 @@ -1,17 +1,16 @@ /* * Copyright ©2023 CJB-CNIT Team. All rights reserved */ -package com.openhis.web.InventoryManage.controller; +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.web.inventoryManage.dto.SupplySearchParam; import com.openhis.workflow.domain.SupplyRequest; import lombok.AllArgsConstructor; diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/InventoryReceiptDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/InventoryReceiptDto.java new file mode 100644 index 00000000..07a1a179 --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/InventoryReceiptDto.java @@ -0,0 +1,18 @@ +/* + * Copyright ©2023 CJB-CNIT Team. All rights reserved + */ +package com.openhis.web.inventoryManage.dto; + +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 入库单据分页列表 dto + * + * @author zwh + * @date 2025-02-18 + */ +@Data +@Accessors(chain = true) +public class InventoryReceiptDto { +} diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/SupplySearchParam.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/SupplySearchParam.java new file mode 100644 index 00000000..b4d0b194 --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/SupplySearchParam.java @@ -0,0 +1,17 @@ +/* + * Copyright ©2023 CJB-CNIT Team. All rights reserved + */ +package com.openhis.web.inventoryManage.dto; + +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 入库单据分页查询条件 + * + * @author zwh + * @date 2025-02-18 + */ +@Data +@Accessors(chain = true) +public class SupplySearchParam {} From 1f2a5e1f7c78f3865dfcd503c967d88d6036888a Mon Sep 17 00:00:00 2001 From: "Zhang.YC" Date: Thu, 20 Feb 2025 16:43:23 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E7=AE=80=E5=8D=95demo=20=20=E4=BB=85=E4=BD=9C=E7=A4=BA?= =?UTF-8?q?=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchaseInventoryController.java | 39 ++++++++++--- .../InventoryManage/dto/SupplyRequestDto.java | 57 +++++++++++++++++++ .../service/IChargeItemService.java | 7 +++ .../service/impl/ChargeItemServiceImpl.java | 20 +++++++ 4 files changed, 116 insertions(+), 7 deletions(-) create mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/SupplyRequestDto.java 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 a12d3aa9..f871bb9e 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 @@ -1,17 +1,22 @@ /* * Copyright ©2023 CJB-CNIT Team. All rights reserved */ -package com.openhis.web.inventoryManage.controller; +package com.openhis.web.InventoryManage.controller; import javax.servlet.http.HttpServletRequest; -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.core.common.core.domain.R; +import com.core.common.utils.bean.BeanUtils; +import com.openhis.administration.domain.ChargeItem; +import com.openhis.administration.service.IChargeItemService; +import com.openhis.web.InventoryManage.dto.SupplyRequestDto; import com.openhis.web.inventoryManage.dto.SupplySearchParam; import com.openhis.workflow.domain.SupplyRequest; +import com.openhis.workflow.service.ISupplyRequestService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -30,6 +35,8 @@ public class PurchaseInventoryController { private final ISupplyRequestService supplyRequestService; + private final IChargeItemService chargeItemService; + /** * 入库单据分页列表 * @@ -45,7 +52,7 @@ public class PurchaseInventoryController { @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) { // 查询supply_request相关信息并返回分页列表 - return supplyRequestService.page(new Page<>(pageNo,pageSize)); + return supplyRequestService.page(new Page<>(pageNo, pageSize)); } // 添加入库单据之前需要 @@ -57,14 +64,32 @@ public class PurchaseInventoryController { /** * 添加入库单据（生成供应请求） * - * @param supplyRequest 供应请求信息 + * @param supplyRequestDto 供应请求信息 */ @PostMapping("/add-supply-request") - public void addSupplyRequest(@Validated @RequestBody SupplyRequest supplyRequest) { + public R addSupplyRequest(@Validated @RequestBody SupplyRequestDto supplyRequestDto) { // 生成待发送的入库单据supply_request - // 生成收费项目charge_item + SupplyRequest supplyRequest = new SupplyRequest(); + BeanUtils.copyProperties(supplyRequestDto, supplyRequest); + // 如果业务上不需要其它处理 直接调用service的保存方法 + boolean saveSupplyRequestSuccess = supplyRequestService.save(supplyRequest); - // 如果采购单价被修改了，需要根据批次号更新采购单价子表价格 + if (!saveSupplyRequestSuccess) { + return R.fail(); + } + // 生成收费项目charge_item + ChargeItem chargeItem = new ChargeItem(); + // 如果字段很少建议手动set赋值 + chargeItem.setUnitPrice(supplyRequestDto.getUnitPrice()); + boolean saveChargeItemSuccess = chargeItemService.saveChargeItem(chargeItem); + // 如果采购单价被修改了，需要根据批次号更新采购单价子表价格、 + + // if (saveChargeItemSuccess) { + // return R.ok(); + // } else { + // return R.fail(); + // } + return saveChargeItemSuccess ? R.ok() : R.fail(); } /** diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/SupplyRequestDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/SupplyRequestDto.java new file mode 100644 index 00000000..3cdf9ba0 --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/SupplyRequestDto.java @@ -0,0 +1,57 @@ +/* + * Copyright ©2023 CJB-CNIT Team. All rights reserved + */ +package com.openhis.web.InventoryManage.dto; + +import lombok.Data; +import lombok.experimental.Accessors; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * @author ZhangYC + * @date 2025-02-20 + */ +@Data +@Accessors(chain = true) +public class SupplyRequestDto { + + /** 项目 */ + private String itemTable; + + /** 数量 */ + private Integer itemQuantity; + + /** 物品编码 */ + private Long code; + + /** 物品计量单位 */ + private String unitIdCode; + + /** 物品数量 */ + private Integer unitQuantity; + + /** 请求细节 */ + private String detailJson; + + /** 期望时间 */ + private Date occurrenceTime; + + /** 供应人 */ + private Long practitionerId; + + /** 供应商 */ + private Long supplierId; + + /** 单位 */ + private Long quantityUnit; + + /** 单价 */ + private BigDecimal unitPrice; + + /** 总价 */ + private BigDecimal totalPrice; + + +} diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemService.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemService.java index af7fbc4e..da035ff1 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemService.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemService.java @@ -1,6 +1,7 @@ package com.openhis.administration.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.core.common.core.domain.R; import com.openhis.administration.domain.ChargeItem; /** @@ -11,4 +12,10 @@ import com.openhis.administration.domain.ChargeItem; */ public interface IChargeItemService extends IService { + /** + * 保存chargeItem相关信息 + * @return 保存结果 + */ + boolean saveChargeItem(ChargeItem chargeItem); + } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemServiceImpl.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemServiceImpl.java index bf8d9c14..e8b5dbe3 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemServiceImpl.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemServiceImpl.java @@ -1,5 +1,7 @@ package com.openhis.administration.service.impl; +import com.core.common.utils.DateUtils; +import com.core.common.utils.StringUtils; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -7,6 +9,8 @@ import com.openhis.administration.domain.ChargeItem; import com.openhis.administration.mapper.ChargeItemMapper; import com.openhis.administration.service.IChargeItemService; +import lombok.AllArgsConstructor; + /** * 费用项管理Service业务层处理 * @@ -14,6 +18,22 @@ import com.openhis.administration.service.IChargeItemService; * @date 2025-02-20 */ @Service +@AllArgsConstructor public class ChargeItemServiceImpl extends ServiceImpl implements IChargeItemService { + private final ChargeItemMapper chargeItemMapper; + + /** + * 保存chargeItem相关信息 + * + * @return + */ + @Override + public boolean saveChargeItem(ChargeItem chargeItem) { + // 假设此处有业务相关处理 + if (chargeItem.getCode() == null){ + return false; + } + return chargeItemMapper.insert(chargeItem) > 0; + } } \ No newline at end of file From e42aff436a134c38ddacd4d8bee1154c78f23dc2 Mon Sep 17 00:00:00 2001 From: Zhuangxingyu Date: Thu, 20 Feb 2025 17:57:52 +0800 Subject: [PATCH 04/17] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A0=B7=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchaseInventoryController.java | 14 +- .../dto/SupplySaveRequestDto.java | 193 ++++++++++++++++++ .../service/IChargeItemService.java | 9 +- .../service/impl/ChargeItemServiceImpl.java | 21 ++ 4 files changed, 234 insertions(+), 3 deletions(-) create mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/SupplySaveRequestDto.java 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 f871bb9e..ac99d23e 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 @@ -5,6 +5,7 @@ package com.openhis.web.InventoryManage.controller; import javax.servlet.http.HttpServletRequest; +import com.openhis.web.InventoryManage.dto.SupplySaveRequestDto; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -95,12 +96,21 @@ public class PurchaseInventoryController { /** * 编辑入库单据 * - * @param supplyRequest 供应请求信息 + * @param supplySaveRequestDto 供应请求信息 */ @PutMapping("/edit-supply-request") - public void editSupplyRequest(@Validated @RequestBody SupplyRequest supplyRequest) { + public R editSupplyRequest(@Validated @RequestBody SupplySaveRequestDto supplySaveRequestDto) { // 更新supply_request信息 + SupplyRequest saveRequest = new SupplyRequest(); + BeanUtils.copyProperties(supplySaveRequestDto, saveRequest); + if (!supplyRequestService.updateById(saveRequest)) { + return R.fail(); + } // 更新收费项目charge_item + ChargeItem chargeItem = new ChargeItem(); + BeanUtils.copyProperties(supplySaveRequestDto, chargeItem); + chargeItem.setId(supplySaveRequestDto.getChargeItemId()); + return chargeItemService.updateChargeItem(chargeItem) ? R.ok() : R.fail(); } /** diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/SupplySaveRequestDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/SupplySaveRequestDto.java new file mode 100644 index 00000000..dc606fac --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/SupplySaveRequestDto.java @@ -0,0 +1,193 @@ +/* + * Copyright ©2023 CJB-CNIT Team. All rights reserved + */ +package com.openhis.web.InventoryManage.dto; + +import java.math.BigDecimal; +import java.util.Date; + +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 更新dto + * + * @author zxy + * @date 2025-02-20 + */ +@Data +@Accessors(chain = true) +public class SupplySaveRequestDto { + /** ID */ + private Long id; + + /** 类型 */ + private Integer typeEnum; + + /** 状态 */ + private Integer statusEnum; + + /** 意图 */ + private Integer intentEnum; + + /** 分类 */ + private Integer categoryEnum; + + /** 优先权 */ + private Integer priorityEnum; + + /** 汇总编号 */ + private Long summaryId; + + /** 交付 */ + private Long deliverId; + + /** 患者id */ + private Long patientId; + + /** 发放实体表名 */ + private String dispenseTable; + + /** 发放id */ + private Long dispenseId; + + /** 项目 */ + private String itemTable; + + /** 数量 */ + private Integer itemQuantity; + + /** 物品编码 */ + private Long code; + + /** 物品计量单位 */ + private String unitIdCode; + + /** 物品数量 */ + private Integer unitQuantity; + + /** 请求细节 */ + private String detailJson; + + /** 期望时间 */ + private Date occurrenceTime; + + /** 供应人 */ + private Long practitionerId; + + /** 供应商 */ + private Long supplierId; + + /** 理由 */ + private String reason; + + /** 源仓库类型 */ + private Integer sourceType; + + /** 源仓库 */ + private Long sourceLocationId; + + /** 源仓位 */ + private Long sourceLocationStoreId; + + /** 目的类型 */ + private Integer purposeType; + + /** 目的仓库 */ + private Long purposeLocationId; + + /** 目的仓位 */ + private Long purposeLocationStoreId; + + /** 审批人 */ + private Long approverId; + + /** 审批时间 */ + private Date approvalTime; + + /** 申请人 */ + private Long applicantId; + + /** 申请时间 */ + private Date applyTime; + + /** 删除状态 */ + private Integer deleteFlag; + + // =======chargeItem实体============ + + /** ID */ + private Long chargeItemId; + + /** 类别 */ + private Integer context; + + /** 就诊ID */ + private Long encounterId; + + /** 执行人Id */ + private Long performer; + + /** 执行科室 */ + private Long performingOrgId; + + /** 开立科室 */ + private Long requestingOrgId; + + /** 成本科室 */ + private Long costOrgId; + + /** 数量 */ + private Long quantityValue; + + /** 单位 */ + private Long quantityUnit; + + /** 单价 */ + private BigDecimal unitPrice; + + /** 总价 */ + private BigDecimal totalPrice; + + /** 费用定价ID */ + private Long definitionId; + + /** applicability表主键 */ + private Long applicabilityId; + + /** 原价 */ + private BigDecimal baseAmount; + + /** 折后价格 */ + private BigDecimal discountAmount; + + /** 附加价格 */ + private BigDecimal surchargeAmount; + + /** 改价原因 */ + private String overrideReasonCode; + + /** 改价原因文本 */ + private String overrideReasonText; + + /** 开立人ID */ + private Long entererId; + + /** 开立时间 */ + private Date enteredDate; + + /** 医疗服务类型 */ + private String serviceTable; + + /** 医疗服务ID */ + private Long serviceId; + + /** 索赔结果 */ + private Integer claimStateEnum; + + /** 关联账户ID */ + private Long accountId; + + /** 机构 */ + private String orgCode; +} diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemService.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemService.java index da035ff1..0625b832 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemService.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemService.java @@ -1,7 +1,6 @@ package com.openhis.administration.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.core.common.core.domain.R; import com.openhis.administration.domain.ChargeItem; /** @@ -14,8 +13,16 @@ public interface IChargeItemService extends IService { /** * 保存chargeItem相关信息 + * * @return 保存结果 */ boolean saveChargeItem(ChargeItem chargeItem); + /** + * 更新收费项目 + * + * @param chargeItem 更新内容 + * @return 更新结果 + */ + boolean updateChargeItem(ChargeItem chargeItem); } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemServiceImpl.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemServiceImpl.java index e8b5dbe3..79518c8c 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemServiceImpl.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemServiceImpl.java @@ -36,4 +36,25 @@ public class ChargeItemServiceImpl extends ServiceImpl 0; } + + /** + * 更新收费项目 + * + * @param chargeItem 更新内容 + * @return 更新结果 + */ + @Override + public boolean updateChargeItem(ChargeItem chargeItem) { + //更新样例 一切以实际为主 + if (chargeItem.getId() != null) { + //获取更新前收费项目，避免更新导致数据库崩溃 + if(chargeItemMapper.selectById(chargeItem.getId()) == null){ + return false; + } else { + return chargeItemMapper.updateById(chargeItem)>0; + } + } else { + return false; + } + } } \ No newline at end of file From 1e45775c1c69475bcd6236fa20e47968866fbc4c Mon Sep 17 00:00:00 2001 From: "Wang.Huan" Date: Thu, 20 Feb 2025 18:30:39 +0800 Subject: [PATCH 05/17] =?UTF-8?q?=E5=B0=81=E8=A3=85=E6=96=87=E8=A8=80?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/core/common/utils/MessageUtils.java | 9 ++++ .../core/common/utils/SpringContextUtils.java | 38 +++++++++++++++ .../PurchaseInventoryController.java | 8 ++++ .../src/main/resources/application.yml | 4 ++ .../main/resources/i18n/messages.properties | 4 ++ .../common/constant/PromptMsgConstant.java | 48 +++++++++++++++++++ 6 files changed, 111 insertions(+) create mode 100644 openhis-server/core-common/src/main/java/com/core/common/utils/SpringContextUtils.java create mode 100644 openhis-server/openhis-common/src/main/java/com/openhis/common/constant/PromptMsgConstant.java diff --git a/openhis-server/core-common/src/main/java/com/core/common/utils/MessageUtils.java b/openhis-server/core-common/src/main/java/com/core/common/utils/MessageUtils.java index 4cf48caf..1be2b0b0 100644 --- a/openhis-server/core-common/src/main/java/com/core/common/utils/MessageUtils.java +++ b/openhis-server/core-common/src/main/java/com/core/common/utils/MessageUtils.java @@ -4,6 +4,9 @@ import org.springframework.context.MessageSource; import org.springframework.context.i18n.LocaleContextHolder; import com.core.common.utils.spring.SpringUtils; +import org.springframework.lang.Nullable; + +import java.util.Locale; /** * 获取i18n资源文件 @@ -22,4 +25,10 @@ public class MessageUtils { MessageSource messageSource = SpringUtils.getBean(MessageSource.class); return messageSource.getMessage(code, args, LocaleContextHolder.getLocale()); } + + public static String createMessage(String id, @Nullable Object[] params) { + MessageSource messageSource = (MessageSource) SpringContextUtils.getApplicationContext().getBean(MessageSource.class); + String messageConvert = messageSource.getMessage(id, params, Locale.getDefault()); + return messageConvert; + } } diff --git a/openhis-server/core-common/src/main/java/com/core/common/utils/SpringContextUtils.java b/openhis-server/core-common/src/main/java/com/core/common/utils/SpringContextUtils.java new file mode 100644 index 00000000..acfa683e --- /dev/null +++ b/openhis-server/core-common/src/main/java/com/core/common/utils/SpringContextUtils.java @@ -0,0 +1,38 @@ +package com.core.common.utils; + + +import org.springframework.beans.BeansException; +import org.springframework.context.ApplicationContext; +import org.springframework.context.ApplicationContextAware; +import org.springframework.stereotype.Component; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +@Component +public class SpringContextUtils implements ApplicationContextAware { + + private static ApplicationContext applicationContext; + + public SpringContextUtils() { + } + + public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { + SpringContextUtils.applicationContext = applicationContext; + } + + public static ApplicationContext getApplicationContext() { + return applicationContext; + } + + public static HttpServletRequest getHttpServletRequest() { + return ((ServletRequestAttributes)RequestContextHolder.getRequestAttributes()).getRequest(); + } + + public static HttpServletResponse getHttpServletResponse() { + return ((ServletRequestAttributes)RequestContextHolder.getRequestAttributes()).getResponse(); + } + +} 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 ac99d23e..e25580ca 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 @@ -5,6 +5,8 @@ package com.openhis.web.InventoryManage.controller; import javax.servlet.http.HttpServletRequest; +import com.core.common.utils.MessageUtils; +import com.openhis.common.constant.PromptMsgConstant; import com.openhis.web.InventoryManage.dto.SupplySaveRequestDto; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -38,6 +40,12 @@ public class PurchaseInventoryController { private final IChargeItemService chargeItemService; + @GetMapping(value = "/test") + public R test(){ + //return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002,new Object[] {"12345"})) ; + return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00002,new Object[] {"12345"})) ; + } + /** * 入库单据分页列表 * diff --git a/openhis-server/openhis-application/src/main/resources/application.yml b/openhis-server/openhis-application/src/main/resources/application.yml index 3e0f5b9e..4144e50a 100644 --- a/openhis-server/openhis-application/src/main/resources/application.yml +++ b/openhis-server/openhis-application/src/main/resources/application.yml @@ -87,6 +87,10 @@ spring: max-active: 8 # #连接池最大阻塞等待时间（使用负值表示没有限制） max-wait: -1ms + # 文言 + messages: + basename: i18n/general_message/messages + encoding: utf-8 # token配置 token: diff --git a/openhis-server/openhis-application/src/main/resources/i18n/messages.properties b/openhis-server/openhis-application/src/main/resources/i18n/messages.properties index dbd997bd..ecbbd07e 100644 --- a/openhis-server/openhis-application/src/main/resources/i18n/messages.properties +++ b/openhis-server/openhis-application/src/main/resources/i18n/messages.properties @@ -31,3 +31,7 @@ no.update.permission=您没有修改数据的权限，请联系管理员添加 no.delete.permission=您没有删除数据的权限，请联系管理员添加权限 [{0}] no.export.permission=您没有导出数据的权限，请联系管理员添加权限 [{0}] no.view.permission=您没有查看数据的权限，请联系管理员添加权限 [{0}] + + + +apl.common.M00002={0}保存成功 \ No newline at end of file diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/constant/PromptMsgConstant.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/constant/PromptMsgConstant.java new file mode 100644 index 00000000..8fc65117 --- /dev/null +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/constant/PromptMsgConstant.java @@ -0,0 +1,48 @@ +package com.openhis.common.constant; + +/** + * APL消息ID常量类 + */ +public interface PromptMsgConstant { + + /** + * 共用 + */ + interface Common { + /** + * {0}添加成功 + */ + String M00001 = "apl.common.M00001"; + /** + * {0}保存成功 + */ + String M00002 = "apl.common.M00002"; + /** + * {0}已经存在 + */ + String M00003 = "apl.common.M00003"; + /** + * {0}操作成功 + */ + String M00004 = "apl.common.M00004"; + /** + * {0}删除成功 + */ + String M00005 = "apl.common.M00005"; + /** + * 操作失败,该数据已被他人删除,请刷新后重试 + */ + String M00006 = "apl.common.M00006"; + /** + * 操作失败,该数据已被他人更改,请刷新后重试 + */ + String M00007 = "apl.common.M00007"; + /** + * 请勿重复提交 + */ + String M00008 = "apl.common.M00008"; + + } + + +} From efc5c6ecd695cdb2ae479398c211dd2de9aeed72 Mon Sep 17 00:00:00 2001 From: "Zhang.YC" Date: Thu, 20 Feb 2025 18:59:47 +0800 Subject: [PATCH 06/17] =?UTF-8?q?=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchaseInventoryController.java | 35 +++++++++++++++---- 1 file changed, 29 insertions(+), 6 deletions(-) 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 e25580ca..10ef9816 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 @@ -5,18 +5,19 @@ package com.openhis.web.InventoryManage.controller; import javax.servlet.http.HttpServletRequest; -import com.core.common.utils.MessageUtils; -import com.openhis.common.constant.PromptMsgConstant; -import com.openhis.web.InventoryManage.dto.SupplySaveRequestDto; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +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; import com.openhis.administration.domain.ChargeItem; import com.openhis.administration.service.IChargeItemService; +import com.openhis.common.constant.PromptMsgConstant; import com.openhis.web.InventoryManage.dto.SupplyRequestDto; +import com.openhis.web.InventoryManage.dto.SupplySaveRequestDto; import com.openhis.web.inventoryManage.dto.SupplySearchParam; import com.openhis.workflow.domain.SupplyRequest; import com.openhis.workflow.service.ISupplyRequestService; @@ -41,9 +42,9 @@ public class PurchaseInventoryController { private final IChargeItemService chargeItemService; @GetMapping(value = "/test") - public R test(){ - //return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002,new Object[] {"12345"})) ; - return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00002,new Object[] {"12345"})) ; + public R test() { + // return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002,new Object[] {"12345"})) ; + return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"12345"})); } /** @@ -121,6 +122,28 @@ public class PurchaseInventoryController { return chargeItemService.updateChargeItem(chargeItem) ? R.ok() : R.fail(); } + /** + * 删除方法 + * + * @param supplyRequestId 主表id + */ + @DeleteMapping("/delete-supply-request") + public R deleteSupplyRequest(@RequestParam Long supplyRequestId) { + // 全都是逻辑删除 + // 通过id将supply_request表的delFlag更新为1 + boolean deleteSuccess = supplyRequestService.update(new LambdaUpdateWrapper() + .eq(SupplyRequest::getId, supplyRequestId).set(SupplyRequest::getDeleteFlag, 1)); + + if (!deleteSuccess) { + return R.fail(); + } + + boolean deleteChargeItemSuccess = chargeItemService.update(new LambdaUpdateWrapper() + .eq(ChargeItem::getServiceId, supplyRequestId).set(ChargeItem::getDeleteFlag, 1)); + + return deleteChargeItemSuccess ? R.ok() : R.fail(); + } + /** * 单据提交申请 * From 62c2a8ac9237cd635db2e0c926d2a6732399698c Mon Sep 17 00:00:00 2001 From: "Zhang.WH" Date: Thu, 20 Feb 2025 19:00:33 +0800 Subject: [PATCH 07/17] =?UTF-8?q?demo=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assembler/PurchaseInventoryAssembler.java | 65 ++++++++++++++++ .../PurchaseInventoryController.java | 69 +++++++++++++++-- .../dto/InventoryReceiptDto.java | 74 ++++++++++++++++++- .../dto/SupplySearchParam.java | 6 +- .../common/constant/MessageConstants.java | 15 ++++ .../com/openhis/common/enums/DelFlag.java | 12 ++- .../service/IMedicationService.java | 11 +++ .../service/impl/MedicationServiceImpl.java | 26 +++++++ .../service/ISupplyRequestService.java | 8 ++ .../impl/SupplyRequestServiceImpl.java | 34 ++++++++- 10 files changed, 308 insertions(+), 12 deletions(-) create mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/assembler/PurchaseInventoryAssembler.java create mode 100644 openhis-server/openhis-common/src/main/java/com/openhis/common/constant/MessageConstants.java diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/assembler/PurchaseInventoryAssembler.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/assembler/PurchaseInventoryAssembler.java new file mode 100644 index 00000000..bb70daa5 --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/assembler/PurchaseInventoryAssembler.java @@ -0,0 +1,65 @@ +/* + * Copyright ©2023 CJB-CNIT Team. All rights reserved + */ +package com.openhis.web.inventoryManage.assembler; + +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.openhis.administration.domain.Patient; +import com.openhis.medication.domain.Medication; +import com.openhis.web.inventoryManage.dto.InventoryReceiptDto; +import com.openhis.workflow.domain.SupplyRequest; + +/** + * 采购入库相关dto转换器 + * + * @author zwh + * @date 2025-02-20 + */ +public class PurchaseInventoryAssembler { + + /** + * 装配【入库单据分页列表DTO】分页 + * + * @param supplyRequestPage 【供应申请管理Entity实体】分页 + * @param medicationList 【药品基本信息管理Entity实体】列表 + * @param patientList【患者管理Entity实体】列表 + * @return 【入库单据分页列表DTO】分页 + */ + public static Page assembleInventoryReceiptDto(Page supplyRequestPage, + List medicationList, List patientList) { + + // 将查询到的【药品基本信息管理】列表，作成以ID为Key的Map + Map medicationMap = + medicationList.stream().collect(Collectors.toMap(Medication::getId, Function.identity())); + + // 将查询到的【患者管理】列表，作成以ID为Key的Map + Map patientMap = + patientList.stream().collect(Collectors.toMap(Patient::getId, Function.identity())); + + // 定义【入库单据分页列表DTO】的分页，传入【页码】、【行数】、及上面分页的【总数】 + Page returnPage = + new Page<>(supplyRequestPage.getCurrent(), supplyRequestPage.getSize(), supplyRequestPage.getTotal()); + + // 将【供应申请管理】的分页转化为返回【入库单据分页列表DTO】的分页 + returnPage.setRecords(supplyRequestPage.getRecords().stream().map(entity -> { + // 定义【入库单据分页列表DTO】 + InventoryReceiptDto dto = new InventoryReceiptDto(); + // 从主表COPY需要的字段 + dto.setId(entity.getId()); + dto.setCategoryEnum(1); + // 从【药品基本信息管理】Map取值，设置【药品基本信息管理】返回实体 + dto.setMedication(medicationMap.getOrDefault(entity.getDispenseId(), null)); + // 从【患者管理】Map取值，设置【患者管理】返回实体 + dto.setPatient(patientMap.getOrDefault(entity.getPatientId(), null)); + return dto; + }).collect(Collectors.toList())); + + // 返回【入库单据分页列表DTO】分页 + return returnPage; + } +} 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 a12d3aa9..074fcf0f 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,17 +3,27 @@ */ package com.openhis.web.inventoryManage.controller; +import java.util.List; +import java.util.stream.Collectors; + import javax.servlet.http.HttpServletRequest; -import com.openhis.workflow.service.ISupplyRequestService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.core.common.core.domain.R; +import com.core.common.utils.bean.BeanUtils; +import com.openhis.administration.domain.Patient; +import com.openhis.administration.service.IPatientService; +import com.openhis.medication.domain.Medication; +import com.openhis.medication.service.IMedicationService; +import com.openhis.web.inventoryManage.assembler.PurchaseInventoryAssembler; import com.openhis.web.inventoryManage.dto.SupplySearchParam; import com.openhis.workflow.domain.SupplyRequest; +import com.openhis.workflow.service.ISupplyRequestService; -import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; /** @@ -23,12 +33,15 @@ import lombok.extern.slf4j.Slf4j; * @date 2025-02-18 */ @RestController -@RequestMapping("/purchase-inventory") +@RequestMapping("/inventory-manage-purchase") @Slf4j -@AllArgsConstructor public class PurchaseInventoryController { - - private final ISupplyRequestService supplyRequestService; + @Autowired + private ISupplyRequestService supplyRequestService; + @Autowired + private IMedicationService medicationService; + @Autowired + private IPatientService patientService; /** * 入库单据分页列表 @@ -83,9 +96,53 @@ public class PurchaseInventoryController { * * @param supplyRequest 供应请求信息 */ + @PutMapping("/submit-examine") public void submitExamine(SupplyRequest supplyRequest) { // 更改供应请求单据状态 // 生成供应分发supply_delivery } + + /** + * 入库单据详情列表 + * + * @param supplySearchParam 查询条件 + * @param pageNo 当前页码 + * @param pageSize 查询条数 + * @param request 请求数据 + * @return 入库单据分页列表 + */ + @GetMapping(value = "/inventory-receipt-page") + public R getDetailPage(SupplySearchParam supplySearchParam, + @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) { + + // 数据初始化 + Medication medication = new Medication(); + BeanUtils.copyProperties(supplySearchParam, medication); + + SupplyRequest supplyRequest = new SupplyRequest(); + BeanUtils.copyProperties(supplySearchParam, supplyRequest); + + // 获取供应请求信息 + + // ==================================================================================== + + // 查询【供应申请管理】分页列表 + Page supplyRequestPage = supplyRequestService.getPage(supplyRequest, pageNo, pageSize); + + // 根据【发放id】查询【药品基本信息管理】列表 + List medicationList = medicationService.listByIds( + supplyRequestPage.getRecords().stream().map(SupplyRequest::getDispenseId).collect(Collectors.toList())); + + // 根据【患者id】查询【患者管理】列表 + List patientList = patientService.listByIds( + supplyRequestPage.getRecords().stream().map(SupplyRequest::getPatientId).collect(Collectors.toList())); + + // 装配并返回【入库单据分页列表DTO】分页 + return R.ok( + PurchaseInventoryAssembler.assembleInventoryReceiptDto(supplyRequestPage, medicationList, patientList), + "查询成功"); + + } } diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/InventoryReceiptDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/InventoryReceiptDto.java index 07a1a179..c0229305 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/InventoryReceiptDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/InventoryReceiptDto.java @@ -3,6 +3,13 @@ */ package com.openhis.web.inventoryManage.dto; +import java.io.Serializable; +import java.util.Date; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.openhis.administration.domain.Patient; +import com.openhis.medication.domain.Medication; import lombok.Data; import lombok.experimental.Accessors; @@ -14,5 +21,70 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -public class InventoryReceiptDto { +public class InventoryReceiptDto implements Serializable { + + /** ID */ + @TableId(type = IdType.ASSIGN_ID) + private Long id; + + /** 类型 */ + private Integer typeEnum; + + /** 状态 */ + private Integer statusEnum; + + /** 意图 */ + private Integer intentEnum; + + /** 分类 */ + private Integer categoryEnum; + + /** 优先权 */ + private Integer priorityEnum; + + /** 汇总编号 */ + private Long summaryId; + + /** 交付 */ + private Long deliverId; + + /** 患者id */ + private Long patientId; + + /** 发放实体表名 */ + private String dispenseTable; + + /** 发放id */ + private Long dispenseId; + + /** 期望时间 */ + private Date occurrenceTime; + + /** 供应人 */ + private Long practitionerId; + + /** 供应商 */ + private Long supplierId; + + /** 理由 */ + private String reason; + + /** 源仓库类型 */ + private Integer sourceType; + + /** 源仓库 */ + private Long sourceLocationId; + + /** 源仓位 */ + private Long sourceLocationStoreId; + + /** 目的类型 */ + private Integer purposeType; + + /** 药品基本信息管理Entity实体 */ + private Medication medication; + + /** 患者管理Entity实体 */ + private Patient patient; + } diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/SupplySearchParam.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/SupplySearchParam.java index b4d0b194..711cd6e9 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/SupplySearchParam.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/SupplySearchParam.java @@ -3,6 +3,8 @@ */ package com.openhis.web.inventoryManage.dto; +import java.io.Serializable; + import lombok.Data; import lombok.experimental.Accessors; @@ -14,4 +16,6 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -public class SupplySearchParam {} +public class SupplySearchParam implements Serializable { + +} diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/constant/MessageConstants.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/constant/MessageConstants.java new file mode 100644 index 00000000..de7517a0 --- /dev/null +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/constant/MessageConstants.java @@ -0,0 +1,15 @@ +/* + * Copyright ©2023 CJB-CNIT Team. All rights reserved + */ +package com.openhis.common.constant; + +/** + * 共同文言 + * + * @author zwh + * @date 2025-02-20 + */ +public class MessageConstants { + + +} diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/DelFlag.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/DelFlag.java index 0dab1092..50c69358 100644 --- a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/DelFlag.java +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/DelFlag.java @@ -9,16 +9,18 @@ public enum DelFlag { /** * 未删除 */ - NO("0", "未删除"), + NO(0, "0", "未删除"), /** * 已删除 */ - YES("1", "已删除"); + YES(1, "1", "已删除"); + private final Integer value; private final String code; private final String info; - DelFlag(String code, String info) { + DelFlag(Integer value, String code, String info) { + this.value = value; this.code = code; this.info = info; } @@ -30,4 +32,8 @@ public enum DelFlag { public String getInfo() { return info; } + + public Integer getValue() { + return value; + } } diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationService.java b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationService.java index 082774d7..7db98470 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationService.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationService.java @@ -1,7 +1,11 @@ package com.openhis.medication.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.core.common.core.domain.R; import com.openhis.medication.domain.Medication; +import com.openhis.workflow.domain.SupplyRequest; + +import java.util.List; /** * 药品基本信息管理Service接口 @@ -11,4 +15,11 @@ import com.openhis.medication.domain.Medication; */ public interface IMedicationService extends IService { + /** + * 查询药品信息列表 + * + * @param medicationIdList 药品id列表 + * @return 药品信息列表 + */ + List getList(List medicationIdList); } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationServiceImpl.java b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationServiceImpl.java index 32acbdae..7b59a921 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationServiceImpl.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationServiceImpl.java @@ -1,19 +1,45 @@ package com.openhis.medication.service.impl; +import java.util.List; + import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.openhis.common.enums.DelFlag; import com.openhis.medication.domain.Medication; import com.openhis.medication.mapper.MedicationMapper; import com.openhis.medication.service.IMedicationService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; + /** * 药品基本信息管理Service业务层处理 * * @author system * @date 2025-02-20 */ +@Slf4j @Service +@AllArgsConstructor public class MedicationServiceImpl extends ServiceImpl implements IMedicationService { + /** + * 查询药品信息列表 + * + * @param medicationIdList 药品id列表 + * @return 药品信息列表 + */ + @Override + public List getList(List medicationIdList) { + + // 判断是否为空 + if (!medicationIdList.isEmpty()) { + // 查询药品相关信息列表并返回 + return baseMapper.selectList(new LambdaQueryWrapper() + .eq(Medication::getDeleteFlag, DelFlag.NO.getValue()).in(Medication::getId, medicationIdList)); + } + return null; + } } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/ISupplyRequestService.java b/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/ISupplyRequestService.java index 4962d11e..e132289d 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/ISupplyRequestService.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/ISupplyRequestService.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.SupplyRequest; @@ -11,4 +12,11 @@ import com.openhis.workflow.domain.SupplyRequest; */ public interface ISupplyRequestService extends IService { + /** + * 查询供应申请分页列表 + * + * @param supplyRequest 查询条件 + * @return 供应申请列表 + */ + Page getPage(SupplyRequest supplyRequest, Integer pageNo, Integer pageSize); } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyRequestServiceImpl.java b/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyRequestServiceImpl.java index d14ca952..96753e78 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyRequestServiceImpl.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyRequestServiceImpl.java @@ -2,18 +2,50 @@ package com.openhis.workflow.service.impl; import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.openhis.common.enums.DelFlag; import com.openhis.workflow.domain.SupplyRequest; import com.openhis.workflow.mapper.SupplyRequestMapper; import com.openhis.workflow.service.ISupplyRequestService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; + /** * 供应申请管理Service业务层处理 * * @author system * @date 2025-02-20 */ +@Slf4j @Service -public class SupplyRequestServiceImpl extends ServiceImpl implements ISupplyRequestService { +@AllArgsConstructor +public class SupplyRequestServiceImpl extends ServiceImpl + implements ISupplyRequestService { + private final SupplyRequestMapper supplyRequestMapper; + + /** + * 查询供应申请列表 + * + * @param supplyRequest 查询条件 + * @return 供应申请列表 + */ + @Override + public Page getPage(SupplyRequest supplyRequest, Integer pageNo, Integer pageSize) { + + Page supplyRequestList; + // 判断入库数量 + if (supplyRequest.getItemQuantity() != 0) { + // 查询供应申请信息列表 + supplyRequestList = supplyRequestMapper.selectPage(new Page<>(pageNo, pageSize), + new LambdaQueryWrapper().eq(SupplyRequest::getDeleteFlag, DelFlag.NO.getValue())); + } else { + return null; + } + // 返回入库信息列表 + return supplyRequestList; + } } \ No newline at end of file From 3b5f09268bd8373a902aa8811aafde7c9daa9f53 Mon Sep 17 00:00:00 2001 From: "Zhang.WH" Date: Thu, 20 Feb 2025 20:15:44 +0800 Subject: [PATCH 08/17] =?UTF-8?q?demo=E4=BC=98=E5=8C=96=EF=BC=8C=E6=96=B0?= =?UTF-8?q?=E5=A2=9Einit=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchaseInventoryController.java | 91 +++++++++++-------- ...upplyRequestDto.java => InventoryDto.java} | 2 +- .../dto/InventoryReceiptInitDto.java | 33 +++++++ ...chParam.java => InventorySearchParam.java} | 2 +- ...tDto.java => SaveInventoryReceiptDto.java} | 2 +- .../openhis/medication/domain/Medication.java | 88 +++++++++++++++++- .../medication/domain/MedicationDetail.java | 82 +++++++++++++++++ .../medication/mapper/MedicationMapper.java | 9 ++ .../service/IMedicationService.java | 8 ++ .../service/impl/MedicationServiceImpl.java | 18 +++- .../mapper/medication/MedicationMapper.xml | 38 ++++++++ 11 files changed, 328 insertions(+), 45 deletions(-) rename openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/{SupplyRequestDto.java => InventoryDto.java} (96%) create mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/InventoryReceiptInitDto.java rename openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/{SupplySearchParam.java => InventorySearchParam.java} (83%) rename openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/{SupplySaveRequestDto.java => SaveInventoryReceiptDto.java} (98%) create mode 100644 openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDetail.java 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 26720248..671b49f0 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 @@ -12,22 +12,27 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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; import com.openhis.administration.domain.ChargeItem; +import com.openhis.administration.domain.Location; import com.openhis.administration.domain.Patient; import com.openhis.administration.service.IChargeItemService; +import com.openhis.administration.service.ILocationService; import com.openhis.administration.service.IPatientService; +import com.openhis.administration.service.ISupplierService; import com.openhis.common.constant.PromptMsgConstant; import com.openhis.medication.domain.Medication; import com.openhis.medication.service.IMedicationService; import com.openhis.web.inventorymanage.assembler.PurchaseInventoryAssembler; -import com.openhis.web.inventorymanage.dto.SupplyRequestDto; -import com.openhis.web.inventorymanage.dto.SupplySaveRequestDto; -import com.openhis.web.inventorymanage.dto.SupplySearchParam; +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.workflow.domain.SupplyRequest; import com.openhis.workflow.service.ISupplyRequestService; @@ -51,11 +56,22 @@ public class PurchaseInventoryController { private IPatientService patientService; @Autowired private IChargeItemService chargeItemService; + @Autowired + private ISupplierService supplierService; + @Autowired + private ILocationService locationService; - @GetMapping(value = "/test") - public R test() { - // return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002,new Object[] {"12345"})) ; - return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"12345"})); + @GetMapping(value = "/init") + public R init() { + + InventoryReceiptInitDto initDto = new InventoryReceiptInitDto(); + // 设置供应商列表 + initDto.setSupplier(supplierService.list()) + // 设置药房列表 + .setLocation(locationService.list(new LambdaQueryWrapper().in(Location::getFormEnum, 1))) + // 药品详细 + .setMedicationDetail(medicationService.getDetailList()); + return R.ok(initDto); } // 添加入库单据之前需要 @@ -67,13 +83,13 @@ public class PurchaseInventoryController { /** * 添加入库单据（生成供应请求） * - * @param supplyRequestDto 供应请求信息 + * @param inventoryDto 供应请求信息 */ @PostMapping("/add-inventory-receipt") - public R addSupplyRequest(@Validated @RequestBody SupplyRequestDto supplyRequestDto) { + public R addSupplyRequest(@Validated @RequestBody InventoryDto inventoryDto) { // 生成待发送的入库单据supply_request SupplyRequest supplyRequest = new SupplyRequest(); - BeanUtils.copyProperties(supplyRequestDto, supplyRequest); + BeanUtils.copyProperties(inventoryDto, supplyRequest); // 如果业务上不需要其它处理 直接调用service的保存方法 boolean saveSupplyRequestSuccess = supplyRequestService.save(supplyRequest); @@ -83,7 +99,7 @@ public class PurchaseInventoryController { // 生成收费项目charge_item ChargeItem chargeItem = new ChargeItem(); // 如果字段很少建议手动set赋值 - chargeItem.setUnitPrice(supplyRequestDto.getUnitPrice()); + chargeItem.setUnitPrice(inventoryDto.getUnitPrice()); boolean saveChargeItemSuccess = chargeItemService.saveChargeItem(chargeItem); // 如果采购单价被修改了，需要根据批次号更新采购单价子表价格、 @@ -100,20 +116,20 @@ public class PurchaseInventoryController { /** * 编辑入库单据 * - * @param supplySaveRequestDto 供应请求信息 + * @param saveInventoryReceiptDto 供应请求信息 */ @PutMapping("/edit-inventory-receipt") - public R editSupplyRequest(@Validated @RequestBody SupplySaveRequestDto supplySaveRequestDto) { + public R editSupplyRequest(@Validated @RequestBody SaveInventoryReceiptDto saveInventoryReceiptDto) { // 更新supply_request信息 SupplyRequest saveRequest = new SupplyRequest(); - BeanUtils.copyProperties(supplySaveRequestDto, saveRequest); + BeanUtils.copyProperties(saveInventoryReceiptDto, saveRequest); if (!supplyRequestService.updateById(saveRequest)) { return R.fail(); } // 更新收费项目charge_item ChargeItem chargeItem = new ChargeItem(); - BeanUtils.copyProperties(supplySaveRequestDto, chargeItem); - chargeItem.setId(supplySaveRequestDto.getChargeItemId()); + BeanUtils.copyProperties(saveInventoryReceiptDto, chargeItem); + chargeItem.setId(saveInventoryReceiptDto.getChargeItemId()); return chargeItemService.updateChargeItem(chargeItem) ? R.ok() : R.fail(); } @@ -125,55 +141,40 @@ public class PurchaseInventoryController { @DeleteMapping("/delete-inventory-receipt") public R deleteSupplyRequest(@RequestParam Long supplyRequestId) { // 全都是逻辑删除 - // 通过id将supply_request表的delFlag更新为1 + // todo:拓展mybatisplus ：删除就是软删除 ，查询默认加上delFlag条件，通过传参实现查看被删除的项目 - - supplyRequestService.deletebyId(SupplyRequest::getId); - boolean deleteSuccess = supplyRequestService.update(new LambdaUpdateWrapper() - .eq(SupplyRequest::getId, supplyRequestId).set(SupplyRequest::getDeleteFlag, 1)); + boolean deleteSuccess = supplyRequestService.removeById(supplyRequestId); if (!deleteSuccess) { return R.fail(); } - boolean deleteChargeItemSuccess = chargeItemService.update(new LambdaUpdateWrapper() - .eq(ChargeItem::getServiceId, supplyRequestId).set(ChargeItem::getDeleteFlag, 1)); + boolean deleteChargeItemSuccess = chargeItemService + .remove(new LambdaUpdateWrapper().eq(ChargeItem::getServiceId, supplyRequestId)); return deleteChargeItemSuccess ? R.ok() : R.fail(); } - /** - * 单据提交申请 - * - * @param supplyRequest 供应请求信息 - */ - @PutMapping("/submit-examine") - public void submitExamine(SupplyRequest supplyRequest) { - - // 更改供应请求单据状态 - // 生成供应分发supply_delivery - } - /** * 入库单据详情列表 * - * @param supplySearchParam 查询条件 + * @param inventorySearchParam 查询条件 * @param pageNo 当前页码 * @param pageSize 查询条数 * @param request 请求数据 * @return 入库单据分页列表 */ @GetMapping(value = "/inventory-receipt-page") - public R getDetailPage(SupplySearchParam supplySearchParam, + public R getDetailPage(InventorySearchParam inventorySearchParam, @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) { // 查询条件初始化 Medication medication = new Medication(); - BeanUtils.copyProperties(supplySearchParam, medication); + BeanUtils.copyProperties(inventorySearchParam, medication); SupplyRequest supplyRequest = new SupplyRequest(); - BeanUtils.copyProperties(supplySearchParam, supplyRequest); + BeanUtils.copyProperties(inventorySearchParam, supplyRequest); // 获取供应请求信息 @@ -195,4 +196,16 @@ public class PurchaseInventoryController { .ok(PurchaseInventoryAssembler.assembleInventoryReceiptDto(supplyRequestPage, medicationList, patientList)); } + + /** + * 单据提交申请 + * + * @param supplyRequest 供应请求信息 + */ + @PutMapping("/submit-examine") + public void submitExamine(SupplyRequest supplyRequest) { + + // 更改供应请求单据状态 + // 生成供应分发supply_delivery + } } diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/SupplyRequestDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/InventoryDto.java similarity index 96% rename from openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/SupplyRequestDto.java rename to openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/InventoryDto.java index 8fa9b00a..845efe15 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/SupplyRequestDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/InventoryDto.java @@ -15,7 +15,7 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -public class SupplyRequestDto { +public class InventoryDto { /** 项目 */ private String itemTable; diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/InventoryReceiptInitDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/InventoryReceiptInitDto.java new file mode 100644 index 00000000..a322065c --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/InventoryReceiptInitDto.java @@ -0,0 +1,33 @@ +/* + * Copyright ©2023 CJB-CNIT Team. All rights reserved + */ +package com.openhis.web.inventorymanage.dto; + +import java.util.List; + +import com.openhis.administration.domain.Location; +import com.openhis.administration.domain.Supplier; +import com.openhis.medication.domain.MedicationDetail; + +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 采购入库初始化 dto + * + * @author zwh + * @date 2025-02-20 + */ +@Data +@Accessors(chain = true) +public class InventoryReceiptInitDto { + + /** 药房信息 */ + private List location; + + /** 供应商信息 */ + private List supplier; + + /** 药品详细信息 */ + private List medicationDetail; +} diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/SupplySearchParam.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/InventorySearchParam.java similarity index 83% rename from openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/SupplySearchParam.java rename to openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/InventorySearchParam.java index ab2f66c4..565c4a9b 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/SupplySearchParam.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/InventorySearchParam.java @@ -16,6 +16,6 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -public class SupplySearchParam implements Serializable { +public class InventorySearchParam implements Serializable { } diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/SupplySaveRequestDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/SaveInventoryReceiptDto.java similarity index 98% rename from openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/SupplySaveRequestDto.java rename to openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/SaveInventoryReceiptDto.java index b3c3d682..b265047f 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/SupplySaveRequestDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/SaveInventoryReceiptDto.java @@ -17,7 +17,7 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -public class SupplySaveRequestDto { +public class SaveInventoryReceiptDto { /** ID */ private Long id; diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/Medication.java b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/Medication.java index 012f4902..1a6af8b1 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/Medication.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/Medication.java @@ -6,8 +6,8 @@ import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import com.core.common.core.domain.HisBaseEntity; + import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -79,4 +79,90 @@ public class Medication extends HisBaseEntity { /** 删除状态 */ private Integer deleteFlag; + /** 药品编号 */ + private Long code; + + /** 药品名称 */ + private String name; + + /** 适用范围 */ + private Integer domainEnum; + + /** 药品版本 */ + private String version; + + /** 英文药名 */ + private String nameEn; + + /** 药品名称拼音码 */ + private String pyCode; + + /** 药品五笔码 */ + private String wbCode; + + /** 药品分类 */ + private Integer categoryCode; + + /** 商品名称 */ + private String merchandiseName; + + /** 商品名称拼音码 */ + private String merchandisePyCode; + + /** 商品五笔码 */ + private String merchandiseWbCode; + + /** 药品单位 */ + private String unitCode; + + /** 最小单位 */ + private String minUnitCode; + + /** 所含耗材 */ + private String comprisedText; + + /** 成分 */ + private String ingredient; + + /** 拆零比 */ + private BigDecimal partPercent; + + /** 剂量形式 */ + private Integer doseFrom; + + /** 批准文号 */ + private String approvalNumber; + + /** 医保是否对码 */ + private Integer ybMatchFlag; + + /** 医保编码 */ + private String ybCode; + + /** 药理作用分类 */ + private String pharmacologyCategoryCode; + + /** 是否皮试 */ + private Integer skinTestFlag; + + /** 是否为注射药物 */ + private Integer injectFlag; + + /** 生产厂家 */ + private Long manufacturerId; + + /** 供应商 */ + private Long supplyId; + + /** 是否限制使用 */ + private Integer restrictedFlag; + + /** 限制使用范围 */ + private String restrictedScope; + + /** 儿童用药标志 */ + private Integer childrenFlag; + + /** 产品特性 */ + private Integer characteristic; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDetail.java b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDetail.java new file mode 100644 index 00000000..a2848191 --- /dev/null +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDetail.java @@ -0,0 +1,82 @@ +/* + * Copyright ©2023 CJB-CNIT Team. All rights reserved + */ +package com.openhis.medication.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.core.common.core.domain.HisBaseEntity; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 药品信息详情 + * + * @author zwh + * @date 2025-02-20 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +public class MedicationDetail extends HisBaseEntity { + + /** ID */ + @TableId(type = IdType.ASSIGN_ID) + private Long id; + + /** 药品编码 */ + private Long medicationProductId; + + /** 药品状态 */ + private Integer statusEnum; + + /** 所属科室 */ + private Long orgId; + + /** 剂型 */ + private String doseFormCode; + + /** 规格 */ + private String totalVolume; + + /** 成分 */ + private String ingredientItem; + + /** 是否为活性 */ + private Integer activeFlag; + + /** 批次号 */ + private String lotNumber; + + /** 生效日期 */ + private Date effectiveDate; + + /** 到期日期 */ + private Date expirationDate; + + /** 用法 */ + private String methodCode; + + /** 用药频次 */ + private String rateCode; + + /** 单次剂量 */ + private BigDecimal dose; + + /** 剂量单位 */ + private String doseUnitCode; + + /** 单次最大剂量 */ + private BigDecimal maxUnit; + + /** 药品定义 */ + private String definition; + + /** 删除状态 */ + private Integer deleteFlag; +} diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationMapper.java b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationMapper.java index 1052572e..4f28c7cc 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationMapper.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationMapper.java @@ -1,10 +1,13 @@ package com.openhis.medication.mapper; +import com.openhis.medication.domain.MedicationDetail; import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.medication.domain.Medication; +import java.util.List; + /** * 药品基本信息管理Mapper接口 * @@ -14,4 +17,10 @@ import com.openhis.medication.domain.Medication; @Repository public interface MedicationMapper extends BaseMapper { + /** + * 查询药品详细信息列表 + * + * @return 药品详细信息列表 + */ + List selectDetailList(); } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationService.java b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationService.java index b50e3a76..96cd7038 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationService.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationService.java @@ -4,6 +4,7 @@ import java.util.List; import com.baomidou.mybatisplus.extension.service.IService; import com.openhis.medication.domain.Medication; +import com.openhis.medication.domain.MedicationDetail; /** * 药品基本信息管理Service接口 @@ -20,4 +21,11 @@ public interface IMedicationService extends IService { * @return 药品信息列表 */ List getList(List medicationIdList); + + /** + * 查询药品详细信息列表 + * + * @return 药品详细信息列表 + */ + List getDetailList(); } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationServiceImpl.java b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationServiceImpl.java index 7b59a921..4f709ad5 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationServiceImpl.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationServiceImpl.java @@ -2,16 +2,17 @@ package com.openhis.medication.service.impl; import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.common.enums.DelFlag; import com.openhis.medication.domain.Medication; +import com.openhis.medication.domain.MedicationDetail; import com.openhis.medication.mapper.MedicationMapper; import com.openhis.medication.service.IMedicationService; -import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; /** @@ -22,9 +23,11 @@ import lombok.extern.slf4j.Slf4j; */ @Slf4j @Service -@AllArgsConstructor public class MedicationServiceImpl extends ServiceImpl implements IMedicationService { + @Autowired + private MedicationMapper medicationMapper; + /** * 查询药品信息列表 * @@ -42,4 +45,15 @@ public class MedicationServiceImpl extends ServiceImpl getDetailList() { + return medicationMapper.selectDetailList(); + } + } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/medication/MedicationMapper.xml b/openhis-server/openhis-domain/src/main/resources/mapper/medication/MedicationMapper.xml index 87c5fa62..285c9a75 100644 --- a/openhis-server/openhis-domain/src/main/resources/mapper/medication/MedicationMapper.xml +++ b/openhis-server/openhis-domain/src/main/resources/mapper/medication/MedicationMapper.xml @@ -4,4 +4,42 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + \ No newline at end of file From 0cef025527ceb1d9086c8ac87046208285c312f7 Mon Sep 17 00:00:00 2001 From: "Wang.Huan" Date: Fri, 21 Feb 2025 09:22:38 +0800 Subject: [PATCH 09/17] =?UTF-8?q?=5Fcode=E5=AD=97=E6=AE=B5=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/openhis/administration/domain/Account.java | 2 +- .../src/main/java/com/openhis/administration/domain/Device.java | 2 +- .../main/java/com/openhis/administration/domain/Encounter.java | 2 +- .../com/openhis/administration/domain/EncounterParticipant.java | 2 +- .../java/com/openhis/administration/domain/EncounterReason.java | 2 +- .../com/openhis/administration/domain/HealthcareService.java | 2 +- .../main/java/com/openhis/administration/domain/Invoice.java | 2 +- .../com/openhis/administration/domain/PatientIdentifier.java | 2 +- .../main/java/com/openhis/financial/domain/PaymentNotice.java | 2 +- .../com/openhis/medication/domain/MedicationDefinition.java | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Account.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Account.java index 5b085316..6d6071fd 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Account.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Account.java @@ -35,7 +35,7 @@ public class Account extends HisBaseEntity { private Integer billingStatusEnum; /** 账户类型编码 */ - private Integer typeCode; + private String typeCode; /** 名称 */ private String name; diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Device.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Device.java index 5dcfc56b..5b90561c 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Device.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Device.java @@ -29,7 +29,7 @@ public class Device extends HisBaseEntity { private Long id; /** 器材编码 */ - private Long deviceCode; + private String deviceCode; /** 器材定义编号 */ private Long defId; diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Encounter.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Encounter.java index d7e45e3d..29a9b509 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Encounter.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Encounter.java @@ -38,7 +38,7 @@ public class Encounter extends HisBaseEntity { private String code; /** 状态编码 */ - private Integer statusCode; + private String statusCode; /** 类别编码 */ private Integer classEnum; diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterParticipant.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterParticipant.java index c7d3657a..6e57a411 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterParticipant.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterParticipant.java @@ -32,7 +32,7 @@ public class EncounterParticipant extends HisBaseEntity { private Long encounterId; /** 参与者类型 */ - private Integer typeCode; + private String typeCode; /** 开始时间 */ private Date startTiem; diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterReason.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterReason.java index 6659d0f7..54a7583a 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterReason.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterReason.java @@ -32,7 +32,7 @@ public class EncounterReason extends HisBaseEntity { private Long encounterId; /** 原因编码 */ - private Integer useCode; + private String useCode; /** 具体原因类型 */ private String valueTable; diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/HealthcareService.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/HealthcareService.java index 08d6a68d..53397cad 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/HealthcareService.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/HealthcareService.java @@ -35,7 +35,7 @@ public class HealthcareService extends HisBaseEntity { private Long offeredOrgId; /** 服务分类 */ - private Integer categoryCode; + private String categoryCode; /** 服务类型 */ private String typeCode; diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Invoice.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Invoice.java index 367d04b0..77555bdc 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Invoice.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Invoice.java @@ -53,7 +53,7 @@ public class Invoice extends HisBaseEntity { private String paymentTerms; /** 账单批次号 */ - private BigDecimal batchCode; + private String batchCode; /** 结算批次号 */ private String qrCode; diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/PatientIdentifier.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/PatientIdentifier.java index c53609a2..857c30b7 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/PatientIdentifier.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/PatientIdentifier.java @@ -29,7 +29,7 @@ public class PatientIdentifier extends HisBaseEntity { private Long id; /** 标识类型编码 */ - private Integer typeCode; + private String typeCode; /** 标识号 */ private String identifierNo; diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentNotice.java b/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentNotice.java index d85c0e04..57cb93e4 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentNotice.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentNotice.java @@ -41,7 +41,7 @@ public class PaymentNotice extends HisBaseEntity { private Long payee; /** 通知方式 */ - private Integer wayCode; + private String wayCode; /** 通知内容 */ private String content; diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDefinition.java b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDefinition.java index 90e0306c..6a286966 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDefinition.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDefinition.java @@ -50,7 +50,7 @@ public class MedicationDefinition extends HisBaseEntity { private String wbCode; /** 药品分类 */ - private Integer categoryCode; + private String categoryCode; /** 商品名称 */ private String merchandiseName; From 336cec11d7c08682cc3da2a63bf18779b03c12f8 Mon Sep 17 00:00:00 2001 From: liuhongrui Date: Fri, 21 Feb 2025 09:37:39 +0800 Subject: [PATCH 10/17] =?UTF-8?q?=E5=8C=85=E5=90=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assembler/PurchaseInventoryAssembler.java | 0 .../controller/PurchaseInventoryController.java | 0 .../{InventoryManage => inventorymanage}/dto/InventoryDto.java | 0 .../dto/InventoryReceiptDto.java | 0 .../dto/InventoryReceiptInitDto.java | 0 .../dto/InventorySearchParam.java | 0 .../dto/SaveInventoryReceiptDto.java | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename openhis-server/openhis-application/src/main/java/com/openhis/web/{InventoryManage => inventorymanage}/assembler/PurchaseInventoryAssembler.java (100%) rename openhis-server/openhis-application/src/main/java/com/openhis/web/{InventoryManage => inventorymanage}/controller/PurchaseInventoryController.java (100%) rename openhis-server/openhis-application/src/main/java/com/openhis/web/{InventoryManage => inventorymanage}/dto/InventoryDto.java (100%) rename openhis-server/openhis-application/src/main/java/com/openhis/web/{InventoryManage => inventorymanage}/dto/InventoryReceiptDto.java (100%) rename openhis-server/openhis-application/src/main/java/com/openhis/web/{InventoryManage => inventorymanage}/dto/InventoryReceiptInitDto.java (100%) rename openhis-server/openhis-application/src/main/java/com/openhis/web/{InventoryManage => inventorymanage}/dto/InventorySearchParam.java (100%) rename openhis-server/openhis-application/src/main/java/com/openhis/web/{InventoryManage => inventorymanage}/dto/SaveInventoryReceiptDto.java (100%) diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/assembler/PurchaseInventoryAssembler.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/assembler/PurchaseInventoryAssembler.java similarity index 100% rename from openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/assembler/PurchaseInventoryAssembler.java rename to openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/assembler/PurchaseInventoryAssembler.java 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 similarity index 100% rename from openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/controller/PurchaseInventoryController.java rename to openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PurchaseInventoryController.java diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/InventoryDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryDto.java similarity index 100% rename from openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/InventoryDto.java rename to openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryDto.java diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/InventoryReceiptDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryReceiptDto.java similarity index 100% rename from openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/InventoryReceiptDto.java rename to openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryReceiptDto.java diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/InventoryReceiptInitDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryReceiptInitDto.java similarity index 100% rename from openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/InventoryReceiptInitDto.java rename to openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryReceiptInitDto.java diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/InventorySearchParam.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventorySearchParam.java similarity index 100% rename from openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/InventorySearchParam.java rename to openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventorySearchParam.java diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/SaveInventoryReceiptDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/SaveInventoryReceiptDto.java similarity index 100% rename from openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/dto/SaveInventoryReceiptDto.java rename to openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/SaveInventoryReceiptDto.java From 972679ce56d3c778bb3902e55b500df49743e7be Mon Sep 17 00:00:00 2001 From: liupanting Date: Fri, 21 Feb 2025 09:55:22 +0800 Subject: [PATCH 11/17] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=8C=85=E5=BB=BA=E7=AB=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assembler/DiseaseManagementAssembler.java | 4 ++ .../DiseaseManagementController.java | 64 +++++++++++++++++++ .../web/datadictionary/dto/DiseaseInDto.java | 52 +++++++++++++++ 3 files changed, 120 insertions(+) create mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/assembler/DiseaseManagementAssembler.java create mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiseaseManagementController.java create mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseInDto.java diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/assembler/DiseaseManagementAssembler.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/assembler/DiseaseManagementAssembler.java new file mode 100644 index 00000000..ffe13843 --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/assembler/DiseaseManagementAssembler.java @@ -0,0 +1,4 @@ +package com.openhis.web.datadictionary.assembler; + +public class DiseaseManagementAssembler { +} diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiseaseManagementController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiseaseManagementController.java new file mode 100644 index 00000000..0e15ebca --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiseaseManagementController.java @@ -0,0 +1,64 @@ +package com.openhis.web.datadictionary.controller; + +import java.util.List; + +import com.core.common.utils.bean.BeanUtils; +import com.openhis.web.datadictionary.dto.DiseaseInDto; +import org.springframework.web.bind.annotation.*; + +import com.openhis.clinical.domain.ConditionDefinition; +import com.openhis.clinical.service.IConditionDefinitionService; + +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; + +/** + * TODO:病种目录 + * + * @author lpt + * @date 2025-02-20 + */ +@RestController +@RequestMapping("/DataDictionary-DiseaseManagement") +@Slf4j +@AllArgsConstructor +public class DiseaseManagementController { + private final IConditionDefinitionService iConditionDefinitionService; + + /** + * 病种目录分类查询 + * + * @return + */ + @GetMapping("/GetDiseaseCategory") + public List GetDiseaseCategory() { + return null; + } + + /** + * 病种目录查询 + * + * @param + * @return + */ + @GetMapping("/GetDiseaseList") + public List GetDiseaseList() { + return null; + } + + // 病种目录编辑 + @PutMapping("/EditDisease") + void EditDisease() {} + + // 新增外来病种目录 + @PostMapping("/AddDisease") + void AddDisease(DiseaseInDto diseaseInDto) { + ConditionDefinition conditionDefinition = new ConditionDefinition(); + BeanUtils.copyProperties(diseaseInDto,conditionDefinition); + iConditionDefinitionService.AddDisease(conditionDefinition); + } + + // 新增医保病种目录 + @PostMapping("/AddYbDisease") + void AddYbDisease(@RequestParam int id) {} +} diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseInDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseInDto.java new file mode 100644 index 00000000..1b32fbc2 --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseInDto.java @@ -0,0 +1,52 @@ +package com.openhis.web.datadictionary.dto; + +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 病种目录列表 dto + * + * @author lpt + * @date 2025-02-20 + */ +@Data +@Accessors(chain = true) +public class DiseaseInDto { + /** 所属分类 */ + private Integer sourceEnum; + + /** 编码 */ + private String code; + + /** 诊断名称 */ + private String name; + + /** 诊断名称拼音 */ + private String pyCode; + + /** 诊断名称五笔拼音 */ + private String wbCode; + + /** 类型 */ + private String typeCode; + + /** 描述 */ + private String description; + + /** 医保标记 */ + private Integer ybFlag; + + /** 医保编码 */ + private String ybCode; + + /** 医保对码标记 */ + private Integer ybMatchFlag; + + /** 状态 */ + private Integer statusEnum; + + /** 删除状态 */ + private Integer deleteFlag; + /** 租户 */ + private Integer tenantId; +} From a01d5185f71b6c25f123937c62eddc663e56fbc6 Mon Sep 17 00:00:00 2001 From: "Wang.Huan" Date: Fri, 21 Feb 2025 10:27:37 +0800 Subject: [PATCH 12/17] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8D=E5=BF=85?= =?UTF-8?q?=E8=A6=81=E7=9A=84deleteFlag=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/core/common/core/domain/HisBaseEntity.java | 2 +- .../web/inventorymanage/dto/SaveInventoryReceiptDto.java | 3 --- .../main/java/com/openhis/administration/domain/Account.java | 2 -- .../java/com/openhis/administration/domain/ChargeItem.java | 2 -- .../com/openhis/administration/domain/ChargeItemDefApp.java | 2 -- .../openhis/administration/domain/ChargeItemDefinition.java | 2 -- .../main/java/com/openhis/administration/domain/Device.java | 2 -- .../com/openhis/administration/domain/DeviceDefinition.java | 2 -- .../main/java/com/openhis/administration/domain/Encounter.java | 3 --- .../com/openhis/administration/domain/EncounterDiagnosis.java | 2 -- .../com/openhis/administration/domain/EncounterLocation.java | 2 -- .../openhis/administration/domain/EncounterParticipant.java | 2 -- .../com/openhis/administration/domain/EncounterReason.java | 2 -- .../com/openhis/administration/domain/HealthcareService.java | 2 -- .../main/java/com/openhis/administration/domain/Invoice.java | 2 -- .../main/java/com/openhis/administration/domain/Location.java | 2 -- .../java/com/openhis/administration/domain/Organization.java | 2 -- .../main/java/com/openhis/administration/domain/Patient.java | 2 -- .../com/openhis/administration/domain/PatientIdentifier.java | 2 -- .../java/com/openhis/administration/domain/Practitioner.java | 2 -- .../com/openhis/administration/domain/PractitionerRole.java | 2 -- .../main/java/com/openhis/administration/domain/Supplier.java | 2 -- .../src/main/java/com/openhis/clinical/domain/Condition.java | 2 -- .../java/com/openhis/clinical/domain/ConditionDefinition.java | 2 -- .../src/main/java/com/openhis/clinical/domain/Procedure.java | 2 -- .../java/com/openhis/clinical/domain/ProcedurePerformer.java | 2 -- .../src/main/java/com/openhis/financial/domain/Claim.java | 2 -- .../main/java/com/openhis/financial/domain/ClaimResponse.java | 2 -- .../src/main/java/com/openhis/financial/domain/Contract.java | 2 -- .../main/java/com/openhis/financial/domain/PaymentNotice.java | 2 -- .../java/com/openhis/financial/domain/PaymentRecDetail.java | 2 -- .../com/openhis/financial/domain/PaymentReconciliation.java | 2 -- .../main/java/com/openhis/medication/domain/Medication.java | 2 -- .../com/openhis/medication/domain/MedicationDefinition.java | 2 -- .../java/com/openhis/medication/domain/MedicationDetail.java | 2 -- .../java/com/openhis/medication/domain/MedicationDispense.java | 2 -- .../java/com/openhis/medication/domain/MedicationRequest.java | 2 -- .../java/com/openhis/workflow/domain/ActivityDefinition.java | 2 -- .../main/java/com/openhis/workflow/domain/DeviceDispense.java | 2 -- .../main/java/com/openhis/workflow/domain/DeviceRequest.java | 2 -- .../main/java/com/openhis/workflow/domain/InventoryItem.java | 2 -- .../main/java/com/openhis/workflow/domain/ServiceRequest.java | 2 -- .../java/com/openhis/workflow/domain/ServiceRequestDetail.java | 2 -- .../main/java/com/openhis/workflow/domain/SupplyDelivery.java | 2 -- .../main/java/com/openhis/workflow/domain/SupplyRequest.java | 2 -- 45 files changed, 1 insertion(+), 91 deletions(-) diff --git a/openhis-server/core-common/src/main/java/com/core/common/core/domain/HisBaseEntity.java b/openhis-server/core-common/src/main/java/com/core/common/core/domain/HisBaseEntity.java index e10636ff..0a09c627 100644 --- a/openhis-server/core-common/src/main/java/com/core/common/core/domain/HisBaseEntity.java +++ b/openhis-server/core-common/src/main/java/com/core/common/core/domain/HisBaseEntity.java @@ -44,7 +44,7 @@ public class HisBaseEntity implements Serializable { private Integer tenantId; /** 删除标识 */ - private Integer delFlag; + private Integer deleteFlag; /** 测试标识 */ private Integer testFlag; diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/SaveInventoryReceiptDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/SaveInventoryReceiptDto.java index b265047f..a9235d98 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/SaveInventoryReceiptDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/SaveInventoryReceiptDto.java @@ -111,9 +111,6 @@ public class SaveInventoryReceiptDto { /** 申请时间 */ private Date applyTime; - /** 删除状态 */ - private Integer deleteFlag; - // =======chargeItem实体============ /** ID */ diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Account.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Account.java index 6d6071fd..bca9c433 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Account.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Account.java @@ -58,7 +58,5 @@ public class Account extends HisBaseEntity { /** 欠费限制额度 */ private BigDecimal limitAccount; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItem.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItem.java index 59feda42..b6519152 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItem.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItem.java @@ -112,7 +112,5 @@ public class ChargeItem extends HisBaseEntity { /** 机构 */ private String orgCode; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefApp.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefApp.java index 72ee2787..e5fbdeb0 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefApp.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefApp.java @@ -55,7 +55,5 @@ public class ChargeItemDefApp extends HisBaseEntity { /** 价格 */ private BigDecimal amount; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefinition.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefinition.java index ddb6d0ea..59eb01d1 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefinition.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefinition.java @@ -67,7 +67,5 @@ public class ChargeItemDefinition extends HisBaseEntity { /** 基础价格 */ private BigDecimal price; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Device.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Device.java index 5b90561c..fea94f85 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Device.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Device.java @@ -91,7 +91,5 @@ public class Device extends HisBaseEntity { /** 器材安全 */ private Integer safetyEnum; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/DeviceDefinition.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/DeviceDefinition.java index ab645e8c..98446f80 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/DeviceDefinition.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/DeviceDefinition.java @@ -106,7 +106,5 @@ public class DeviceDefinition extends HisBaseEntity { /** 过敏标记 */ private Integer allergenFlag; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Encounter.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Encounter.java index 29a9b509..99742116 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Encounter.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Encounter.java @@ -73,7 +73,4 @@ public class Encounter extends HisBaseEntity { /** 就诊序号 */ private Integer displayOrder; - /** 删除状态 */ - private Integer deleteFlag; - } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterDiagnosis.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterDiagnosis.java index ea226c5c..cbe2dd2e 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterDiagnosis.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterDiagnosis.java @@ -55,7 +55,5 @@ public class EncounterDiagnosis extends HisBaseEntity { /** 最高诊断依据标记 */ private Integer highDiseEvidFlag; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterLocation.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterLocation.java index 9b76c0a2..f92e20a7 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterLocation.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterLocation.java @@ -46,7 +46,5 @@ public class EncounterLocation extends HisBaseEntity { /** 结束时间 */ private Date endTime; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterParticipant.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterParticipant.java index 6e57a411..25c157b1 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterParticipant.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterParticipant.java @@ -43,7 +43,5 @@ public class EncounterParticipant extends HisBaseEntity { /** 参与者ID */ private Long practitionerId; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterReason.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterReason.java index 54a7583a..91b19489 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterReason.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterReason.java @@ -43,7 +43,5 @@ public class EncounterReason extends HisBaseEntity { /** 原因描述 */ private String note; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/HealthcareService.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/HealthcareService.java index 53397cad..a0d266f8 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/HealthcareService.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/HealthcareService.java @@ -61,7 +61,5 @@ public class HealthcareService extends HisBaseEntity { /** 预约要求 */ private Integer appointmentRequiredFlag; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Invoice.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Invoice.java index 77555bdc..925c5ad6 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Invoice.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Invoice.java @@ -64,7 +64,5 @@ public class Invoice extends HisBaseEntity { /** 图片路径 */ private String pictureUrl; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Location.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Location.java index 1cd64330..8a495796 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Location.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Location.java @@ -61,7 +61,5 @@ public class Location extends HisBaseEntity { /** 显示顺序 */ private Integer displayOrder; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Organization.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Organization.java index 87366b12..aa7a7d6a 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Organization.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Organization.java @@ -58,7 +58,5 @@ public class Organization extends HisBaseEntity { /** 显示顺序 */ private Integer displayOrder; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Patient.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Patient.java index e076c651..2058abc3 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Patient.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Patient.java @@ -121,7 +121,5 @@ public class Patient extends HisBaseEntity { /** 机构Id */ private Long organizationId; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/PatientIdentifier.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/PatientIdentifier.java index 857c30b7..b9f7db4d 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/PatientIdentifier.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/PatientIdentifier.java @@ -43,7 +43,5 @@ public class PatientIdentifier extends HisBaseEntity { /** 有效时间end */ private Date endTime; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Practitioner.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Practitioner.java index 1caa6862..e4dc803f 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Practitioner.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Practitioner.java @@ -82,7 +82,5 @@ public class Practitioner extends HisBaseEntity { /** 系统用户id */ private Long userId; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/PractitionerRole.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/PractitionerRole.java index 7afbb4d8..d61b7154 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/PractitionerRole.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/PractitionerRole.java @@ -58,7 +58,5 @@ public class PractitionerRole extends HisBaseEntity { /** 有效时间 */ private String availabilityJson; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Supplier.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Supplier.java index 38a6edb7..949403be 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Supplier.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Supplier.java @@ -58,7 +58,5 @@ public class Supplier extends HisBaseEntity { /** 机构编号 */ private Long orgId; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/Condition.java b/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/Condition.java index f8651afe..f0ba713a 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/Condition.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/Condition.java @@ -88,7 +88,5 @@ public class Condition extends HisBaseEntity { /** 医保编码 */ private String ybCode; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/ConditionDefinition.java b/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/ConditionDefinition.java index 4e5b264d..569d12c7 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/ConditionDefinition.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/ConditionDefinition.java @@ -61,7 +61,5 @@ public class ConditionDefinition extends HisBaseEntity { /** 状态 */ private Integer statusEnum; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/Procedure.java b/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/Procedure.java index 910bf33f..8fcfda1f 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/Procedure.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/Procedure.java @@ -97,7 +97,5 @@ public class Procedure extends HisBaseEntity { /** 跟进指南 */ private String followUpJson; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/ProcedurePerformer.java b/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/ProcedurePerformer.java index 70808fde..77ab2741 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/ProcedurePerformer.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/ProcedurePerformer.java @@ -46,7 +46,5 @@ public class ProcedurePerformer extends HisBaseEntity { /** 飞刀机构 */ private String orgFromId; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/Claim.java b/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/Claim.java index d1c763c7..0d75e0c5 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/Claim.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/Claim.java @@ -61,7 +61,5 @@ public class Claim extends HisBaseEntity { /** 索赔涵盖时间 */ private Date billablePeriodEnd; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/ClaimResponse.java b/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/ClaimResponse.java index 48673701..2ef17034 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/ClaimResponse.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/ClaimResponse.java @@ -58,7 +58,5 @@ public class ClaimResponse extends HisBaseEntity { /** 索赔金额 */ private BigDecimal total; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/Contract.java b/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/Contract.java index 0b898eae..7be0560d 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/Contract.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/Contract.java @@ -43,7 +43,5 @@ public class Contract extends HisBaseEntity { /** 机构 */ private Long orgId; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentNotice.java b/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentNotice.java index 57cb93e4..98fa1ad0 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentNotice.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentNotice.java @@ -58,7 +58,5 @@ public class PaymentNotice extends HisBaseEntity { /** 机构 */ private String orgCode; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentRecDetail.java b/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentRecDetail.java index b87e953b..8c25efc6 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentRecDetail.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentRecDetail.java @@ -73,7 +73,5 @@ public class PaymentRecDetail extends HisBaseEntity { /** 单笔交易结果 */ private Integer resultEnum; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentReconciliation.java b/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentReconciliation.java index 70767c93..63194a8e 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentReconciliation.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentReconciliation.java @@ -88,7 +88,5 @@ public class PaymentReconciliation extends HisBaseEntity { /** 就诊ID */ private Long encoutnerId; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/Medication.java b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/Medication.java index 1a6af8b1..f5fbbb8c 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/Medication.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/Medication.java @@ -76,8 +76,6 @@ public class Medication extends HisBaseEntity { /** 药品定义 */ private String definition; - /** 删除状态 */ - private Integer deleteFlag; /** 药品编号 */ private Long code; diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDefinition.java b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDefinition.java index 6a286966..57654969 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDefinition.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDefinition.java @@ -118,7 +118,5 @@ public class MedicationDefinition extends HisBaseEntity { /** 产品特性 */ private Integer characteristic; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDetail.java b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDetail.java index a2848191..51ff0fb5 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDetail.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDetail.java @@ -77,6 +77,4 @@ public class MedicationDetail extends HisBaseEntity { /** 药品定义 */ private String definition; - /** 删除状态 */ - private Integer deleteFlag; } diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDispense.java b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDispense.java index 363c0366..34d8cd2b 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDispense.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDispense.java @@ -106,7 +106,5 @@ public class MedicationDispense extends HisBaseEntity { /** 单次最大剂量 */ private BigDecimal maxUnit; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationRequest.java b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationRequest.java index b302448c..be435151 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationRequest.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationRequest.java @@ -169,7 +169,5 @@ public class MedicationRequest extends HisBaseEntity { /** 发药人 */ private Long dispenser; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/ActivityDefinition.java b/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/ActivityDefinition.java index e2a55639..79503e52 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/ActivityDefinition.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/ActivityDefinition.java @@ -73,7 +73,5 @@ public class ActivityDefinition extends HisBaseEntity { /** 规则id */ private String ruleId; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceDispense.java b/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceDispense.java index 704038bf..2322be93 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceDispense.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceDispense.java @@ -88,7 +88,5 @@ public class DeviceDispense extends HisBaseEntity { /** 使用说明 */ private String usageInstruction; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceRequest.java b/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceRequest.java index 9d9c275d..3ad718bf 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceRequest.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceRequest.java @@ -130,7 +130,5 @@ public class DeviceRequest extends HisBaseEntity { /** 发放编号 */ private Long dispenseId; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/InventoryItem.java b/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/InventoryItem.java index 178b9c66..d0e7f359 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/InventoryItem.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/InventoryItem.java @@ -97,7 +97,5 @@ public class InventoryItem extends HisBaseEntity { /** 追溯码包装层级 */ private Integer packagingLevels; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequest.java b/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequest.java index 478e350c..e342d24a 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequest.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequest.java @@ -100,7 +100,5 @@ public class ServiceRequest extends HisBaseEntity { /** 历史请求 */ private Long relevantHistory; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequestDetail.java b/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequestDetail.java index 56886ec2..884bad9d 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequestDetail.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequestDetail.java @@ -40,7 +40,5 @@ public class ServiceRequestDetail extends HisBaseEntity { /** 订单详情 */ private String detailJson; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyDelivery.java b/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyDelivery.java index 8d47eaf7..7565fcac 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyDelivery.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyDelivery.java @@ -106,7 +106,5 @@ public class SupplyDelivery extends HisBaseEntity { /** 接收时间 */ private Date receiveDateTime; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyRequest.java b/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyRequest.java index 773c315a..7e3596ab 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyRequest.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyRequest.java @@ -118,7 +118,5 @@ public class SupplyRequest extends HisBaseEntity { /** 申请时间 */ private Date applyTime; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file From dc6af9afa4d7071f09a1f04c51a0d9a5406dca31 Mon Sep 17 00:00:00 2001 From: "Zhang.WH" Date: Fri, 21 Feb 2025 11:43:37 +0800 Subject: [PATCH 13/17] =?UTF-8?q?demo=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PurchaseInventoryController.java | 7 +++---- .../web/inventorymanage/dto/InventoryReceiptInitDto.java | 2 ++ 2 files changed, 5 insertions(+), 4 deletions(-) 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 671b49f0..689e4f40 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 @@ -85,7 +85,7 @@ public class PurchaseInventoryController { * * @param inventoryDto 供应请求信息 */ - @PostMapping("/add-inventory-receipt") + @PostMapping("/inventory-receipt") public R addSupplyRequest(@Validated @RequestBody InventoryDto inventoryDto) { // 生成待发送的入库单据supply_request SupplyRequest supplyRequest = new SupplyRequest(); @@ -118,7 +118,7 @@ public class PurchaseInventoryController { * * @param saveInventoryReceiptDto 供应请求信息 */ - @PutMapping("/edit-inventory-receipt") + @PutMapping("/inventory-receipt") public R editSupplyRequest(@Validated @RequestBody SaveInventoryReceiptDto saveInventoryReceiptDto) { // 更新supply_request信息 SupplyRequest saveRequest = new SupplyRequest(); @@ -138,10 +138,9 @@ public class PurchaseInventoryController { * * @param supplyRequestId 主表id */ - @DeleteMapping("/delete-inventory-receipt") + @DeleteMapping("/inventory-receipt") public R deleteSupplyRequest(@RequestParam Long supplyRequestId) { // 全都是逻辑删除 - // todo:拓展mybatisplus ：删除就是软删除 ，查询默认加上delFlag条件，通过传参实现查看被删除的项目 boolean deleteSuccess = supplyRequestService.removeById(supplyRequestId); diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryReceiptInitDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryReceiptInitDto.java index a322065c..f02af0d1 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryReceiptInitDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryReceiptInitDto.java @@ -22,6 +22,8 @@ import lombok.experimental.Accessors; @Accessors(chain = true) public class InventoryReceiptInitDto { + //返回前台的应是dto 懒得定义请勿学习 + /** 药房信息 */ private List location; From e61495cc6bbb0587e09a1e2c17777e52aee9c734 Mon Sep 17 00:00:00 2001 From: "Wang.Huan" Date: Fri, 21 Feb 2025 12:29:35 +0800 Subject: [PATCH 14/17] =?UTF-8?q?mapper=E5=B0=81=E8=A3=85=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E5=88=A0=E9=99=A4=E7=9A=84=E6=96=B9=E6=B3=95:=20?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1Mapper=E7=B1=BB=E9=9C=80=E8=A6=81=E7=BB=A7?= =?UTF-8?q?=E6=89=BFHisBaseMapper,=E4=B8=94=E5=8A=A0=E4=B8=8A@TableName?= =?UTF-8?q?=E6=B3=A8=E8=A7=A3=E6=8C=87=E5=AE=9A=E8=A1=A8=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/core/common/biz/HisBaseMapper.java | 65 +++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 openhis-server/core-common/src/main/java/com/core/common/biz/HisBaseMapper.java diff --git a/openhis-server/core-common/src/main/java/com/core/common/biz/HisBaseMapper.java b/openhis-server/core-common/src/main/java/com/core/common/biz/HisBaseMapper.java new file mode 100644 index 00000000..cb6eaadb --- /dev/null +++ b/openhis-server/core-common/src/main/java/com/core/common/biz/HisBaseMapper.java @@ -0,0 +1,65 @@ +package com.core.common.biz; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Update; +import org.springframework.core.annotation.AnnotationUtils; + +import java.util.List; + +public interface HisBaseMapper extends BaseMapper { + + /** + * 根据ID逻辑删除单条记录 + */ + default int logicalDelById(Long id) { + String tableName = getTableName(); + return logicalDelById(tableName, id); + } + + /** + * 根据ID列表批量逻辑删除记录 + */ + default int logicalDelByIds(List ids) { + String tableName = getTableName(); + return logicalDelByIds(tableName, ids); + } + + /** + * 根据 UpdateWrapper 逻辑删除记录 + */ + default int logicalDelByWrapper(UpdateWrapper updateWrapper) { + String tableName = getTableName(); + return logicalDelByWrapper(updateWrapper, tableName); + } + + @Update("UPDATE ${tableName} SET delete_flag = 1 WHERE id = #{id}") + int logicalDelById(@Param("tableName") String tableName, @Param("id") Long id); + + @Update({ + "" + }) + int logicalDelByIds(@Param("tableName") String tableName, @Param("ids") List ids); + + @Update("UPDATE ${tableName} SET delete_flag = 1 ${ew.customSqlSegment}") + int logicalDelByWrapper(@Param(Constants.WRAPPER) UpdateWrapper updateWrapper, @Param("tableName") String tableName); + + /** + * 获取表名 + */ + default String getTableName() { + TableName tableNameAnnotation = AnnotationUtils.findAnnotation(this.getClass(), TableName.class); + if (tableNameAnnotation == null) { + throw new RuntimeException("Table name annotation not found on Mapper interface"); + } + return tableNameAnnotation.value(); + } +} From 20a96aac79984138ea2db11f61291f1aab955c45 Mon Sep 17 00:00:00 2001 From: "Wang.Huan" Date: Fri, 21 Feb 2025 14:00:45 +0800 Subject: [PATCH 15/17] =?UTF-8?q?Service=E5=92=8Cmapper=E5=B0=81=E8=A3=85?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=88=A0=E9=99=A4=E7=9A=84=E6=96=B9=E6=B3=95?= =?UTF-8?q?:=20=E4=B8=9A=E5=8A=A1Mapper=E7=B1=BB=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E7=BB=A7=E6=89=BFHisBaseMapper,=E4=B8=94=E5=8A=A0=E4=B8=8A@Tab?= =?UTF-8?q?leName=E6=B3=A8=E8=A7=A3=E6=8C=87=E5=AE=9A=E8=A1=A8=E5=90=8D=20?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1Service=20extends=20HisBaseService=20?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1ServiceImpl=20extends=20HisBaseServiceImpl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/core/common/biz/HisBaseMapper.java | 6 ++-- .../com/core/common/biz/HisBaseService.java | 33 +++++++++++++++++++ .../core/common/biz/HisBaseServiceImpl.java | 24 ++++++++++++++ .../medication/mapper/MedicationMapper.java | 5 ++- .../service/IMedicationService.java | 8 ++--- .../service/impl/MedicationServiceImpl.java | 3 +- 6 files changed, 70 insertions(+), 9 deletions(-) create mode 100644 openhis-server/core-common/src/main/java/com/core/common/biz/HisBaseService.java create mode 100644 openhis-server/core-common/src/main/java/com/core/common/biz/HisBaseServiceImpl.java diff --git a/openhis-server/core-common/src/main/java/com/core/common/biz/HisBaseMapper.java b/openhis-server/core-common/src/main/java/com/core/common/biz/HisBaseMapper.java index cb6eaadb..90e919c1 100644 --- a/openhis-server/core-common/src/main/java/com/core/common/biz/HisBaseMapper.java +++ b/openhis-server/core-common/src/main/java/com/core/common/biz/HisBaseMapper.java @@ -1,7 +1,7 @@ package com.core.common.biz; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import org.apache.ibatis.annotations.Param; @@ -31,7 +31,7 @@ public interface HisBaseMapper extends BaseMapper { /** * 根据 UpdateWrapper 逻辑删除记录 */ - default int logicalDelByWrapper(UpdateWrapper updateWrapper) { + default int logicalDelByWrapper(LambdaUpdateWrapper updateWrapper) { String tableName = getTableName(); return logicalDelByWrapper(updateWrapper, tableName); } @@ -50,7 +50,7 @@ public interface HisBaseMapper extends BaseMapper { int logicalDelByIds(@Param("tableName") String tableName, @Param("ids") List ids); @Update("UPDATE ${tableName} SET delete_flag = 1 ${ew.customSqlSegment}") - int logicalDelByWrapper(@Param(Constants.WRAPPER) UpdateWrapper updateWrapper, @Param("tableName") String tableName); + int logicalDelByWrapper(@Param(Constants.WRAPPER) LambdaUpdateWrapper updateWrapper, @Param("tableName") String tableName); /** * 获取表名 diff --git a/openhis-server/core-common/src/main/java/com/core/common/biz/HisBaseService.java b/openhis-server/core-common/src/main/java/com/core/common/biz/HisBaseService.java new file mode 100644 index 00000000..86efb579 --- /dev/null +++ b/openhis-server/core-common/src/main/java/com/core/common/biz/HisBaseService.java @@ -0,0 +1,33 @@ +package com.core.common.biz; + +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +public interface HisBaseService extends IService { + + /** + * 根据ID逻辑删除单条记录 + * + * @param id 主键ID + * @return 是否成功 + */ + boolean logicalDelById(Long id); + + /** + * 根据ID列表批量逻辑删除记录 + * + * @param ids 主键ID列表 + * @return 是否成功 + */ + boolean logicalDelByIds(List ids); + + /** + * 根据条件逻辑删除记录 + * + * @param updateWrapper 更新条件（Lambda形式） + * @return 是否成功 + */ + boolean logicalDelByWrapper(LambdaUpdateWrapper updateWrapper); +} \ No newline at end of file diff --git a/openhis-server/core-common/src/main/java/com/core/common/biz/HisBaseServiceImpl.java b/openhis-server/core-common/src/main/java/com/core/common/biz/HisBaseServiceImpl.java new file mode 100644 index 00000000..7b4a1ce0 --- /dev/null +++ b/openhis-server/core-common/src/main/java/com/core/common/biz/HisBaseServiceImpl.java @@ -0,0 +1,24 @@ +package com.core.common.biz; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; + +public class HisBaseServiceImpl, T> extends ServiceImpl implements HisBaseService { + + @Override + public boolean logicalDelById(Long id) { + return ((HisBaseMapper) baseMapper).logicalDelById(id) > 0; + } + + @Override + public boolean logicalDelByIds(List ids) { + return ((HisBaseMapper) baseMapper).logicalDelByIds(ids) > 0; + } + + @Override + public boolean logicalDelByWrapper(LambdaUpdateWrapper updateWrapper) { + return ((HisBaseMapper) baseMapper).logicalDelByWrapper(updateWrapper) > 0; + } +} diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationMapper.java b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationMapper.java index 4f28c7cc..f0476f2d 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationMapper.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationMapper.java @@ -1,5 +1,7 @@ package com.openhis.medication.mapper; +import com.baomidou.mybatisplus.annotation.TableName; +import com.core.common.biz.HisBaseMapper; import com.openhis.medication.domain.MedicationDetail; import org.springframework.stereotype.Repository; @@ -14,8 +16,9 @@ import java.util.List; * @author system * @date 2025-02-20 */ +@TableName("med_medication") @Repository -public interface MedicationMapper extends BaseMapper { +public interface MedicationMapper extends HisBaseMapper { /** * 查询药品详细信息列表 diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationService.java b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationService.java index 96cd7038..4aa04c4e 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationService.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationService.java @@ -1,18 +1,18 @@ package com.openhis.medication.service; -import java.util.List; - -import com.baomidou.mybatisplus.extension.service.IService; +import com.core.common.biz.HisBaseService; import com.openhis.medication.domain.Medication; import com.openhis.medication.domain.MedicationDetail; +import java.util.List; + /** * 药品基本信息管理Service接口 * * @author system * @date 2025-02-20 */ -public interface IMedicationService extends IService { +public interface IMedicationService extends HisBaseService { /** * 查询药品信息列表 diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationServiceImpl.java b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationServiceImpl.java index 4f709ad5..91d46c28 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationServiceImpl.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationServiceImpl.java @@ -2,6 +2,7 @@ package com.openhis.medication.service.impl; import java.util.List; +import com.core.common.biz.HisBaseServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -23,7 +24,7 @@ import lombok.extern.slf4j.Slf4j; */ @Slf4j @Service -public class MedicationServiceImpl extends ServiceImpl implements IMedicationService { +public class MedicationServiceImpl extends HisBaseServiceImpl implements IMedicationService { @Autowired private MedicationMapper medicationMapper; From 27d4a04bb5817249d0b56938937cb07345621375 Mon Sep 17 00:00:00 2001 From: "Wang.Huan" Date: Fri, 21 Feb 2025 15:20:25 +0800 Subject: [PATCH 16/17] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/core/common/biz/HisBaseMapper.java | 1 + .../common/core/domain/HisBaseEntity.java | 6 -- .../openhis/medication/domain/Medication.java | 87 ------------------- .../domain/MedicationDefinition.java | 4 - .../medication/domain/MedicationDetail.java | 87 +++++++++++++++++++ 5 files changed, 88 insertions(+), 97 deletions(-) diff --git a/openhis-server/core-common/src/main/java/com/core/common/biz/HisBaseMapper.java b/openhis-server/core-common/src/main/java/com/core/common/biz/HisBaseMapper.java index 90e919c1..0522ea48 100644 --- a/openhis-server/core-common/src/main/java/com/core/common/biz/HisBaseMapper.java +++ b/openhis-server/core-common/src/main/java/com/core/common/biz/HisBaseMapper.java @@ -62,4 +62,5 @@ public interface HisBaseMapper extends BaseMapper { } return tableNameAnnotation.value(); } + } diff --git a/openhis-server/core-common/src/main/java/com/core/common/core/domain/HisBaseEntity.java b/openhis-server/core-common/src/main/java/com/core/common/core/domain/HisBaseEntity.java index 0a09c627..3caca9c0 100644 --- a/openhis-server/core-common/src/main/java/com/core/common/core/domain/HisBaseEntity.java +++ b/openhis-server/core-common/src/main/java/com/core/common/core/domain/HisBaseEntity.java @@ -37,16 +37,10 @@ public class HisBaseEntity implements Serializable { @TableField(fill = FieldFill.UPDATE) private Date updateTime; - /** 备注 */ - private String remark; - /** 租户ID */ private Integer tenantId; /** 删除标识 */ private Integer deleteFlag; - /** 测试标识 */ - private Integer testFlag; - } diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/Medication.java b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/Medication.java index f5fbbb8c..a718daa5 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/Medication.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/Medication.java @@ -76,91 +76,4 @@ public class Medication extends HisBaseEntity { /** 药品定义 */ private String definition; - - /** 药品编号 */ - private Long code; - - /** 药品名称 */ - private String name; - - /** 适用范围 */ - private Integer domainEnum; - - /** 药品版本 */ - private String version; - - /** 英文药名 */ - private String nameEn; - - /** 药品名称拼音码 */ - private String pyCode; - - /** 药品五笔码 */ - private String wbCode; - - /** 药品分类 */ - private Integer categoryCode; - - /** 商品名称 */ - private String merchandiseName; - - /** 商品名称拼音码 */ - private String merchandisePyCode; - - /** 商品五笔码 */ - private String merchandiseWbCode; - - /** 药品单位 */ - private String unitCode; - - /** 最小单位 */ - private String minUnitCode; - - /** 所含耗材 */ - private String comprisedText; - - /** 成分 */ - private String ingredient; - - /** 拆零比 */ - private BigDecimal partPercent; - - /** 剂量形式 */ - private Integer doseFrom; - - /** 批准文号 */ - private String approvalNumber; - - /** 医保是否对码 */ - private Integer ybMatchFlag; - - /** 医保编码 */ - private String ybCode; - - /** 药理作用分类 */ - private String pharmacologyCategoryCode; - - /** 是否皮试 */ - private Integer skinTestFlag; - - /** 是否为注射药物 */ - private Integer injectFlag; - - /** 生产厂家 */ - private Long manufacturerId; - - /** 供应商 */ - private Long supplyId; - - /** 是否限制使用 */ - private Integer restrictedFlag; - - /** 限制使用范围 */ - private String restrictedScope; - - /** 儿童用药标志 */ - private Integer childrenFlag; - - /** 产品特性 */ - private Integer characteristic; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDefinition.java b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDefinition.java index 57654969..23a7a05e 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDefinition.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDefinition.java @@ -115,8 +115,4 @@ public class MedicationDefinition extends HisBaseEntity { /** 儿童用药标志 */ private Integer childrenFlag; - /** 产品特性 */ - private Integer characteristic; - - } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDetail.java b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDetail.java index 51ff0fb5..5eb96a1e 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDetail.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDetail.java @@ -77,4 +77,91 @@ public class MedicationDetail extends HisBaseEntity { /** 药品定义 */ private String definition; + /** 药品编号 */ + private Long code; + + /** 药品名称 */ + private String name; + + /** 适用范围 */ + private Integer domainEnum; + + /** 药品版本 */ + private String version; + + /** 英文药名 */ + private String nameEn; + + /** 药品名称拼音码 */ + private String pyCode; + + /** 药品五笔码 */ + private String wbCode; + + /** 药品分类 */ + private Integer categoryCode; + + /** 商品名称 */ + private String merchandiseName; + + /** 商品名称拼音码 */ + private String merchandisePyCode; + + /** 商品五笔码 */ + private String merchandiseWbCode; + + /** 药品单位 */ + private String unitCode; + + /** 最小单位 */ + private String minUnitCode; + + /** 所含耗材 */ + private String comprisedText; + + /** 成分 */ + private String ingredient; + + /** 拆零比 */ + private BigDecimal partPercent; + + /** 剂量形式 */ + private Integer doseFrom; + + /** 批准文号 */ + private String approvalNumber; + + /** 医保是否对码 */ + private Integer ybMatchFlag; + + /** 医保编码 */ + private String ybCode; + + /** 药理作用分类 */ + private String pharmacologyCategoryCode; + + /** 是否皮试 */ + private Integer skinTestFlag; + + /** 是否为注射药物 */ + private Integer injectFlag; + + /** 生产厂家 */ + private Long manufacturerId; + + /** 供应商 */ + private Long supplyId; + + /** 是否限制使用 */ + private Integer restrictedFlag; + + /** 限制使用范围 */ + private String restrictedScope; + + /** 儿童用药标志 */ + private Integer childrenFlag; + + /** 产品特性 */ + private Integer characteristic; + } From a30509dcd8269e2fc600fbe5fecda61956bda447 Mon Sep 17 00:00:00 2001 From: anxin Date: Fri, 21 Feb 2025 15:53:49 +0800 Subject: [PATCH 17/17] =?UTF-8?q?pom=E6=96=87=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- openhis-server/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openhis-server/pom.xml b/openhis-server/pom.xml index b81d0790..7a6e5e3c 100644 --- a/openhis-server/pom.xml +++ b/openhis-server/pom.xml @@ -36,7 +36,7 @@ 5.7.12 5.3.39 1.18.26 - 3.4.2 + 3.5.3 6.8.0