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

药品出货单按钮被隐藏bug修复

Browse Source
This commit is contained in:
nanyangbreeze
2025-12-24 15:59:56 +08:00
parent 44be570ffa
commit 17c7cc70ed
4 changed files with 125 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,12 +59,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-common/src/main/java/com/openhis/common/enums/SupplyCategory.java
View File

@@ -24,7 +24,7 @@ public enum SupplyCategory implements HisEnumInterface {
/**
* 非库存供应
*/
NON_STOCK(2, "2", "非库存供应");
NON_STOCK(2, "2", "非库存供应"),
// /**
// * 普通
@@ -61,15 +61,15 @@ public enum SupplyCategory implements HisEnumInterface {
// /**
// * 院内出库
// */
// IN_HOSPITAL_OUTBOUND(11, "11","0.院内出库"),
IN_HOSPITAL_OUTBOUND(11, "11","0.院内出库"),
// /**
// * 院外出库
// */
// OUT_OF_HOSPITAL_OUTBOUND(12, "12","1.院外出库"),
OUT_OF_HOSPITAL_OUTBOUND(12, "12","1.院外出库"),
// /**
// * 其他出库
// */
// OTHER_OUTBOUND(13, "13","2.其他出库"),
OTHER_OUTBOUND(13, "13","2.其他出库");
// /**
// * 普通损益
// */