Index: ssts-web/src/main/webapp/disinfectsystem/config/dysyy/config.js
===================================================================
diff -u -r17025 -r17183
--- ssts-web/src/main/webapp/disinfectsystem/config/dysyy/config.js	(.../config.js)	(revision 17025)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dysyy/config.js	(.../config.js)	(revision 17183)
@@ -77,5 +77,7 @@
   //启用器械包的折扣价功能,默认不启用 true:启用 false:不启用 (为0或''等不启用,其它值启用)
   enableDiscountPrice:true,
   //使用记录转换的申请单是否合并到旧的申请单(合并到该科室待回收、待发货的单),默认不合并 true:合并 false:不合并
-  useRecordToRecyclingApplicationMerge : true
+  useRecordToRecyclingApplicationMerge : true,
+//核算月报只有一列的时候，是否使用另外的一个模板。新模板的名称monthReportOneColumn.jasper
+  applyMonthReportOneColumnTemplate:true
 }
\ No newline at end of file
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r17173 -r17183
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 17173)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 17183)
@@ -5825,14 +5825,17 @@
 					String diposable = rs.getString(4);
 					Double discountPrice = rs.getDouble("settlementDiscountPrice");
 					String columnName = "";
+					String costColumn = "";
 					if("是".equals(diposable)){
 						columnName = "一次性物品总价";
+						costColumn = "一次性物品记支";
 					}else{
 						columnName = "器械包总价";
+						costColumn = "器械包记支";
 					}
-					newMonthReport(code, dept,"1", "价格统计",columnName,price, list);
+					newMonthReport(code, dept,"2", "价格统计",columnName,price, list);
 					if(enableDiscountPrice){
-						newMonthReport(code, dept,"3", "折扣价格统计",columnName,discountPrice, list);
+						newMonthReport(code, dept,"1", "科室记支",costColumn,discountPrice, list);
 					}
 				}
 			} catch (SQLException e) {
@@ -5857,17 +5860,17 @@
 						String code = rs5.getString(4);
 						String dept = rs5.getString(5);
 						if("一次性物品".equals(type)){
-							newMonthReport(code, dept, "1", "价格统计", "一次性物品总价", price, list);
+							newMonthReport(code, dept, "2", "价格统计", "一次性物品总价", price, list);
 							if(enableDiscountPrice){
-								newMonthReport(code, dept,"3", "折扣价格统计","一次性物品总价",price, list);
+								newMonthReport(code, dept,"1", "科室记支","一次性物品记支",price, list);
 							}
-							newMonthReport(code, dept, "2", "数量统计", "一次性物品数量", amount, list);
+							newMonthReport(code, dept, "3", "数量统计", "一次性物品数量", amount, list);
 						}else{
-							newMonthReport(code, dept, "1", "价格统计", "器械包总价", price, list);
+							newMonthReport(code, dept, "2", "价格统计", "器械包总价", price, list);
 							if(enableDiscountPrice){
-								newMonthReport(code, dept,"3", "折扣价格统计","器械包总价",price, list);
+								newMonthReport(code, dept,"1", "科室记支","器械包记支",price, list);
 							}
-							newMonthReport(code, dept, "2", "数量统计", "器械包数量", amount, list);
+							newMonthReport(code, dept, "3", "数量统计", "器械包数量", amount, list);
 						}
 					}
 				}catch(Exception e){
@@ -5891,9 +5894,9 @@
 					Double price = materialInvoicePriceResultSet.getDouble(3);
 					String columnName = "材料总价";
 					
-					newMonthReport(code, dept,"1", "价格统计",columnName,price, list);
+					newMonthReport(code, dept,"2", "价格统计",columnName,price, list);
 					if(enableDiscountPrice){
-						newMonthReport(code, dept,"3", "折扣价格统计",columnName,price, list);
+						newMonthReport(code, dept,"1", "科室记支","材料记支",price, list);
 					}
 				}
 			} catch (SQLException e) {
@@ -5916,7 +5919,7 @@
 					String dept = materialInvoiceAmountResultSet.getString(2);
 					Double tousseAmount = materialInvoiceAmountResultSet.getDouble(3);
 					if(tousseAmount > 0){
-						newMonthReport(code, dept,"2","数量统计", "材料数量",tousseAmount,list);
+						newMonthReport(code, dept,"3","数量统计", "材料数量",tousseAmount,list);
 					}
 				}
 			} catch (SQLException e) {
@@ -5944,10 +5947,10 @@
 						Double money = rs33.getDouble(4);
 						Double amount = rs33.getDouble(5);
 						
-						newMonthReport(code, dept, "2", "数量统计", "材料数量", amount, list);
-						newMonthReport(code, dept, "1", "价格统计", "材料总价", money, list);
+						newMonthReport(code, dept, "3", "数量统计", "材料数量", amount, list);
+						newMonthReport(code, dept, "2", "价格统计", "材料总价", money, list);
 						if(enableDiscountPrice){
-							newMonthReport(code, dept,"3", "折扣价格统计","材料总价",money, list);
+							newMonthReport(code, dept,"1", "科室记支","材料记支",money, list);
 						}
 					}
 				}
@@ -5976,10 +5979,10 @@
 						Double money = rs3.getDouble(4);
 						Double amount = rs3.getDouble(5);
 						
-						newMonthReport(code, dept,"2", "数量统计","材料数量",amount, list);
-						newMonthReport(code, dept,"1", "价格统计","材料总价",money, list);
+						newMonthReport(code, dept,"3", "数量统计","材料数量",amount, list);
+						newMonthReport(code, dept,"2", "价格统计","材料总价",money, list);
 						if(enableDiscountPrice){
-							newMonthReport(code, dept,"3", "折扣价格统计","材料总价",money, list);
+							newMonthReport(code, dept,"1", "科室记支","材料记支",money, list);
 						}
 					}
 				}
@@ -6004,10 +6007,10 @@
 					Double price = materialReturnResultSet.getDouble(3);
 					Double amount = materialReturnResultSet.getDouble(4);
 					
-					newMonthReport(code, dept, "1", "价格统计", "材料总价", price, list);
-					newMonthReport(code, dept, "2", "数量统计", "材料数量", amount, list);
+					newMonthReport(code, dept, "2", "价格统计", "材料总价", price, list);
+					newMonthReport(code, dept, "3", "数量统计", "材料数量", amount, list);
 					if(enableDiscountPrice){
-						newMonthReport(code, dept,"3", "折扣价格统计","材料总价",price, list);
+						newMonthReport(code, dept,"1", "科室记支","材料记支",price, list);
 					}
 				}
 			}catch(Exception e){
@@ -6036,7 +6039,7 @@
 					String dept = disposableGoodsInvoiceAmountResultSet.getString(2);
 					Double diposableAmount = disposableGoodsInvoiceAmountResultSet.getDouble(3);
 					if(diposableAmount > 0){
-						newMonthReport(code, dept,"2","数量统计", "一次性物品数量",diposableAmount,list);
+						newMonthReport(code, dept,"3","数量统计", "一次性物品数量",diposableAmount,list);
 					}
 				}
 			} catch (SQLException e) {
@@ -6078,17 +6081,17 @@
 					Double amount = rs4.getDouble(3);
 					String code = rs4.getString(4);
 					if("一次性物品".equals(type)){
-						newMonthReport(code, config.getOrgUnitName(), "1", "价格统计", "一次性物品总价", price, list);
+						newMonthReport(code, config.getOrgUnitName(), "2", "价格统计", "一次性物品总价", price, list);
 						if(enableDiscountPrice){
-							newMonthReport(code, config.getOrgUnitName(),"3", "折扣价格统计","一次性物品总价",price, list);
+							newMonthReport(code, config.getOrgUnitName(),"1", "科室记支","一次性物品记支",price, list);
 						}
-						newMonthReport(code, config.getOrgUnitName(), "2", "数量统计", "一次性物品数量", amount, list);
+						newMonthReport(code, config.getOrgUnitName(), "3", "数量统计", "一次性物品数量", amount, list);
 					}else{
-						newMonthReport(code, config.getOrgUnitName(), "1", "价格统计", "材料总价", price, list);
+						newMonthReport(code, config.getOrgUnitName(), "2", "价格统计", "材料总价", price, list);
 						if(enableDiscountPrice){
-							newMonthReport(code, config.getOrgUnitName(),"3", "折扣价格统计","材料总价",price, list);
+							newMonthReport(code, config.getOrgUnitName(),"1", "科室记支","材料记支",price, list);
 						}
-						newMonthReport(code, config.getOrgUnitName(), "2", "数量统计", "材料数量", amount, list);
+						newMonthReport(code, config.getOrgUnitName(), "3", "数量统计", "材料数量", amount, list);
 					}
 				}
 			}catch(Exception e){
@@ -6113,11 +6116,11 @@
 					String code = rs4.getString(4);
 					String orgUnitName = rs4.getString(5);
 					if("一次性物品".equals(type)){
-						newMonthReport(code, orgUnitName, "1", "价格统计", "一次性物品总价", price, list);
+						newMonthReport(code, orgUnitName, "2", "价格统计", "一次性物品总价", price, list);
 						if(enableDiscountPrice){
-							newMonthReport(code, orgUnitName,"3", "折扣价格统计","一次性物品总价",price, list);
+							newMonthReport(code, orgUnitName,"1", "科室记支","一次性物品记支",price, list);
 						}
-						newMonthReport(code, orgUnitName, "2", "数量统计", "一次性物品数量", amount, list);
+						newMonthReport(code, orgUnitName, "3", "数量统计", "一次性物品数量", amount, list);
 					}
 				}
 			}catch(Exception e){
@@ -6142,11 +6145,11 @@
 					String code = rs4.getString(4);
 					String orgUnitName = rs4.getString(5);
 					if("一次性物品".equals(type)){
-						newMonthReport(code, orgUnitName, "1", "价格统计", "一次性物品总价", price, list);
+						newMonthReport(code, orgUnitName, "2", "价格统计", "一次性物品总价", price, list);
 						if(enableDiscountPrice){
-							newMonthReport(code, orgUnitName,"3", "折扣价格统计","一次性物品总价",price, list);
+							newMonthReport(code, orgUnitName,"1", "科室记支","一次性物品记支",price, list);
 						}
-						newMonthReport(code, orgUnitName, "2", "数量统计", "一次性物品数量", amount, list);
+						newMonthReport(code, orgUnitName, "3", "数量统计", "一次性物品数量", amount, list);
 					}
 				}
 			}catch(Exception e){
@@ -6171,11 +6174,11 @@
 						String code = rs.getString(4);
 						String orgUnitName = rs.getString(5);
 						if("一次性物品".equals(type)){
-							newMonthReport(code, orgUnitName, "1", "价格统计", "一次性物品总价", price, list);
+							newMonthReport(code, orgUnitName, "2", "价格统计", "一次性物品总价", price, list);
 							if(enableDiscountPrice){
-								newMonthReport(code, orgUnitName,"3", "折扣价格统计","一次性物品总价",price, list);
+								newMonthReport(code, orgUnitName,"1", "科室记支","一次性物品记支",price, list);
 							}
-							newMonthReport(code, orgUnitName, "2", "数量统计", "一次性物品数量", amount, list);
+							newMonthReport(code, orgUnitName, "3", "数量统计", "一次性物品数量", amount, list);
 						}
 					}
 				}catch(Exception e){
@@ -6218,7 +6221,7 @@
 						}
 					}
 					if(tousseAmount > 0){
-						newMonthReport(code, dept,"2","数量统计", "器械包数量",tousseAmount,list);
+						newMonthReport(code, dept,"3","数量统计", "器械包数量",tousseAmount,list);
 					}
 				}
 			} catch (SQLException e) {