Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp =================================================================== diff -u -r26978 -r26988 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp (.../goodsApplicationView.jsp) (revision 26978) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp (.../goodsApplicationView.jsp) (revision 26988) @@ -37,11 +37,11 @@ else{ out.println(""); } - Double foreignToussePrice = sysParamsObj.getForeignToussePrice(); - if(foreignToussePrice == null || foreignToussePrice.isNaN()){ - foreignToussePrice = 0.0; + Double foreignToussePriceOfSysParams = sysParamsObj.getForeignToussePrice(); + if(foreignToussePriceOfSysParams == null || foreignToussePriceOfSysParams.isNaN()){ + foreignToussePriceOfSysParams = 0.0; } - pageContext.setAttribute("foreignToussePrice", foreignToussePrice); + pageContext.setAttribute("foreignToussePriceOfSysParams", foreignToussePriceOfSysParams); if(currentOrgUnitName != null && currentOrgUnitCode != null){ request.setAttribute("depart",currentOrgUnitName); request.setAttribute("departCoding",currentOrgUnitCode); @@ -233,7 +233,7 @@ var tousseTypeDisinfect = '<%=TousseDefinition.PACKAGE_TYPE_DISINFECTION%>;<%=TousseDefinition.PACKAGE_TYPE_STERILIZATION%>';//消毒物品和灭菌物品 var endCause = ${endCause}; var tousseType_diposableGoods = '一次性物品'; -var foreignToussePrice = '<%=pageContext.getAttribute("foreignToussePrice")%>'; +var foreignToussePriceOfSysParams = '<%=pageContext.getAttribute("foreignToussePriceOfSysParams")%>'; //包大小定义 var PACKAGE_SIZE_HUGE = '<%=TousseDefinition.PACKAGE_SIZE_HUGE%>'; var PACKAGE_SIZE_BIG = '<%=TousseDefinition.PACKAGE_SIZE_BIG%>';