Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js =================================================================== diff -u -r26978 -r26988 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 26978) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 26988) @@ -1227,7 +1227,7 @@ splitNumber : (splitNumber ? splitNumber : defaultSplitNumber), amount : 1, includeImplant : '', - price : foreignToussePrice, + price : foreignToussePriceOfSysParams, type : 'tousse', usedAmountOfIncludeImplant : 0, implantAmountOfUseRecord : 0, Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp =================================================================== diff -u -r24786 -r26988 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp (.../foreignTousseApplicationView.jsp) (revision 24786) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp (.../foreignTousseApplicationView.jsp) (revision 26988) @@ -31,7 +31,15 @@ else{ out.println(""); } - + SupplyRoomConfig sysParamsObj = supplyRoomConfigManager.getSystemParamsObj(); + if (sysParamsObj == null){ + out.println(""); + } + Double foreignToussePriceOfSysParams = sysParamsObj.getForeignToussePrice(); + if(foreignToussePriceOfSysParams == null || foreignToussePriceOfSysParams.isNaN()){ + foreignToussePriceOfSysParams = 0.0; + } + pageContext.setAttribute("foreignToussePriceOfSysParams", foreignToussePriceOfSysParams); OperationManager operationManager = (OperationManager) SpringBeanManger .getBean("operationManager"); boolean has = operationManager.isCurrentUserHaveAnyOperation("SSTS_ForeignTousseApplication_ShowAll"); @@ -95,6 +103,7 @@ //图片类型(申请采集图片) var imageTypeCameraApplication = '<%=ImageFile.IMAGE_TYPE_CAMERA_APPLICATION%>'; + var foreignToussePriceOfSysParams = '<%=pageContext.getAttribute("foreignToussePriceOfSysParams")%>'; 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%>'; Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationView.jsp =================================================================== diff -u -r24899 -r26988 --- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationView.jsp (.../interfereForeignTousseApplicationView.jsp) (revision 24899) +++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationView.jsp (.../interfereForeignTousseApplicationView.jsp) (revision 26988) @@ -23,6 +23,7 @@ var PACKAGE_SIZE_BIG = '<%=TousseDefinition.PACKAGE_SIZE_BIG%>'; var PACKAGE_SIZE_CENTER = '<%=TousseDefinition.PACKAGE_SIZE_CENTER%>'; var PACKAGE_SIZE_SMALL = '<%=TousseDefinition.PACKAGE_SIZE_SMALL%>'; + var foreignToussePriceOfSysParams = 0;