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

up

Browse Source
This commit is contained in:
菲菲
2025-03-31 10:18:49 +08:00
parent d1e30ada97
commit b5df8479da
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/IWesternMedicineDispenseAppServiceImpl.java
View File

@@ -208,21 +208,21 @@ public class IWesternMedicineDispenseAppServiceImpl implements IWesternMedicineD
// id
inventoryItem.setId(dispenseInventoryDto.getInventoryId());
// 包装数量
inventoryItem.setBaseQuantity(dispenseInventoryDto.getInventoryBaseQuantity().
min(new BigDecimal(dispenseInventoryDto.getDispenseQuantity())));
inventoryItem.setBaseQuantity(dispenseInventoryDto.getInventoryBaseQuantity().subtract(
new BigDecimal(dispenseInventoryDto.getDispenseQuantity())));
// 拆零数量（拆零比×包装数量）
inventoryItem.setMinQuantity(dispenseInventoryDto.getInventoryMinQuantity().
min(dispenseInventoryDto.getPartPercent().multiply(
inventoryItem.setMinQuantity(dispenseInventoryDto.getInventoryMinQuantity().subtract(
dispenseInventoryDto.getPartPercent().multiply(
new BigDecimal(dispenseInventoryDto.getDispenseQuantity()))));
} else if (dispenseInventoryDto.getDispenseUnitCode().equals(dispenseInventoryDto.
getInventoryMinUnitCode())) {
// id
inventoryItem.setId(dispenseInventoryDto.getInventoryId());
// 拆零数量
inventoryItem.setMinQuantity(dispenseInventoryDto.getInventoryMinQuantity().min(
inventoryItem.setMinQuantity(dispenseInventoryDto.getInventoryMinQuantity().subtract(
new BigDecimal(dispenseInventoryDto.getDispenseQuantity())));
// 包装数量（拆零数量÷拆零比）
inventoryItem.setBaseQuantity(dispenseInventoryDto.getInventoryBaseQuantity().min(
inventoryItem.setBaseQuantity(dispenseInventoryDto.getInventoryBaseQuantity().subtract(
new BigDecimal(dispenseInventoryDto.getDispenseQuantity()).
divide(dispenseInventoryDto.getPartPercent(),RoundingMode.HALF_UP)));
}

3
openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/WesternMedicineDispenseController.java
View File

@@ -85,7 +85,6 @@ public class WesternMedicineDispenseController {
@PutMapping("/medicine-cancel")
public R<?> medicineCancel(@RequestParam(value = "prescriptionNo") String prescriptionNo,
@RequestParam(value = "notPerformedReasonEnum") Integer notPerformedReasonEnum) {
//return iWesternMedicineDispenseService.medicineCancel(prescriptionNo, notPerformedReasonEnum);
return R.ok();
return iWesternMedicineDispenseService.medicineCancel(prescriptionNo, notPerformedReasonEnum);
}
}