Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/ButtJointUseRecordAction.java
===================================================================
diff -u -r19787 -r20011
--- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/ButtJointUseRecordAction.java	(.../ButtJointUseRecordAction.java)	(revision 19787)
+++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/ButtJointUseRecordAction.java	(.../ButtJointUseRecordAction.java)	(revision 20011)
@@ -60,31 +60,37 @@
 	 */
 	public void loadPatientByPatientNumber(){
 		boolean success = false;
-		String msg = "";
+		String message = "";
 		PatientInfoVO result = null;
 		
 		String patientNum = StrutsParamUtils.getPraramValue("patientNum" , "");
 		String numType = StrutsParamUtils.getPraramValue("numType" , "hospitalNum");
+		
 		//1表示使用记录
 		Integer sourcePage = 1;
 			
 		try{
-			result = dataSynchronizationManager.findPatientInfoByHospitalNumOrTreatmentNum(sourcePage , patientNum, numType);
-			if (result != null){
-				success = true;
+			
+			if(StringUtils.isBlank(patientNum)){
+				message = "住院号不能为空.";
+			}else{
+				result = dataSynchronizationManager.findPatientInfoByHospitalNumOrTreatmentNum(sourcePage , patientNum, numType);
+				if (result != null){
+					success = true;
+				}
+				else{
+					message = "没有查找到对应的病人信息";
+				}
 			}
-			else{
-				msg = "没有查找到对应的病人信息";
-			}			
 		}
 		catch(Exception e){
-			msg = "无法连接到HIS服务器，请检查检查服务器运行状态和连接的身份验证信息！";
+			message = "无法连接到HIS服务器，请检查检查服务器运行状态和连接的身份验证信息！";
 			logger.debug(e.getMessage());
 			e.printStackTrace();
 		}
 		JSONObject obj = new JSONObject();
 		obj.put("success", success);
-		obj.put("msg", msg);
+		obj.put("message", message);
 		obj.put("patientInfo", result);
 		StrutsResponseUtils.output(obj);
 	}
@@ -100,13 +106,13 @@
 		User user = userManager.getUserByUserCode(userCode);
 		if(user == null){
 			JSONObject json = JSONUtil.buildJsonObject(false);
-			json.put("error", "未获取到工号为" + userCode + "的用户");
+			json.put("message", "未获取到工号为" + userCode + "的用户");
 			StrutsResponseUtils.output(json);
 		}else{
 			String currentOrgUnitCode = userManager.getCurrentOrgUnitCode(user);
 			if(StringTools.isBlank(currentOrgUnitCode)){
 				JSONObject json = JSONUtil.buildJsonObject(false);
-				json.put("error", "工号为" + userCode + "的用户未设置所属科室");
+				json.put("message", "工号为" + userCode + "的用户未设置所属科室");
 				StrutsResponseUtils.output(json);
 			}else{
 				loadBarcode(barcode, scanedBarcodes, currentOrgUnitCode);
@@ -126,21 +132,21 @@
 //		String operator = StrutsParamUtils.getPraramValue("operator", "");
 //		String depart = StrutsParamUtils.getPraramValue("depart", "");
 //		String departCoding = StrutsParamUtils.getPraramValue("departCoding","");
-		String msg = "保存成功";
+		String message = "保存成功";
 		boolean success = false;
 		Date applicationCreateDate = new Date();
 		try {
 			User operator = userManager.getUserByUserCode(userCode);
 			if(operator == null){
-				msg = "未获取到工号为" + userCode + "的用户";
+				message = "未获取到工号为" + userCode + "的用户";
 			}else{
 				String orgUnitCode = userManager.getCurrentOrgUnitCode(operator);
 				if(StringTools.isBlank(orgUnitCode)){
-					msg = "工号为" + userCode + "的用户未设置所属科室";
+					message = "工号为" + userCode + "的用户未设置所属科室";
 				}else{
 					THTreeNode orgUnit = orgUnitManager.getOrgUnitByCode(orgUnitCode);
 					if(orgUnit == null){
-						msg = "未获取到用户的所属科室";
+						message = "未获取到用户的所属科室";
 					}else{
 						useRecord.setDepart(orgUnit.getName());
 						useRecord.setDepartCoding(orgUnitCode);
@@ -158,9 +164,9 @@
 		} catch (Exception e) {
 			logger.warn(e.getMessage());
 			e.printStackTrace();
-			msg = e.getMessage();
+			message = e.getMessage();
 		}
-		JSONObject json = JSONUtil.buildJsonObject(success,msg);
+		JSONObject json = JSONUtil.buildJsonObject(success,message);
 		StrutsResponseUtils.output(json);
 	}
 	@Override