Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
===================================================================
diff -u -r35702 -r35703
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 35702)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 35703)
@@ -5168,10 +5168,6 @@
 		Map<String, Set<String>> titleInfoMap = new HashMap<String, Set<String>>();
 		
 		boolean hasWhetherToCharge = false;
-		Set<String> departToBrancheOfHospitals = null;
-		if(enableMultipleBranchesOfHospital){
-			departToBrancheOfHospitals = objectDao.getStringSet("select name from "+ BrancheOfHospital.class.getSimpleName() +" order by serialNumber asc", "", true);
-		}
 		Set<String> currentBrancheOfHospital = new HashSet<String>();
 		Map<String,Set<String>> departOfBrancheOfHospitalMap = new HashMap<String, Set<String>>();
 		for (MonthReportBean monthReportBean : dataSource) {
@@ -5228,15 +5224,23 @@
 		columnTitles.retainAll(currentTitles);//取交集 获取当前一级头 且保持顺序
 		if(enableMultipleBranchesOfHospital){
 			JSONObject brancheOfHospitalInfo = new JSONObject();
+			Set<String> departToBrancheOfHospitals = null;
+			if(enableMultipleBranchesOfHospital){//查询院区顺序
+				departToBrancheOfHospitals = objectDao.getStringSet("select name from "+ BrancheOfHospital.class.getSimpleName() +" order by serialNumber asc", "", true);
+			}
 			if(CollectionUtils.isNotEmpty(departToBrancheOfHospitals)){
 				departToBrancheOfHospitals.retainAll(currentBrancheOfHospital);
 				for (String brancheOfHospitalName : departToBrancheOfHospitals) {
 					brancheOfHospitalInfo.put(brancheOfHospitalName, departOfBrancheOfHospitalMap.get(brancheOfHospitalName).size());
 				}
-				if(currentBrancheOfHospital.contains("")){
-					brancheOfHospitalInfo.put("", departOfBrancheOfHospitalMap.get("").size());
+			}else{
+				for (String brancheOfHospitalName : currentBrancheOfHospital) {
+					brancheOfHospitalInfo.put(brancheOfHospitalName, departOfBrancheOfHospitalMap.get(brancheOfHospitalName).size());
 				}
 			}
+			if(currentBrancheOfHospital.contains("")){
+				brancheOfHospitalInfo.put("", departOfBrancheOfHospitalMap.get("").size());
+			}
 			parametMap.put("branchesOfHospitalInfo", brancheOfHospitalInfo);
 		}
 		parametMap.put("titleInfoArr", getTitleInfoArr(enableMultipleBranchesOfHospital, hasWhetherToCharge, columnTitles, titleInfoMap));