Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r33408 -r33411
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 33408)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 33411)
@@ -11219,22 +11219,25 @@
 		String tousseInstanceSql = 
 				"select '器械包' selectType, ur.id,ur.depart,ur.patientName,ur.hospitalNum,ur.treatmentNum,ur.operator,ur.enteringDate,ur.doctorName,ur.operation,"
 				+ "ti.tousseName name,'' specification,1 amount,bd.barcode barcode,ti.idCardInstanceBarcode idCardInstanceBarcode,ti.useAmount useAmount " 
-				+ ",ur.ascriptionDepartment from useRecord ur "
+				+ ",ou.name ascriptionDepartment from useRecord ur "
 				+ "inner join tousseInstance ti on ti.useRecord_id=ur.id "
 				+ "inner join barcodeDevice bd on bd.id=ti.id "
+				+ "left join OrgUnit ou on ou.orgUnitCoding=ur.departCodeOfpatient "
 				+ "where 1=1 " ;
 		
 		String disposableGoodsSql = 
 				"select '一次性物品' selectType,ur.id,ur.depart,ur.patientName,ur.hospitalNum,ur.treatmentNum,ur.operator,ur.enteringDate,ur.doctorName,ur.operation,"
 				+ "udgi.name name,'' specification,udgi.amount amount,udgi.barcode barcode,'' idCardInstanceBarcode,0 useAmount "
-				+ ",ur.ascriptionDepartment from useRecord ur "
+				+ ",ou.name ascriptionDepartment from useRecord ur "
 				+ "inner join useDiposableGoodsItem udgi on udgi.userecord_id=ur.id "
+				+ "left join OrgUnit ou on ou.orgUnitCoding=ur.departCodeOfpatient "
 				+ "where 1=1 ";
 		
 		String expensiveGoodsSql = 
 				"select '高值耗材' selectType,ur.id,ur.depart,ur.patientName,ur.hospitalNum,ur.treatmentNum,ur.operator,ur.enteringDate,ur.doctorName,ur.operation,"
 				+ "eg.name name,eg.specification specification,1 amount,bd.barcode barcode,'' idCardInstanceBarcode,0 useAmount "
-				+ ",ur.ascriptionDepartment from useRecord ur "
+				+ ",ou.name ascriptionDepartment from useRecord ur "
+				+ "left join OrgUnit ou on ou.orgUnitCoding=ur.departCodeOfpatient "
 				+ "inner join ExpensiveGoodsInstance egi on egi.userecordId=ur.id "
 				+ "inner join ExpensiveGoods eg on eg.id=egi.expensiveGoods_id "
 				+ "inner join barcodeDevice bd on bd.id=egi.id "
@@ -11304,22 +11307,25 @@
 		String tousseInstanceSql = 
 				"select '器械包' selectType,ur.id,ur.depart,ur.patientName,ur.hospitalNum,ur.treatmentNum,ur.operator,ur.enteringDate,ur.doctorName,ur.operation,"
 				+ "ti.tousseName name, '' specification,1 amount,bd.barcode barcode,ti.idCardInstanceBarcode idCardInstanceBarcode,ti.useAmount useAmount " 
-				+ ",ur.ascriptionDepartment from useRecord ur "
+				+ ",ou.name ascriptionDepartment from useRecord ur "
+				+ "left join OrgUnit ou on ou.orgUnitCoding=ur.departCodeOfpatient "
 				+ "inner join tousseInstance ti on ti.useRecord_id=ur.id "
 				+ "inner join barcodeDevice bd on bd.id=ti.id "
 				+ "where 1=1 " ;
 		
 		String disposableGoodsSql = 
 				"select '一次性物品' selectType,ur.id,ur.depart,ur.patientName,ur.hospitalNum,ur.treatmentNum,ur.operator,ur.enteringDate,ur.doctorName,ur.operation,"
 				+ "udgi.name name,'' specification,udgi.amount amount,udgi.barcode barcode,'' idCardInstanceBarcode,0 useAmount "
-				+ ",ur.ascriptionDepartment from useRecord ur "
+				+ ",ou.name ascriptionDepartment from useRecord ur "
+				+ "left join OrgUnit ou on ou.orgUnitCoding=ur.departCodeOfpatient "
 				+ "inner join useDiposableGoodsItem udgi on udgi.userecord_id=ur.id "
 				+ "where 1=1 ";
 		
 		String expensiveGoodsSql = 
 				"select '高值耗材' selectType,ur.id,ur.depart,ur.patientName,ur.hospitalNum,ur.treatmentNum,ur.operator,ur.enteringDate,ur.doctorName,ur.operation,"
 				+ "eg.name name,eg.specification specification,1 amount,bd.barcode barcode,'' idCardInstanceBarcode,0 useAmount "
-				+ ",ur.ascriptionDepartment from useRecord ur "
+				+ ",ou.name ascriptionDepartment from useRecord ur "
+				+ "left join OrgUnit ou on ou.orgUnitCoding=ur.departCodeOfpatient "
 				+ "inner join ExpensiveGoodsInstance egi on egi.userecordId=ur.id "
 				+ "inner join ExpensiveGoods eg on eg.id=egi.expensiveGoods_id "
 				+ "inner join barcodeDevice bd on bd.id=egi.id "