From 1f2a5e1f7c78f3865dfcd503c967d88d6036888a Mon Sep 17 00:00:00 2001 From: "Zhang.YC" Date: Thu, 20 Feb 2025 16:43:23 +0800 Subject: [PATCH 1/4] =?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 2/4] =?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 3/4] =?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 4/4] =?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(); + } + /** * 单据提交申请 *