Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
===================================================================
diff -u -r34596 -r34599
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 34596)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 34599)
@@ -2846,6 +2846,7 @@
 			SupplyRoomConfig config = supplyRoomConfigManager.getSystemParamsObj();
 			String title = null;
 			int moneyDigitCount = CssdUtils.getSystemSetConfigByNameInt("moneyDigitCount", 4);
+			boolean printByDepart = StrutsParamUtils.getBoolPraramValue("printByDepart", false);
 			if("singleDepart".equals(patternOfReport)){
 				if(config != null && StringUtils.isNotBlank(config.getUnitName())){
 					title = config.getUnitName() + "消毒供应中心出库清单";
@@ -2857,19 +2858,19 @@
 				map.put("tabulator", "制表人：" + AcegiHelper.getLoginUser().getUserFullName());
 				map.put("statisticsTime", "统计时间：" + startTime.substring(0, 10) + "~" + endTime.substring(0, 10));
 				map.put("amountFormat", moneyDigitCount == 2?"###0.00":"###0.0000");
-			}else if("dgshlyyMode".equals(patternOfReport)){
+			}else if(printByDepart){
 				String tousseType = StrutsParamUtils.getPraramValue("tousseType",null);
 				String disposableGoodsType = StrutsParamUtils.getPraramValue("disposableGoodsType", "");;
 				if(!"一次性物品".equals(tousseType) && StringUtils.isNotBlank(tousseType) && !tousseType.contains(",")){
-					title = "供应室出库统计表（"+ tousseType +"）（" + startTime + " & " + endTime + "）";
+					title = "供应室出库统计表（"+ tousseType +"）";
 				}else if("一次性物品".equals(tousseType)){
 					if(StringUtils.isBlank(disposableGoodsType)){
-						title = "供应室出库统计表（一次性物品）（" + startTime + " & " + endTime + "）";
+						title = "供应室出库统计表（一次性物品）";
 					}else{
-						title = "供应室出库统计表（"+ disposableGoodsType +"）（" + startTime + " & " + endTime + "）";
+						title = "供应室出库统计表（"+ disposableGoodsType +"）";
 					}
 				}else{
-					title = "供应室出库统计表（" + startTime + " & " + endTime + "）";
+					title = "供应室出库统计表";
 				}
 			} else{
 				title = "明细核算月报(" + startTime +" & " + endTime +")";
@@ -4700,7 +4701,7 @@
 		JSONObject obj = new JSONObject();
 		try {
 			String reportName = StrutsParamUtils.getPraramValue("reportName", "");
-			Map<String, Object> parametMap = new HashMap<String, Object>();;  //获取构建报表需要的参数
+			Map<String, Object> parametMap = getParametMap(reportName);  //获取构建报表需要的参数
 			List dataSourceList = getDataSourceList(null , reportName, StrutsParamUtils.getParameters(), parametMap);
 			JSONArray arr = JSONArray.fromObject(dataSourceList);
 			obj.put("data", arr);