Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java =================================================================== diff -u -r26285 -r26336 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 26285) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 26336) @@ -4125,6 +4125,13 @@ } else { applicationTime = null; recyclingTime = null; + //自定义发货时,结算科室取申请科室对应的默认结算科室 + SupplyRoomConfig supplyRoomConfig = + supplyRoomConfigManager.getApplyDepartDefaultSettleDepart(departCoding); + if(supplyRoomConfig != null){ + settleAccountsDepart = supplyRoomConfig.getOrgUnitName(); + settleAccountsDepartCoding = supplyRoomConfig.getOrgUnitCoding(); + } } invoice.setInvoicePlanType(invoicePlanType); invoice.setDepart(depart);