Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/ButtJointUseRecordAction.java
===================================================================
diff -u -r17914 -r19787
--- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/ButtJointUseRecordAction.java	(.../ButtJointUseRecordAction.java)	(revision 17914)
+++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/ButtJointUseRecordAction.java	(.../ButtJointUseRecordAction.java)	(revision 19787)
@@ -4,12 +4,16 @@
 
 import net.sf.json.JSONObject;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts2.convention.annotation.Action;
 import org.apache.struts2.convention.annotation.Namespace;
 import org.apache.struts2.convention.annotation.ParentPackage;
 
 import com.forgon.directory.service.OrgUnitManager;
+import com.forgon.disinfectsystem.common.CssdUtils;
+import com.forgon.disinfectsystem.datasynchronization.model.PatientInfoVO;
+import com.forgon.disinfectsystem.datasynchronization.service.DataSynchronizationManager;
 import com.forgon.disinfectsystem.entity.useRecord.UseRecord;
 import com.forgon.security.model.User;
 import com.forgon.security.service.UserManager;
@@ -34,6 +38,7 @@
 	
 	private UserManager userManager;
 	private OrgUnitManager orgUnitManager;
+	private DataSynchronizationManager dataSynchronizationManager;
 	
 	// 使用记录
 	private UseRecord useRecord = new UseRecord();
@@ -44,7 +49,47 @@
 	public void setOrgUnitManager(OrgUnitManager orgUnitManager) {
 		this.orgUnitManager = orgUnitManager;
 	}
+	
+	public void setDataSynchronizationManager(
+			DataSynchronizationManager dataSynchronizationManager) {
+		this.dataSynchronizationManager = dataSynchronizationManager;
+	}
+	
 	/**
+	 * 根据病人号(一般为住院号)加载病人信息
+	 */
+	public void loadPatientByPatientNumber(){
+		boolean success = false;
+		String msg = "";
+		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;
+			}
+			else{
+				msg = "没有查找到对应的病人信息";
+			}			
+		}
+		catch(Exception e){
+			msg = "无法连接到HIS服务器，请检查检查服务器运行状态和连接的身份验证信息！";
+			logger.debug(e.getMessage());
+			e.printStackTrace();
+		}
+		JSONObject obj = new JSONObject();
+		obj.put("success", success);
+		obj.put("msg", msg);
+		obj.put("patientInfo", result);
+		StrutsResponseUtils.output(obj);
+	}
+	
+	/**
 	 * 加载扫描物品
 	 */
 	public void loadScanedGoods() {
@@ -73,6 +118,10 @@
 	public void saveAndReviewAndConvertUseRecordForm() {
 		// 申请表单的类型：1 ： 通用申请单（组合申请单），2：分开的申请单
 		String applicationFormType = StrutsParamUtils.getPraramValue("applicationFormType", "");
+		// 如果申请表单的类型为空时,取config.js文件的配置
+		if(StringUtils.isBlank(applicationFormType)){
+			applicationFormType = CssdUtils.getSystemSetConfigByName("applicationFormType");
+		}
 		String userCode = StrutsParamUtils.getPraramValue("userCode", "");
 //		String operator = StrutsParamUtils.getPraramValue("operator", "");
 //		String depart = StrutsParamUtils.getPraramValue("depart", "");