Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java =================================================================== diff -u -r26525 -r26754 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java (.../SupplyRoomConfigAction.java) (revision 26525) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java (.../SupplyRoomConfigAction.java) (revision 26754) @@ -880,12 +880,16 @@ if("是".equals(isTousseDgMergeConvertStr)){ isTousseDgMergeConvert = true; } + //报损器械计算科室成本 String damagedTousseAtCost = rq.getParameter("damagedTousseAtCost"); + //包内材料扣减科室成本 + String insideTousseMaterialOutCost = rq.getParameter("insideTousseMaterialOutCost"); supplyRoomConfig.setNoMergeApplicationTypes(noMergeApplicationTypes); supplyRoomConfig.setIsPackingAfterWashTimeEnd(isPackingAfterWashTimeEnd); supplyRoomConfig.setIsDgConvertApplication(isDgConvertApplication); supplyRoomConfig.setIsTousseDgMergeConvert(isTousseDgMergeConvert); supplyRoomConfig.setDamagedTousseAtCost(damagedTousseAtCost); + supplyRoomConfig.setInsideTousseMaterialOutCost(insideTousseMaterialOutCost); supplyRoomConfig.setAutoMergeApplication(autoMergeApplication); supplyRoomConfig.setIsORAppFormMerge(isORAppFormMerge); supplyRoomConfig.setSecondWashCountWorkload(secondWashCountWorkload);