Index: ssts-web/src/main/java/test/forgon/disinfectsystem/AbstractCSSDTest.java =================================================================== diff -u -r17679 -r17685 --- ssts-web/src/main/java/test/forgon/disinfectsystem/AbstractCSSDTest.java (.../AbstractCSSDTest.java) (revision 17679) +++ ssts-web/src/main/java/test/forgon/disinfectsystem/AbstractCSSDTest.java (.../AbstractCSSDTest.java) (revision 17685) @@ -1281,7 +1281,7 @@ supplyRoomConfig.setDisposableGoodsExpTime(20); supplyRoomConfig.setSupplyRoomType(SupplyRoomConfig.SUPPLYROOM_TYPE_0); supplyRoomConfig.setDefalutTaskGroup("外来器械组");//外来器械处理任务组 - supplyRoomConfig.setForeignTousseCleanedEntirely(Constants.STR_YES);//外来器械是否整包清洗 + supplyRoomConfig.setForeignTousseCleanedEntirely(com.forgon.Constants.STR_YES);//外来器械是否整包清洗 supplyRoomConfig.setBigPackageSterilizerType("超大超重");//超大、重外来器械灭菌方式 supplyRoomConfig.setDptNameOfForeignTousse(Constants.ORG_UNIT_NAME_CSSD);//外来器械包处理科室 supplyRoomConfig.setDptCodeOfForeignTousse(Constants.ORG_UNIT_CODE_CSSD);//外来器械包处理科室编码 @@ -1975,16 +1975,16 @@ private void initForeignTousse() { MaterialDefinition md_Test钢板 = new MaterialDefinition(); md_Test钢板.setName("Test钢板"); - md_Test钢板.setIsImplant(Constants.STR_NO); - md_Test钢板.setIsForeignMaterial(Constants.STR_YES); + md_Test钢板.setIsImplant(com.forgon.Constants.STR_NO); + md_Test钢板.setIsForeignMaterial(com.forgon.Constants.STR_YES); md_Test钢板.setSpecification("F1"); md_Test钢板.setType("金属类"); md_Test钢板.setCost(2.4); MaterialDefinition md_Test螺钉 = new MaterialDefinition(); md_Test螺钉.setName("Test螺钉"); - md_Test螺钉.setIsImplant(Constants.STR_YES); - md_Test螺钉.setIsForeignMaterial(Constants.STR_YES); + md_Test螺钉.setIsImplant(com.forgon.Constants.STR_YES); + md_Test螺钉.setIsForeignMaterial(com.forgon.Constants.STR_YES); md_Test螺钉.setSpecification("F2"); md_Test螺钉.setType("金属类"); md_Test螺钉.setCost(2.4); Index: ssts-web/src/main/java/test/forgon/constant/Constants.java =================================================================== diff -u -r17665 -r17685 --- ssts-web/src/main/java/test/forgon/constant/Constants.java (.../Constants.java) (revision 17665) +++ ssts-web/src/main/java/test/forgon/constant/Constants.java (.../Constants.java) (revision 17685) @@ -50,12 +50,4 @@ * 测试外科名称 */ public static final String ORG_UNIT_NAME_WAIKE= "测试外科"; - /** - * 字符串“是” - */ - public static final String STR_YES = "是"; - /** - * 字符串“否” - */ - public static final String STR_NO = "否"; } Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizingStoveUseCountView.js =================================================================== diff -u -r17582 -r17685 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizingStoveUseCountView.js (.../sterilizingStoveUseCountView.js) (revision 17582) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizingStoveUseCountView.js (.../sterilizingStoveUseCountView.js) (revision 17685) @@ -37,7 +37,16 @@ if(queryType == "明细"){ jasperReportName = "sterilizingStoveUseCountDetail.jasper"; } - window.open(WWWROOT+"/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do?jasperreportName=" + jasperReportName + "&startTime="+startTime+"&endTime="+endTime+"&reportName=sterilizingStoveUseCount&querySupplyRoom="+querySupplyRoom+"&querySupplyRoomCoding="+querySupplyRoomCoding+"&sterilizationPurpose="+sterilizationPurpose+"&queryType="+queryType,'thisIframe','_self'); + window.open(WWWROOT+"/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do" + + "?jasperreportName=" + jasperReportName + + "&reportName=sterilizingStoveUseCount" + + "&startTime=" + startTime + + "&endTime=" + endTime + + "&querySupplyRoom=" + querySupplyRoom + + "&querySupplyRoomCoding=" + querySupplyRoomCoding + + "&sterilizationPurpose=" + sterilizationPurpose + + "&queryType=" + queryType, + 'thisIframe','_self'); }