wangyizhe/his
3
3
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

refactor(pharmacy): 激活药品仓库各类订单的供应分类选项

Browse Source 
- 激活损益订单中的通用损益、盘点损益和制剂消耗分类选项
- 更新采购订单中的库存供应和非库存供应分类选项
- 激活退货订单中的普通分类选项
- 激活退仓订单中的普通分类选项
- 激活入库订单中的外购药品、自制药品、代销药品、其他药品和赠送药品入库分类选项
- 激活出库订单中的院内出库、院外出库和其他出库分类选项
- 激活盘点订单中的普通盘点和月度盘点分类选项
- 在枚举类中启用所有被注释的供应分类并完善文档注释
This commit is contained in:
chenqi
2026-01-22 22:24:22 +08:00
parent 035738f990
commit 2884f610f5
8 changed files with 151 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseProfitLossOrderServiceImpl.java
View File

@@ -57,15 +57,15 @@ public class PharmacyWarehouseProfitLossOrderServiceImpl implements IPharmacyWar
// 单据分类
List<PharmacyWarehouseInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
// supplyCategoryOption.add(new
// PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.GENERAL_PROFIT_AND_LOSS.getValue(),
// SupplyCategory.GENERAL_PROFIT_AND_LOSS.getInfo()));
// supplyCategoryOption.add(new
// PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.STOCKTAKING_PROFIT_AND_LOSS.getValue(),
// SupplyCategory.STOCKTAKING_PROFIT_AND_LOSS.getInfo()));
// supplyCategoryOption.add(new
// PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.PREPARATION_CONSUMPTION.getValue(),
// SupplyCategory.PREPARATION_CONSUMPTION.getInfo()));
supplyCategoryOption.add(new
PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.GENERAL_PROFIT_AND_LOSS.getValue(),
SupplyCategory.GENERAL_PROFIT_AND_LOSS.getInfo()));
supplyCategoryOption.add(new
PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.STOCKTAKING_PROFIT_AND_LOSS.getValue(),
SupplyCategory.STOCKTAKING_PROFIT_AND_LOSS.getInfo()));
supplyCategoryOption.add(new
PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.PREPARATION_CONSUMPTION.getValue(),
SupplyCategory.PREPARATION_CONSUMPTION.getInfo()));
purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);

10
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehousePurchaseOrderServiceImpl.java
View File

@@ -56,11 +56,11 @@ public class PharmacyWarehousePurchaseOrderServiceImpl implements IPharmacyWareh
// 单据分类
List<PharmacyWarehouseInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
// supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
// SupplyCategory.NORMAL.getInfo()));
// supplyCategoryOption.add(new
// PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.PURCHASE_PLAN_GENERATION.getValue(),
// SupplyCategory.PURCHASE_PLAN_GENERATION.getInfo()));
supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.STOCK_SUPPLY.getValue(),
SupplyCategory.STOCK_SUPPLY.getInfo()));
supplyCategoryOption.add(new
PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.NON_STOCK.getValue(),
SupplyCategory.NON_STOCK.getInfo()));
purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);

4
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReturnOrderServiceImpl.java
View File

@@ -56,8 +56,8 @@ public class PharmacyWarehouseReturnOrderServiceImpl implements IPharmacyWarehou
// 单据分类
List<PharmacyWarehouseInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
// supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
// SupplyCategory.NORMAL.getInfo()));
supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
SupplyCategory.NORMAL.getInfo()));
purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);

4
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReturnToWarehouseOrderServiceImpl.java
View File

@@ -56,8 +56,8 @@ public class PharmacyWarehouseReturnToWarehouseOrderServiceImpl implements IPhar
// 单据分类
List<PharmacyWarehouseInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
// supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
// SupplyCategory.NORMAL.getInfo()));
supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
SupplyCategory.NORMAL.getInfo()));
purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);

22
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStockInOrderServiceImpl.java
View File

@@ -57,18 +57,16 @@ public class PharmacyWarehouseStockInOrderServiceImpl implements IPharmacyWareho
// 单据分类
List<PharmacyWarehouseInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
// supplyCategoryOption
// .add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.PURCHASED_DRUGS_WAREHOUSING.getValue(),
// SupplyCategory.PURCHASED_DRUGS_WAREHOUSING.getInfo()));
// supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(
// SupplyCategory.HOMEMADE_DRUGS_WAREHOUSING.getValue(), SupplyCategory.HOMEMADE_DRUGS_WAREHOUSING.getInfo()));
// supplyCategoryOption
// .add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.CONSIGNMENT_DRUGS_WAREHOUSING.getValue(),
// SupplyCategory.CONSIGNMENT_DRUGS_WAREHOUSING.getInfo()));
// supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(
// SupplyCategory.OTHER_DRUGS_WAREHOUSING.getValue(), SupplyCategory.OTHER_DRUGS_WAREHOUSING.getInfo()));
// supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(
// SupplyCategory.DONATED_DRUGS_WAREHOUSING.getValue(), SupplyCategory.DONATED_DRUGS_WAREHOUSING.getInfo()));
supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.PURCHASED_DRUGS_WAREHOUSING.getValue(),
SupplyCategory.PURCHASED_DRUGS_WAREHOUSING.getInfo()));
supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(
SupplyCategory.HOMEMADE_DRUGS_WAREHOUSING.getValue(), SupplyCategory.HOMEMADE_DRUGS_WAREHOUSING.getInfo()));
supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.CONSIGNMENT_DRUGS_WAREHOUSING.getValue(),
SupplyCategory.CONSIGNMENT_DRUGS_WAREHOUSING.getInfo()));
supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(
SupplyCategory.OTHER_DRUGS_WAREHOUSING.getValue(), SupplyCategory.OTHER_DRUGS_WAREHOUSING.getInfo()));
supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(
SupplyCategory.DONATED_DRUGS_WAREHOUSING.getValue(), SupplyCategory.DONATED_DRUGS_WAREHOUSING.getInfo()));
purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);

12
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStockOutOrderServiceImpl.java
View File

@@ -56,12 +56,12 @@ public class PharmacyWarehouseStockOutOrderServiceImpl implements IPharmacyWareh
// 单据分类
List<PharmacyWarehouseInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
// supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.IN_HOSPITAL_OUTBOUND.getValue(),
// SupplyCategory.IN_HOSPITAL_OUTBOUND.getInfo()));
// supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.OUT_OF_HOSPITAL_OUTBOUND.getValue(),
// SupplyCategory.OUT_OF_HOSPITAL_OUTBOUND.getInfo()));
// supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.OTHER_OUTBOUND.getValue(),
// SupplyCategory.OTHER_OUTBOUND.getInfo()));
supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.IN_HOSPITAL_OUTBOUND.getValue(),
SupplyCategory.IN_HOSPITAL_OUTBOUND.getInfo()));
supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.OUT_OF_HOSPITAL_OUTBOUND.getValue(),
SupplyCategory.OUT_OF_HOSPITAL_OUTBOUND.getInfo()));
supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.OTHER_OUTBOUND.getValue(),
SupplyCategory.OTHER_OUTBOUND.getInfo()));
purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);

8
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStocktakingOrderServiceImpl.java
View File

@@ -57,10 +57,10 @@ public class PharmacyWarehouseStocktakingOrderServiceImpl implements IPharmacyWa
// 单据分类
List<PharmacyWarehouseInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
// supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(
// SupplyCategory.GENERAL_STOCKTAKING.getValue(), SupplyCategory.GENERAL_STOCKTAKING.getInfo()));
// supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(
// SupplyCategory.MONTHLY_STOCKTAKING.getValue(), SupplyCategory.MONTHLY_STOCKTAKING.getInfo()));
supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(
SupplyCategory.GENERAL_STOCKTAKING.getValue(), SupplyCategory.GENERAL_STOCKTAKING.getInfo()));
supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(
SupplyCategory.MONTHLY_STOCKTAKING.getValue(), SupplyCategory.MONTHLY_STOCKTAKING.getInfo()));
purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);

226
openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SupplyCategory.java
View File

@@ -23,120 +23,120 @@ public enum SupplyCategory implements HisEnumInterface {
/**
* 非库存供应
*/
NON_STOCK(2, "2", "非库存供应");
NON_STOCK(2, "2", "非库存供应"),
// /**
// * 普通
// */
// NORMAL(3, "3","0.普通"),
// /**
// * 采购计划生成
// */
// PURCHASE_PLAN_GENERATION(4, "4","1.采购计划生成"),
// /**
// * 外购药品入库
// */
// PURCHASED_DRUGS_WAREHOUSING(5, "5","0.外购药品入库"),
// /**
// * 自制药品入库
// */
// HOMEMADE_DRUGS_WAREHOUSING(6, "6","1.自制药品入库"),
// /**
// * 代销药品入库
// */
// CONSIGNMENT_DRUGS_WAREHOUSING(7, "7","2.代销药品入库"),
// /**
// * 其他药品入库
// */
// OTHER_DRUGS_WAREHOUSING(8, "8","3.其他药品入库"),
// /**
// * 赠送药品入库
// */
// DONATED_DRUGS_WAREHOUSING(9, "9","4.赠送药品入库"),
// /**
// * 申请采购
// */
// PURCHASE_APPLICATION(10, "10","1.申请采购"),
// /**
// * 院内出库
// */
// IN_HOSPITAL_OUTBOUND(11, "11","0.院内出库"),
// /**
// * 院外出库
// */
// OUT_OF_HOSPITAL_OUTBOUND(12, "12","1.院外出库"),
// /**
// * 其他出库
// */
// OTHER_OUTBOUND(13, "13","2.其他出库"),
// /**
// * 普通损益
// */
// GENERAL_PROFIT_AND_LOSS(14, "14","0.普通损益"),
// /**
// * 盘点损益
// */
// STOCKTAKING_PROFIT_AND_LOSS(15, "15","1.盘点损益"),
// /**
// * 制剂消耗
// */
// PREPARATION_CONSUMPTION(16, "16","2.制剂消耗"),
// /**
// * 常备抢救药品
// */
// STANDBY_RESCUE_MEDICINES(16, "16","2.常备抢救药品"),
// /**
// * 破损过期药品
// */
// DAMAGED_EXPIRED_MEDICINES(16, "16","3.破损过期药品"),
// /**
// * 捐赠药品
// */
// DONATED_MEDICINES(16, "16","4.捐赠药品"),
// /**
// * 普通盘点
// */
// GENERAL_STOCKTAKING(17, "17","0.普通盘点"),
// /**
// * 月度盘点
// */
// MONTHLY_STOCKTAKING(18, "18","1.月度盘点"),
// /**
// * 门诊病人发药
// */
// OUTPATIENT_PATIENT_DISPENSING(19, "19","0.门诊病人发药"),
// /**
// * 住院病人发药
// */
// INPATIENT_PATIENT_DISPENSING(20, "20","1.住院病人发药"),
// /**
// * 住院病人汇总发药
// */
// INPATIENT_PATIENT_SUMMARY_DISPENSING(21, "21","2.住院病人汇总发药"),
// /**
// * 赠送
// */
// PRESENT(22, "22","1.赠送"),
// /**
// * 视光材料
// */
// OPTICAL_MATERIALS(23, "23","2.视光材料"),
// /**
// * 调价分类 药品
// */
// REQUEST_CATEGORY_CHANGE_PRICE_MEDICATION(24, "24","药品调价单"),
// /**
// * 调价分类 耗材
// */
// REQUEST_CATEGORY_CHANGE_PRICE_DEVICE(25, "25","耗材调价单"),
// /**
// * 调价分类 诊疗
// */
// REQUEST_CATEGORY_CHANGE_PRICE_ACTIVITY(26, "26","诊疗调价单"),
// /**
// * 调价分类 挂号
// */
// REQUEST_CATEGORY_CHANGE_PRICE_HEALTH(27, "27","挂号调价单");
/**
* 普通
*/
NORMAL(3, "3", "0.普通"),
/**
* 采购计划生成
*/
PURCHASE_PLAN_GENERATION(4, "4", "1.采购计划生成"),
/**
* 外购药品入库
*/
PURCHASED_DRUGS_WAREHOUSING(5, "5", "0.外购药品入库"),
/**
* 自制药品入库
*/
HOMEMADE_DRUGS_WAREHOUSING(6, "6", "1.自制药品入库"),
/**
* 代销药品入库
*/
CONSIGNMENT_DRUGS_WAREHOUSING(7, "7", "2.代销药品入库"),
/**
* 其他药品入库
*/
OTHER_DRUGS_WAREHOUSING(8, "8", "3.其他药品入库"),
/**
* 赠送药品入库
*/
DONATED_DRUGS_WAREHOUSING(9, "9", "4.赠送药品入库"),
/**
* 申请采购
*/
PURCHASE_APPLICATION(10, "10", "1.申请采购"),
/**
* 院内出库
*/
IN_HOSPITAL_OUTBOUND(11, "11", "0.院内出库"),
/**
* 院外出库
*/
OUT_OF_HOSPITAL_OUTBOUND(12, "12", "1.院外出库"),
/**
* 其他出库
*/
OTHER_OUTBOUND(13, "13", "2.其他出库"),
/**
* 普通损益
*/
GENERAL_PROFIT_AND_LOSS(14, "14", "0.普通损益"),
/**
* 盘点损益
*/
STOCKTAKING_PROFIT_AND_LOSS(15, "15", "1.盘点损益"),
/**
* 制剂消耗
*/
PREPARATION_CONSUMPTION(16, "16", "2.制剂消耗"),
/**
* 常备抢救药品
*/
STANDBY_RESCUE_MEDICINES(17, "17", "2.常备抢救药品"),
/**
* 破损过期药品
*/
DAMAGED_EXPIRED_MEDICINES(18, "18", "3.破损过期药品"),
/**
* 捐赠药品
*/
DONATED_MEDICINES(19, "19", "4.捐赠药品"),
/**
* 普通盘点
*/
GENERAL_STOCKTAKING(20, "20", "0.普通盘点"),
/**
* 月度盘点
*/
MONTHLY_STOCKTAKING(21, "21", "1.月度盘点"),
/**
* 门诊病人发药
*/
OUTPATIENT_PATIENT_DISPENSING(22, "22", "0.门诊病人发药"),
/**
* 住院病人发药
*/
INPATIENT_PATIENT_DISPENSING(23, "23", "1.住院病人发药"),
/**
* 住院病人汇总发药
*/
INPATIENT_PATIENT_SUMMARY_DISPENSING(24, "24", "2.住院病人汇总发药"),
/**
* 赠送
*/
PRESENT(25, "25", "1.赠送"),
/**
* 视光材料
*/
OPTICAL_MATERIALS(26, "26", "2.视光材料"),
/**
* 调价分类 药品
*/
REQUEST_CATEGORY_CHANGE_PRICE_MEDICATION(27, "27", "药品调价单"),
/**
* 调价分类 耗材
*/
REQUEST_CATEGORY_CHANGE_PRICE_DEVICE(28, "28", "耗材调价单"),
/**
* 调价分类 诊疗
*/
REQUEST_CATEGORY_CHANGE_PRICE_ACTIVITY(29, "29", "诊疗调价单"),
/**
* 调价分类 挂号
*/
REQUEST_CATEGORY_CHANGE_PRICE_HEALTH(30, "30", "挂号调价单");
private Integer value;
private String code;
private String info;