Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
===================================================================
diff -u -r27621 -r27622
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 27621)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 27622)
@@ -657,7 +657,7 @@
 			}
 			if(!applyMonthReportOnlyPriceTemplate || applyMonthReportOneColumnTemplate){//仅显示价格的模板因报表特别，排序过程不一样
 				//按科室供应室配置中的科室申领配置的科室排序
-				Map<String, Integer> sequenceMap = supplyRoomConfigManager.getOrgUnitAndSequenceMap(4);
+				Map<String, Integer> sequenceMap = supplyRoomConfigManager.getOrgUnitAndSequenceMap(3);
 				Iterator<MonthReportBean> it = dataSource.iterator();
 				while(it.hasNext()){
 					MonthReportBean b = it.next();
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r27621 -r27622
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 27621)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 27622)
@@ -5361,7 +5361,7 @@
 	 * @param list
 	 */
 	private void orderDepartmentMonthDetailList(List<DepartmentMonthDetail> list){
-		Map<String, Integer> map = supplyRoomConfigManager.getOrgUnitAndSequenceMap(4);	
+		Map<String, Integer> map = supplyRoomConfigManager.getOrgUnitAndSequenceMap(3);	
 		Collections.sort(list, new Comparator<DepartmentMonthDetail>() {
             @Override  
             public int compare(DepartmentMonthDetail o1, DepartmentMonthDetail o2) {
@@ -11493,7 +11493,12 @@
 			sql += " union all ";
 			sql += returnMaterialSql;
 			sql += " ) m ";
-			sql += String.format("left join (select sequence,orgUnitCoding from %s src where src.supplyRoomType=4) t on m.departCoding=t.orgUnitCoding ", SupplyRoomConfig.class.getSimpleName());
+			sql += String.format("left join (select sequence,orgUnitCoding from %s src where src.supplyRoomType=%s "
+					+ "and src.orgUnitCoding not in (select orgUnitCoding from %s where status =%s )) t on m.departCoding=t.orgUnitCoding ",
+					SupplyRoomConfig.class.getSimpleName(),
+					SupplyRoomConfig.SUPPLYROOM_TYPE_APPLY,
+					OrgUnit.class.getSimpleName(),
+					OrgUnit.STATUS_DISABLED);
 			sql += " where " + dateQueryAdapter.dateAreaSql("m.returnTime", startDay, endDay,true);
 			if (StringUtils.isNotBlank(type)) {
 				sql += " and m.type = '" + type + "'";