Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
===================================================================
diff -u -r26898 -r26906
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java	(.../JasperReportManager.java)	(revision 26898)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java	(.../JasperReportManager.java)	(revision 26906)
@@ -877,7 +877,7 @@
 	public List<MonthReportBean> getMonthReportDataGroupByDisposableGoodsType(String startDate,String endDate,
 			String department,String tousseType,String disposableGoodsType,Boolean showCustonTousseAmount);
 	/**
-	 * 个性化核算月报查询(按灭菌方式拆分器械包列,现bjcyl配置)
+	 * 个性化核算月报查询(按灭菌方式拆分器械包列,数量在前,价格在后,现bjcyl配置)
 	 * @param startDate 开始时间
 	 * @param endDate 结束时间
 	 * @param department 部门
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r26898 -r26906
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 26898)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 26906)
@@ -3956,11 +3956,11 @@
 					String columnName = "";
 					if("是".equals(diposable)){
 						discountPrice = price;//一次性物品发货项中目前还没有记录折扣价
-						newMonthReport(code, dept,"2", "价格统计","b一次性物品总价",price, list);
+						newMonthReport(code, dept,"3", "价格统计","b一次性物品总价",price, list);
 						continue;
 					}
 					columnName = getColumnNameBySterilingMethod(sterilisationAndSterilizationModeMap, sterilingMethod);
-					newMonthReport(code, dept,"2", "价格统计",columnName,price, list);
+					newMonthReport(code, dept,"3", "价格统计",columnName,price, list);
 				}
 			} catch (SQLException e) {
 				e.printStackTrace();
@@ -4002,14 +4002,14 @@
 						}
 						
 						if("一次性物品".equals(type)){
-							newMonthReport(code, dept, "2", "价格统计", "b一次性物品总价", price, list);
-							newMonthReport(code, dept, "3", "数量统计", "b一次性物品数量", amount, list);
+							newMonthReport(code, dept, "3", "价格统计", "b一次性物品总价", price, list);
+							newMonthReport(code, dept, "2", "数量统计", "b一次性物品数量", amount, list);
 							continue;
 						}
 						String columnName = getColumnNameBySterilingMethod(sterilisationAndSterilizationModeMap, sterilingMethod);
 	
-						newMonthReport(code, dept, "2", "价格统计", columnName, price, list);
-						newMonthReport(code, dept, "3", "数量统计", columnName, amount, list);
+						newMonthReport(code, dept, "3", "价格统计", columnName, price, list);
+						newMonthReport(code, dept, "2", "数量统计", columnName, amount, list);
 						if(monthReportMaterialAmountOfTousse){
 							newMonthReport(code, dept, "4", "包内材料统计", "b包内材料数量", totalMaterialAmount, list);
 						}
@@ -4035,7 +4035,7 @@
 					Double price = materialInvoicePriceResultSet.getDouble(3);
 					String columnName = "b发货材料总价";
 					
-					newMonthReport(code, dept,"2", "价格统计",columnName,price, list);
+					newMonthReport(code, dept,"3", "价格统计",columnName,price, list);
 				}
 			} catch (SQLException e) {
 				e.printStackTrace();
@@ -4057,7 +4057,7 @@
 					String dept = materialInvoiceAmountResultSet.getString(2);
 					Double tousseAmount = materialInvoiceAmountResultSet.getDouble(3);
 					if(tousseAmount > 0){
-						newMonthReport(code, dept,"3","数量统计", "b发货材料数量",tousseAmount,list);
+						newMonthReport(code, dept,"2","数量统计", "b发货材料数量",tousseAmount,list);
 					}
 				}
 			} catch (SQLException e) {
@@ -4090,8 +4090,8 @@
 						Double money = rs33.getDouble(4);
 						Double amount = rs33.getDouble(5);
 						
-						newMonthReport(code, dept, "3", "数量统计", "b丢失报损材料数量", amount, list);
-						newMonthReport(code, dept, "2", "价格统计", "b丢失报损材料总价", money, list);
+						newMonthReport(code, dept, "2", "数量统计", "b丢失报损材料数量", amount, list);
+						newMonthReport(code, dept, "3", "价格统计", "b丢失报损材料总价", money, list);
 					}
 				}
 			}catch(Exception e){
@@ -4119,8 +4119,8 @@
 						Double money = rs3.getDouble(4);
 						Double amount = rs3.getDouble(5);
 						
-						newMonthReport(code, dept,"3", "数量统计","b丢失报损材料数量",amount, list);
-						newMonthReport(code, dept,"2", "价格统计","b丢失报损材料总价",money, list);
+						newMonthReport(code, dept,"2", "数量统计","b丢失报损材料数量",amount, list);
+						newMonthReport(code, dept,"3", "价格统计","b丢失报损材料总价",money, list);
 					}
 				}
 			}catch(Exception e){
@@ -4144,8 +4144,8 @@
 					Double price = materialReturnResultSet.getDouble(3);
 					Double amount = materialReturnResultSet.getDouble(4);
 					
-					newMonthReport(code, dept, "2", "价格统计", "b发货材料总价", price, list);
-					newMonthReport(code, dept, "3", "数量统计", "b发货材料数量", amount, list);
+					newMonthReport(code, dept, "3", "价格统计", "b发货材料总价", price, list);
+					newMonthReport(code, dept, "2", "数量统计", "b发货材料数量", amount, list);
 				}
 			}catch(Exception e){
 				e.printStackTrace();	
@@ -4173,7 +4173,7 @@
 					String dept = disposableGoodsInvoiceAmountResultSet.getString(2);
 					Double diposableAmount = disposableGoodsInvoiceAmountResultSet.getDouble(3);
 					if(diposableAmount > 0){
-						newMonthReport(code, dept,"3","数量统计", "b一次性物品数量",diposableAmount,list);
+						newMonthReport(code, dept,"2","数量统计", "b一次性物品数量",diposableAmount,list);
 					}
 				}
 			} catch (SQLException e) {
@@ -4214,11 +4214,11 @@
 					Double amount = rs4.getDouble(3);
 					String code = rs4.getString(4);
 					if("一次性物品".equals(type)){
-						newMonthReport(code, config.getOrgUnitName(), "2", "价格统计", "b一次性物品总价", price, list);
-						newMonthReport(code, config.getOrgUnitName(), "3", "数量统计", "b一次性物品数量", amount, list);
+						newMonthReport(code, config.getOrgUnitName(), "3", "价格统计", "b一次性物品总价", price, list);
+						newMonthReport(code, config.getOrgUnitName(), "2", "数量统计", "b一次性物品数量", amount, list);
 					}else{
-						newMonthReport(code, config.getOrgUnitName(), "2", "价格统计", "b发货材料总价", price, list);
-						newMonthReport(code, config.getOrgUnitName(), "3", "数量统计", "b发货材料数量", amount, list);
+						newMonthReport(code, config.getOrgUnitName(), "3", "价格统计", "b发货材料总价", price, list);
+						newMonthReport(code, config.getOrgUnitName(), "2", "数量统计", "b发货材料数量", amount, list);
 					}
 				}
 			}catch(Exception e){
@@ -4243,8 +4243,8 @@
 					String code = rs4.getString(4);
 					String orgUnitName = rs4.getString(5);
 					if("一次性物品".equals(type)){
-						newMonthReport(code, orgUnitName, "2", "价格统计", "b一次性物品总价", price, list);
-						newMonthReport(code, orgUnitName, "3", "数量统计", "b一次性物品数量", amount, list);
+						newMonthReport(code, orgUnitName, "3", "价格统计", "b一次性物品总价", price, list);
+						newMonthReport(code, orgUnitName, "2", "数量统计", "b一次性物品数量", amount, list);
 					}
 				}
 			}catch(Exception e){
@@ -4269,8 +4269,8 @@
 					String code = rs4.getString(4);
 					String orgUnitName = rs4.getString(5);
 					if("一次性物品".equals(type)){
-						newMonthReport(code, orgUnitName, "2", "价格统计", "b一次性物品总价", price, list);
-						newMonthReport(code, orgUnitName, "3", "数量统计", "b一次性物品数量", amount, list);
+						newMonthReport(code, orgUnitName, "3", "价格统计", "b一次性物品总价", price, list);
+						newMonthReport(code, orgUnitName, "2", "数量统计", "b一次性物品数量", amount, list);
 					}
 				}
 			}catch(Exception e){
@@ -4295,8 +4295,8 @@
 						String code = rs.getString(4);
 						String orgUnitName = rs.getString(5);
 						if("一次性物品".equals(type)){
-							newMonthReport(code, orgUnitName, "2", "价格统计", "b一次性物品总价", price, list);
-							newMonthReport(code, orgUnitName, "3", "数量统计", "b一次性物品数量", amount, list);
+							newMonthReport(code, orgUnitName, "3", "价格统计", "b一次性物品总价", price, list);
+							newMonthReport(code, orgUnitName, "2", "数量统计", "b一次性物品数量", amount, list);
 						}
 					}
 				}catch(Exception e){
@@ -4341,7 +4341,7 @@
 						}
 					}
 					String columnName = getColumnNameBySterilingMethod(sterilisationAndSterilizationModeMap, sterilingMethod);
-					newMonthReport(code, dept,"3","数量统计", columnName,tousseAmount,list);
+					newMonthReport(code, dept,"2","数量统计", columnName,tousseAmount,list);
 					if(monthReportMaterialAmountOfTousse){
 						newMonthReport(code, dept, "4", "包内材料统计", "b包内材料数量", totalMaterialAmount, list);
 					}
@@ -4368,7 +4368,7 @@
 					Double price = rs5.getDouble("price");
 					String orgUnitName = rs5.getString("orgUnitName");
 					String orgUnitCode = rs5.getString("orgUnitCode");
-					newMonthReport(orgUnitCode, orgUnitName, "2", "价格统计", "b收费项目总价", price, list);
+					newMonthReport(orgUnitCode, orgUnitName, "3", "价格统计", "b收费项目总价", price, list);
 				}
 			}catch(Exception e){
 				e.printStackTrace();