Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/UseRecordEnterReportHelper.java
===================================================================
diff -u -r36769 -r38302
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/UseRecordEnterReportHelper.java	(.../UseRecordEnterReportHelper.java)	(revision 36769)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/UseRecordEnterReportHelper.java	(.../UseRecordEnterReportHelper.java)	(revision 38302)
@@ -194,7 +194,7 @@
 					JSONObject configObj = (JSONObject)expandColoumnsConfigOfUsingRecordEntryDetailReportsArr.get(i);
 					String coloumnName = configObj.optString("coloumnName");
 					String displayText = configObj.optString("displayText");
-					if("doctorAccountDepart".equals(coloumnName) || "ascriptionDepartment".equals(coloumnName)){
+					if("doctorAccountDepart".equals(coloumnName) || "ascriptionDepartment".equals(coloumnName) || "patientArea".equals(coloumnName)){
 						fatherReportCustomColumnCount++;
 						fatherCustomColumnMap.put(coloumnName, "customColumnValue" + fatherReportCustomColumnCount);
 						parametMap.put("customColumnName"+fatherReportCustomColumnCount, displayText);
@@ -414,13 +414,17 @@
 	private String getSqlByGoodsId(Set<String> instrumentSetTypesSet, String expensiveGoodIds, String disposableGoodIds, String tousseInstanceIds , boolean showOther, Map<String, String> fatherCustomColumnMap, Map<String, String> subCustomColumnMap, String tousseTypes) {
 		String doctorAccountDepartSql = "";
 		String ascriptionDepartmentSql = "";
+		String patientAreaSql = "";
 		if(MapUtils.isNotEmpty(fatherCustomColumnMap)){
 			if(fatherCustomColumnMap.keySet().contains("doctorAccountDepart")){
 				doctorAccountDepartSql = ",ur.doctorAccountDepart " + fatherCustomColumnMap.get("doctorAccountDepart");
 			}
 			if(fatherCustomColumnMap.keySet().contains("ascriptionDepartment")){
 				ascriptionDepartmentSql = ",ou.name " + fatherCustomColumnMap.get("ascriptionDepartment");
 			}
+			if(fatherCustomColumnMap.keySet().contains("patientArea")){
+				patientAreaSql = ",ur.patientArea " + fatherCustomColumnMap.get("patientArea");
+			}
 		}
 		String urgentSql = "";
 		String noUrgnetSql = "";
@@ -459,7 +463,7 @@
 			instrumentSetTypesSql = "";
 		}
 		String tousseInstanceSql = 
-				"select '器械包' selectType"+ doctorAccountDepartSql+ ascriptionDepartmentSql+urgentSql+tousseGroupNameSql+doctorNameSql +", ur.id,ur.depart,ur.patientName,ur.hospitalNum,ur.treatmentNum,ur.operator,ur.enteringDate,ur.doctorName,ur.operation,"
+				"select '器械包' selectType"+ patientAreaSql + doctorAccountDepartSql+ ascriptionDepartmentSql+urgentSql+tousseGroupNameSql+doctorNameSql +", 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 " 
 				+ ",ou.name ascriptionDepartment from useRecord ur "
 				+ "inner join tousseInstance ti on ti.useRecord_id=ur.id "
@@ -470,7 +474,7 @@
 				+ tousseTypesSql+instrumentSetTypesSql;
 		
 		String disposableGoodsSql = 
-				"select '一次性物品' selectType"+ doctorAccountDepartSql+ ascriptionDepartmentSql+noUrgnetSql+noTousseSql+noDoctorNameSql  +",ur.id,ur.depart,ur.patientName,ur.hospitalNum,ur.treatmentNum,ur.operator,ur.enteringDate,ur.doctorName,ur.operation,"
+				"select '一次性物品' selectType"+ patientAreaSql + doctorAccountDepartSql+ ascriptionDepartmentSql+noUrgnetSql+noTousseSql+noDoctorNameSql  +",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 "
 				+ ",ou.name ascriptionDepartment from useRecord ur "
 				+ "inner join useDiposableGoodsItem udgi on udgi.userecord_id=ur.id "
@@ -479,7 +483,7 @@
 				+ onlyQueryTousse;
 		
 		String expensiveGoodsSql = 
-				"select '高值耗材' selectType"+ doctorAccountDepartSql+ ascriptionDepartmentSql+noUrgnetSql+noTousseSql+noDoctorNameSql  +",ur.id,ur.depart,ur.patientName,ur.hospitalNum,ur.treatmentNum,ur.operator,ur.enteringDate,ur.doctorName,ur.operation,"
+				"select '高值耗材' selectType"+ patientAreaSql + doctorAccountDepartSql+ ascriptionDepartmentSql+noUrgnetSql+noTousseSql+noDoctorNameSql  +",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 "
 				+ ",ou.name ascriptionDepartment from useRecord ur "
 				+ "left join OrgUnit ou on ou.orgUnitCoding=ur.departCodeOfpatient "
@@ -552,13 +556,17 @@
 	private String getSqlByBarcode(Set<String> instrumentSetTypesSet, String barcode, boolean showOther, Map<String, String> fatherCustomColumnMap, Map<String, String> subCustomColumnMap, String tousseTypes) {
 		String doctorAccountDepartSql = "";
 		String ascriptionDepartmentSql = "";
+		String patientAreaSql = "";
 		if(MapUtils.isNotEmpty(fatherCustomColumnMap)){
 			if(fatherCustomColumnMap.keySet().contains("doctorAccountDepart")){
 				doctorAccountDepartSql = ",ur.doctorAccountDepart " + fatherCustomColumnMap.get("doctorAccountDepart");
 			}
 			if(fatherCustomColumnMap.keySet().contains("ascriptionDepartment")){
 				ascriptionDepartmentSql = ",ou.name " + fatherCustomColumnMap.get("ascriptionDepartment");
 			}
+			if(fatherCustomColumnMap.keySet().contains("patientArea")){
+				patientAreaSql = ",ur.patientArea " + fatherCustomColumnMap.get("patientArea");
+			}
 		}
 		String urgentSql = "";
 		String noUrgnetSql = "";
@@ -597,7 +605,7 @@
 			onlyQueryTousse = " and 1=2 ";
 		}
 		String tousseInstanceSql = 
-				"select '器械包' selectType"+ doctorAccountDepartSql + ascriptionDepartmentSql+urgentSql+tousseGroupNameSql+doctorNameSql +",ur.id,ur.depart,ur.patientName,ur.hospitalNum,ur.treatmentNum,ur.operator,ur.enteringDate,ur.doctorName,ur.operation,"
+				"select '器械包' selectType"+ patientAreaSql + doctorAccountDepartSql + ascriptionDepartmentSql+urgentSql+tousseGroupNameSql+doctorNameSql +",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 " 
 				+ ",ou.name ascriptionDepartment from useRecord ur "
 				+ "left join OrgUnit ou on ou.orgUnitCoding=ur.departCodeOfpatient "
@@ -608,7 +616,7 @@
 				+ tousseTypesSql+instrumentSetTypesSql;
 		
 		String disposableGoodsSql = 
-				"select '一次性物品' selectType"+ doctorAccountDepartSql + ascriptionDepartmentSql+noUrgnetSql+noTousseSql+noDoctorNameSql +",ur.id,ur.depart,ur.patientName,ur.hospitalNum,ur.treatmentNum,ur.operator,ur.enteringDate,ur.doctorName,ur.operation,"
+				"select '一次性物品' selectType"+ patientAreaSql + doctorAccountDepartSql + ascriptionDepartmentSql+noUrgnetSql+noTousseSql+noDoctorNameSql +",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 "
 				+ ",ou.name ascriptionDepartment from useRecord ur "
 				+ "left join OrgUnit ou on ou.orgUnitCoding=ur.departCodeOfpatient "
@@ -617,7 +625,7 @@
 				+ onlyQueryTousse;
 		
 		String expensiveGoodsSql = 
-				"select '高值耗材' selectType"+ doctorAccountDepartSql + ascriptionDepartmentSql+noUrgnetSql+noTousseSql+noDoctorNameSql +",ur.id,ur.depart,ur.patientName,ur.hospitalNum,ur.treatmentNum,ur.operator,ur.enteringDate,ur.doctorName,ur.operation,"
+				"select '高值耗材' selectType"+ patientAreaSql + doctorAccountDepartSql + ascriptionDepartmentSql+noUrgnetSql+noTousseSql+noDoctorNameSql +",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 "
 				+ ",ou.name ascriptionDepartment from useRecord ur "
 				+ "left join OrgUnit ou on ou.orgUnitCoding=ur.departCodeOfpatient "