代码修改

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 {
+public class EncounterPatientPageDto {
-
-    private static final long serialVersionUID = 1L;
 
     /**
      * 就诊ID

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 {
+public class EncounterPatientPageParam {
-
-    private static final long serialVersionUID = 1L;
 
     /**
      * 患者姓名
@@ -60,4 +57,9 @@ public class EncounterPatientPageParam implements Serializable {
      * 收费状态
      */
     private Integer statusEnum;
+
+    /**
+     * 退款标识
+     */
+    private Integer refundFlag;
 }

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 {
+public class EncounterPatientPaymentDto {
-
-    private static final long serialVersionUID = 1L;
 
     /** ID */
     @TableId(type = IdType.ASSIGN_ID)

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 {
+public class EncounterPatientPrescriptionDto {
-
-    private static final long serialVersionUID = 1L;
 
     /** 收费项目类型 */
     private Integer contextEnum;

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 {
+public class RefundItemDto {}
-
-    private static final long serialVersionUID = 1L;
-}

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<PurchaseInventoryInitDto.supplierListOption> supplierListOptions = supplierList.stream()
             .map(supplier -> new PurchaseInventoryInitDto.supplierListOption(supplier.getId(), supplier.getName()))
             .collect(Collectors.toList());
-        // 入库项目类型
-        List<PurchaseInventoryInitDto.itemTypeOption> itemTypeOptions = Stream.of(ItemType.values())
-            .map(itemType -> new PurchaseInventoryInitDto.itemTypeOption(itemType.getValue(), itemType.getInfo()))
-            .collect(Collectors.toList());
         // 审批状态
         List<PurchaseInventoryInitDto.supplyStatusOption> supplyStatusOptions = Stream.of(SupplyStatus.values())
             .map(supplyStatus -> new PurchaseInventoryInitDto.supplyStatusOption(supplyStatus.getValue(),
                 supplyStatus.getInfo()))
             .collect(Collectors.toList());
 
-        initDto.setSupplierListOptions(supplierListOptions).setItemTypeOptions(itemTypeOptions)
+        initDto.setSupplierListOptions(supplierListOptions).setPractitionerListOptions(practitionerListOptions)
-            .setPractitionerListOptions(practitionerListOptions).setSupplyStatusOptions(supplyStatusOptions);
+            .setSupplyStatusOptions(supplyStatusOptions);
 
         return R.ok(initDto);
     }

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 {
+public class InventorySearchParam {
-
-    private static final long serialVersionUID = 1L;
 
     /** 状态 */
     private Integer statusEnum;

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 {
+public class ItemChargeDetailDto {
-
-    private static final long serialVersionUID = 1L;
 
     /** 费用定价主键ID */
     private Long definitionId;

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 {
+public class ProductStocktakingDto {
-
-    private static final long serialVersionUID = 1L;
 
     /** ID */
     @TableId(type = IdType.ASSIGN_ID)

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 {
+public class PurchaseInventoryDto {
-
-    private static final long serialVersionUID = 1L;
 
     /** ID */
     @TableId(type = IdType.ASSIGN_ID)
     @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
+    /** 单据号 */
+    private String busNo;
+
     /** 项目 */
     private String itemTable;
 

openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseInventoryInitDto.java

@@ -33,11 +33,6 @@ public class PurchaseInventoryInitDto {
      */
     private List<PurchaseInventoryInitDto.practitionerListOption> practitionerListOptions;
 
-    /**
-     * 入库项目类型
-     */
-    private List<PurchaseInventoryInitDto.itemTypeOption> 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;
-        }
-    }
-
     /**
      * 入库项目类型
      */

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 {
+public class ReceiptApprovalSearchParam {
-
-    private static final long serialVersionUID = 1L;
 
     /** 状态 */
     private Integer statusEnum;

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 {
+public class ReceiptDetailDto {
-
-    private static final long serialVersionUID = 1L;
 
     /** ID */
     @TableId(type = IdType.ASSIGN_ID)

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 {
+public class ReceiptPageDto {
-
-    private static final long serialVersionUID = 1L;
 
     /** ID */
     @TableId(type = IdType.ASSIGN_ID)
@@ -70,6 +67,6 @@ public class ReceiptPageDto implements Serializable {
     private Date applyTime;
 
     /** 制单日期 */
-    private Date createTime;
+    private Date occurrenceTime;
 
 }

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 {
+public class SupplyItemDetailDto {
-
-    private static final long serialVersionUID = 1L;
 
     /** ID */
     @JsonSerialize(using = ToStringSerializer.class)

openhis-server/openhis-application/src/main/resources/mapper/Inventorymanage/PurchaseInventoryMapper.xml

@@ -5,23 +5,23 @@
     <select id="selectInventoryReceiptPage"
             resultType="com.openhis.web.inventorymanage.dto.ReceiptPageDto">
         SELECT T2.id,
-               T2.bus_no AS supply_bus_no,
+               T2.supply_bus_no,
                T2.status_enum,
                T2.supplier_id,
                T2.approver_id,
                T2.approval_time,
                T2.applicant_id,
-               T2.create_time,
+               T2.occurrence_time,
                T2.practitioner_id,
                T2.tenant_id
         FROM (SELECT T1.id,
-                     T1.bus_no,
+                     T1.bus_no AS supply_bus_no,
                      T1.status_enum,
                      T1.supplier_id,
                      T1.approver_id,
                      T1.approval_time,
                      T1.applicant_id,
-                     T1.create_time,
+                     T1.occurrence_time,
                      T1.practitioner_id,
                      T1.tenant_id
               FROM wor_supply_request AS T1
@@ -33,7 +33,7 @@
                        T1.approver_id,
                        T1.approval_time,
                        T1.applicant_id,
-                       T1.create_time,
+                       T1.occurrence_time,
                        T1.practitioner_id,
                        T1.tenant_id
               ORDER BY T1.bus_no desc

openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ItemType.java

@@ -18,9 +18,9 @@ import lombok.Getter;
 public enum ItemType implements HisEnumInterface {
 
     /**
-     * 中药
+     * 药品
      */
-    MEDICINE(1, "1", "中药"),
+    MEDICINE(1, "1", "药品"),
 
     /**
      * 耗材