Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/ButtJointUseRecordAction.java
===================================================================
diff -u -r33328 -r33348
--- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/ButtJointUseRecordAction.java	(.../ButtJointUseRecordAction.java)	(revision 33328)
+++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/ButtJointUseRecordAction.java	(.../ButtJointUseRecordAction.java)	(revision 33348)
@@ -385,16 +385,23 @@
 	 * 根据住院号查询使用记录列表
 	 */
 	@SuppressWarnings("unchecked")
-	public void loadUseRecordsByHospitalNum(){
+	public void loadUseRecords(){
 		String hospitalNum = StrutsParamUtils.getPraramValue("hospitalNum" , "");
+		String patientIDCard = StrutsParamUtils.getPraramValue("patientIDCard" , "");
 		JSONObject result = JSONUtil.buildJsonObject(false);
 		JSONArray dataArray = new JSONArray();
 		try{
-			if(StringUtils.isBlank(hospitalNum)){
-				JSONUtil.addMessage(result, "住院号不能为空.");
+			if(StringUtils.isBlank(hospitalNum) && StringUtils.isBlank(patientIDCard)){
+				JSONUtil.addMessage(result, "住院号和病人身份证号不能都为空.");
 			}else{
 				//查询条件
-				String condition = "where 1=1 and hospitalNum='"+ hospitalNum +"' ";
+				String condition = "where 1=1 ";
+				if(StringUtils.isNotBlank(hospitalNum)){
+					condition += " and hospitalNum='"+ hospitalNum +"' ";
+				}
+				if(StringUtils.isNotBlank(patientIDCard)){
+					condition += " and patientIDCard='"+ patientIDCard +"' ";
+				}
 				//根据住院号或诊疗号查询使用记录
 				List<UseRecord> useRecordList = objectDao.findBySql(UseRecord.class.getSimpleName(), condition);
 				if (CollectionUtils.isEmpty(useRecordList)){