Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r28335 -r28363 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 28335) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 28363) @@ -3679,8 +3679,19 @@ if (isChangeApplyDepart) { application.setDepartCoding(record.getDepartCode()); application.setDepart(record.getDepart()); - application.setSettleAccountsDepart(record.getDepart()); - application.setSettleAccountsDepartCoding(record.getDepartCode()); + + String settleAccountsDepart = record.getDepart(); + String settleAccountsDepartCoding = record.getDepartCode(); + SupplyRoomConfig settleSupplyRoomConfig = supplyRoomConfigManager.getApplyDepartDefaultSettleDepart(record.getDepartCode()); + if(settleSupplyRoomConfig != null){ + //如果科室供应室配置的申请科室对应的默认结算科室编码为空的话,取申请科室的编码及名称 + if(StringUtils.isNotBlank(settleSupplyRoomConfig.getOrgUnitCoding())){ + settleAccountsDepart = settleSupplyRoomConfig.getOrgUnitName(); + settleAccountsDepartCoding = settleSupplyRoomConfig.getOrgUnitCoding(); + } + } + application.setSettleAccountsDepart(settleAccountsDepart); + application.setSettleAccountsDepartCoding(settleAccountsDepartCoding); } Map appTousseItemMap = new HashMap(); if(applicationItemList != null){