From 4ad61d3c3c018084b11a4fac5dc80e20eb6e9763 Mon Sep 17 00:00:00 2001 From: "Zhang.WH" Date: Wed, 19 Mar 2025 16:08:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/EncounterPatientPageDto.java | 5 +---- .../dto/EncounterPatientPageParam.java | 10 ++++++---- .../dto/EncounterPatientPaymentDto.java | 5 +---- .../dto/EncounterPatientPrescriptionDto.java | 5 +---- .../web/chargemanage/dto/RefundItemDto.java | 7 +------ .../impl/PurchaseInventoryAppServiceImpl.java | 13 ++++++------- .../dto/InventorySearchParam.java | 6 +----- .../dto/ItemChargeDetailDto.java | 5 +---- .../dto/ProductStocktakingDto.java | 5 +---- .../dto/PurchaseInventoryDto.java | 8 ++++---- .../dto/PurchaseInventoryInitDto.java | 19 ------------------- .../dto/ReceiptApprovalSearchParam.java | 6 +----- .../inventorymanage/dto/ReceiptDetailDto.java | 5 +---- .../inventorymanage/dto/ReceiptPageDto.java | 7 ++----- .../dto/SupplyItemDetailDto.java | 4 +--- .../PurchaseInventoryMapper.xml | 10 +++++----- .../com/openhis/common/enums/ItemType.java | 4 ++-- 17 files changed, 35 insertions(+), 89 deletions(-) diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPageDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPageDto.java index d81e11ad..f38b4f45 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPageDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPageDto.java @@ -3,7 +3,6 @@ */ package com.openhis.web.chargemanage.dto; -import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; @@ -21,9 +20,7 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -public class EncounterPatientPageDto implements Serializable { - - private static final long serialVersionUID = 1L; +public class EncounterPatientPageDto { /** * 就诊ID diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPageParam.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPageParam.java index 60c171f1..db852eae 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPageParam.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPageParam.java @@ -3,7 +3,6 @@ */ package com.openhis.web.chargemanage.dto; -import java.io.Serializable; import java.util.Date; import lombok.Data; @@ -17,9 +16,7 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -public class EncounterPatientPageParam implements Serializable { - - private static final long serialVersionUID = 1L; +public class EncounterPatientPageParam { /** * 患者姓名 @@ -60,4 +57,9 @@ public class EncounterPatientPageParam implements Serializable { * 收费状态 */ private Integer statusEnum; + + /** + * 退款标识 + */ + private Integer refundFlag; } diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPaymentDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPaymentDto.java index c2f95817..8c5f4ccd 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPaymentDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPaymentDto.java @@ -3,7 +3,6 @@ */ package com.openhis.web.chargemanage.dto; -import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; @@ -24,9 +23,7 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -public class EncounterPatientPaymentDto implements Serializable { - - private static final long serialVersionUID = 1L; +public class EncounterPatientPaymentDto { /** ID */ @TableId(type = IdType.ASSIGN_ID) diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPrescriptionDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPrescriptionDto.java index b0d80b58..2c431f84 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPrescriptionDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPrescriptionDto.java @@ -3,7 +3,6 @@ */ package com.openhis.web.chargemanage.dto; -import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; @@ -18,9 +17,7 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -public class EncounterPatientPrescriptionDto implements Serializable { - - private static final long serialVersionUID = 1L; +public class EncounterPatientPrescriptionDto { /** 收费项目类型 */ private Integer contextEnum; diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/RefundItemDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/RefundItemDto.java index cf9fb746..c4ce3eb4 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/RefundItemDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/RefundItemDto.java @@ -3,8 +3,6 @@ */ package com.openhis.web.chargemanage.dto; -import java.io.Serializable; - import lombok.Data; import lombok.experimental.Accessors; @@ -16,7 +14,4 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -public class RefundItemDto implements Serializable { - - private static final long serialVersionUID = 1L; -} +public class RefundItemDto {} diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/PurchaseInventoryAppServiceImpl.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/PurchaseInventoryAppServiceImpl.java index 19de1953..c7982cba 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/PurchaseInventoryAppServiceImpl.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/PurchaseInventoryAppServiceImpl.java @@ -26,7 +26,10 @@ import com.openhis.administration.service.IPractitionerService; import com.openhis.administration.service.ISupplierService; import com.openhis.common.constant.CommonConstants; import com.openhis.common.constant.PromptMsgConstant; -import com.openhis.common.enums.*; +import com.openhis.common.enums.AssignSeqEnum; +import com.openhis.common.enums.SupplyCategory; +import com.openhis.common.enums.SupplyStatus; +import com.openhis.common.enums.SupplyType; import com.openhis.common.utils.EnumUtils; import com.openhis.common.utils.HisQueryUtils; import com.openhis.web.inventorymanage.appservice.IPurchaseInventoryAppService; @@ -83,18 +86,14 @@ public class PurchaseInventoryAppServiceImpl implements IPurchaseInventoryAppSer List supplierListOptions = supplierList.stream() .map(supplier -> new PurchaseInventoryInitDto.supplierListOption(supplier.getId(), supplier.getName())) .collect(Collectors.toList()); - // 入库项目类型 - List itemTypeOptions = Stream.of(ItemType.values()) - .map(itemType -> new PurchaseInventoryInitDto.itemTypeOption(itemType.getValue(), itemType.getInfo())) - .collect(Collectors.toList()); // 审批状态 List supplyStatusOptions = Stream.of(SupplyStatus.values()) .map(supplyStatus -> new PurchaseInventoryInitDto.supplyStatusOption(supplyStatus.getValue(), supplyStatus.getInfo())) .collect(Collectors.toList()); - initDto.setSupplierListOptions(supplierListOptions).setItemTypeOptions(itemTypeOptions) - .setPractitionerListOptions(practitionerListOptions).setSupplyStatusOptions(supplyStatusOptions); + initDto.setSupplierListOptions(supplierListOptions).setPractitionerListOptions(practitionerListOptions) + .setSupplyStatusOptions(supplyStatusOptions); return R.ok(initDto); } 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 index 940be571..9845ef26 100644 --- 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 @@ -3,8 +3,6 @@ */ package com.openhis.web.inventorymanage.dto; -import java.io.Serializable; - import lombok.Data; import lombok.experimental.Accessors; @@ -16,9 +14,7 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -public class InventorySearchParam implements Serializable { - - private static final long serialVersionUID = 1L; +public class InventorySearchParam { /** 状态 */ private Integer statusEnum; diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ItemChargeDetailDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ItemChargeDetailDto.java index f846f247..959656c7 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ItemChargeDetailDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ItemChargeDetailDto.java @@ -3,7 +3,6 @@ */ package com.openhis.web.inventorymanage.dto; -import java.io.Serializable; import java.math.BigDecimal; import lombok.Data; @@ -17,9 +16,7 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -public class ItemChargeDetailDto implements Serializable { - - private static final long serialVersionUID = 1L; +public class ItemChargeDetailDto { /** 费用定价主键ID */ private Long definitionId; diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductStocktakingDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductStocktakingDto.java index a5c1fcbb..a7c36f66 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductStocktakingDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductStocktakingDto.java @@ -3,7 +3,6 @@ */ package com.openhis.web.inventorymanage.dto; -import java.io.Serializable; import java.util.Date; import javax.validation.constraints.Min; @@ -25,9 +24,7 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -public class ProductStocktakingDto implements Serializable { - - private static final long serialVersionUID = 1L; +public class ProductStocktakingDto { /** ID */ @TableId(type = IdType.ASSIGN_ID) diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseInventoryDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseInventoryDto.java index 5213d0f5..4e7655a3 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseInventoryDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseInventoryDto.java @@ -3,7 +3,6 @@ */ package com.openhis.web.inventorymanage.dto; -import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; @@ -26,15 +25,16 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -public class PurchaseInventoryDto implements Serializable { - - private static final long serialVersionUID = 1L; +public class PurchaseInventoryDto { /** ID */ @TableId(type = IdType.ASSIGN_ID) @JsonSerialize(using = ToStringSerializer.class) private Long id; + /** 单据号 */ + private String busNo; + /** 项目 */ private String itemTable; diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseInventoryInitDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseInventoryInitDto.java index b37e354e..11d8f95e 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseInventoryInitDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseInventoryInitDto.java @@ -33,11 +33,6 @@ public class PurchaseInventoryInitDto { */ private List practitionerListOptions; - /** - * 入库项目类型 - */ - private List itemTypeOptions; - /** * 审批状态 */ @@ -71,20 +66,6 @@ public class PurchaseInventoryInitDto { } } - /** - * 入库项目类型 - */ - @Data - public static class itemTypeOption { - private Integer value; - private String label; - - public itemTypeOption(Integer value, String label) { - this.value = value; - this.label = label; - } - } - /** * 入库项目类型 */ diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptApprovalSearchParam.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptApprovalSearchParam.java index 1877a110..74a19413 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptApprovalSearchParam.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptApprovalSearchParam.java @@ -3,8 +3,6 @@ */ package com.openhis.web.inventorymanage.dto; -import java.io.Serializable; - import lombok.Data; import lombok.experimental.Accessors; @@ -16,9 +14,7 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -public class ReceiptApprovalSearchParam implements Serializable { - - private static final long serialVersionUID = 1L; +public class ReceiptApprovalSearchParam { /** 状态 */ private Integer statusEnum; diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptDetailDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptDetailDto.java index c4173960..6bc21ee3 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptDetailDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptDetailDto.java @@ -3,7 +3,6 @@ */ package com.openhis.web.inventorymanage.dto; -import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; @@ -24,9 +23,7 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -public class ReceiptDetailDto implements Serializable { - - private static final long serialVersionUID = 1L; +public class ReceiptDetailDto { /** ID */ @TableId(type = IdType.ASSIGN_ID) diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptPageDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptPageDto.java index ddb27686..260b79bd 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptPageDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptPageDto.java @@ -3,7 +3,6 @@ */ package com.openhis.web.inventorymanage.dto; -import java.io.Serializable; import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; @@ -23,9 +22,7 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -public class ReceiptPageDto implements Serializable { - - private static final long serialVersionUID = 1L; +public class ReceiptPageDto { /** ID */ @TableId(type = IdType.ASSIGN_ID) @@ -70,6 +67,6 @@ public class ReceiptPageDto implements Serializable { private Date applyTime; /** 制单日期 */ - private Date createTime; + private Date occurrenceTime; } diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/SupplyItemDetailDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/SupplyItemDetailDto.java index 4c58ea21..8719df06 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/SupplyItemDetailDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/SupplyItemDetailDto.java @@ -21,9 +21,7 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -public class SupplyItemDetailDto implements Serializable { - - private static final long serialVersionUID = 1L; +public class SupplyItemDetailDto { /** ID */ @JsonSerialize(using = ToStringSerializer.class) diff --git a/openhis-server/openhis-application/src/main/resources/mapper/Inventorymanage/PurchaseInventoryMapper.xml b/openhis-server/openhis-application/src/main/resources/mapper/Inventorymanage/PurchaseInventoryMapper.xml index 9af76e89..91b874ed 100644 --- a/openhis-server/openhis-application/src/main/resources/mapper/Inventorymanage/PurchaseInventoryMapper.xml +++ b/openhis-server/openhis-application/src/main/resources/mapper/Inventorymanage/PurchaseInventoryMapper.xml @@ -5,23 +5,23 @@