Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
===================================================================
diff -u -r33509 -r33573
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 33509)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 33573)
@@ -1854,11 +1854,20 @@
 					.getBarcodeByBarcode(barcode);
 			if (barcodeDevice == null /*|| (!(barcodeDevice instanceof TousseInstance) && !(barcodeDevice instanceof ExpensiveDisposablegoods)
 				&& !(barcodeDevice instanceof DisposableGoodsBatch))*/) {
+				UseRecord useRecord = null;
+				//PDA录入使用记录时，患者信息查询的方式
+				int patientQueryModeOfPDA = CssdUtils.getSystemSetConfigByNameInt("patientQueryModeOfPDA", 0);
 				//可能是使用记录
-				UseRecord useRecord = useRecordManager.getSyncUseRecordByHostpitalNumOrTreatmentNum(barcode, "hospitalNum");
-				if(useRecord == null){
-					//再查找诊疗号
+				if(patientQueryModeOfPDA == 1){
+					useRecord = useRecordManager.getSyncUseRecordByHostpitalNumOrTreatmentNum(barcode, "hospitalNum");
+				}else if(patientQueryModeOfPDA == 2){
 					useRecord = useRecordManager.getSyncUseRecordByHostpitalNumOrTreatmentNum(barcode, "treatmentNum");
+				}else{
+					useRecord = useRecordManager.getSyncUseRecordByHostpitalNumOrTreatmentNum(barcode, "hospitalNum");
+					if(useRecord == null){
+						//再查找诊疗号
+						useRecord = useRecordManager.getSyncUseRecordByHostpitalNumOrTreatmentNum(barcode, "treatmentNum");
+					}
 				}
 				if(useRecord != null){
 					String useRecordStr = UseRecordToJson.converUseRecordPoToJson(useRecord, null);