diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/IWesternMedicineDispenseAppServiceImpl.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/IWesternMedicineDispenseAppServiceImpl.java
index bfcda523..8bc6f538 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/IWesternMedicineDispenseAppServiceImpl.java
+++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/IWesternMedicineDispenseAppServiceImpl.java
@@ -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)));
                 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/WesternMedicineDispenseController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/WesternMedicineDispenseController.java
index d49aa2e8..85576931 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/WesternMedicineDispenseController.java
+++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/WesternMedicineDispenseController.java
@@ -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);
     }
 }
\ No newline at end of file