Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashDataLineChartAction.java =================================================================== diff -u -r40891 -r40910 --- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashDataLineChartAction.java (.../WashDataLineChartAction.java) (revision 40891) +++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashDataLineChartAction.java (.../WashDataLineChartAction.java) (revision 40910) @@ -291,13 +291,17 @@ } } /** - * 获取新华pdf + * 获取pdf */ - public void getXinHuaDataPDFFile(){ - Long washAndDisinfectRecordId = StrutsParamUtils.getPraramLongValue("recordId", 0L); - Long xinHuaDataPDFId = StrutsParamUtils.getPraramLongValue("xinHuaDataPDFId", 0L); - String type = StrutsParamUtils.getPraramValue("type", "rinser"); - JSONObject result = washAndDisinfectRecordManager.getXinHuaDataPDF(washAndDisinfectRecordId,type, xinHuaDataPDFId); + public void getPDFFile(){ + //清洗记录id + Long washAndDisinfectRecordId = StrutsParamUtils.getPraramLongValue("washAndDisinfectRecordId", 0L); + //灭菌记录id + Long sterilizationRecordId = StrutsParamUtils.getPraramLongValue("sterilizationRecordId", 0L); + //清洗参数PDFid 或者 灭菌参数PDFid + Long dataRecordId = StrutsParamUtils.getPraramLongValue("dataRecordId", 0L); + + JSONObject result = washAndDisinfectRecordManager.getDataPDF(washAndDisinfectRecordId,sterilizationRecordId, dataRecordId); HttpServletResponse httpServletResponse = StrutsParamUtils .getResponse(); httpServletResponse.setCharacterEncoding("UTF-8");