Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java =================================================================== diff -u -r33861 -r33877 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 33861) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 33877) @@ -2035,9 +2035,9 @@ } } - if (ObjectUtils.equals("gdsy", CssdUtils.getProjectName())){ + if(CssdUtils.getSystemSetConfigByNameBool("showMiddlePackageAmount", false)){ Integer middlePackageAmount = MathTools.object2Integer(item.getMiddlePackageAmount()); - vo.setAmountDisplay(ObjectUtils.equals(CssdUtils.getSystemSetConfigByName("showMiddlePackageAmount"), "true") && middlePackageAmount != 0 ? + vo.setAmountDisplay(middlePackageAmount != 0 ? middlePackageAmount + "(" + item.getMiddlePackageUnit() + ")" : vo.getAmount() + "(" + item.getUnit() + ")"); } }