Index: forgon-core/src/main/java/com/forgon/log/service/LogManager.java
===================================================================
diff -u -r15766 -r15864
--- forgon-core/src/main/java/com/forgon/log/service/LogManager.java	(.../LogManager.java)	(revision 15766)
+++ forgon-core/src/main/java/com/forgon/log/service/LogManager.java	(.../LogManager.java)	(revision 15864)
@@ -20,9 +20,6 @@
 	
 	public void saveLog(LoginUserData loginUser,
 			String model, String type, String description);
-	
-	public void saveLog(LoginUserData loginUser,
-			String model, String type, String description,String clientType);
 
 	public void saveOrUpdate(Log log);
     
Index: forgon-core/src/main/java/com/forgon/log/service/LogManagerImpl.java
===================================================================
diff -u -r15766 -r15864
--- forgon-core/src/main/java/com/forgon/log/service/LogManagerImpl.java	(.../LogManagerImpl.java)	(revision 15766)
+++ forgon-core/src/main/java/com/forgon/log/service/LogManagerImpl.java	(.../LogManagerImpl.java)	(revision 15864)
@@ -163,13 +163,7 @@
 	@Override
 	public void saveLog(LoginUserData loginUser,
 			String modelName, String type, String description) {
-		saveLog(loginUser,modelName,type,description,null);
-	}
-	public void saveLog(LoginUserData loginUser,
-			String model, String type, String description,String clientType){
-
 		Log log = new Log();
-		
 		String userId = loginUser.getUserName();
 		String userIP = loginUser.getUserIP();
 		
@@ -183,13 +177,14 @@
 		log.setUsername(userFullName);
 		log.setUserId(userId);
 		log.setUserIP(userIP);
-		log.setModel(model);
+		log.setModel(modelName);
 		log.setOperationType(type);
 		log.setOperationDescription(description);
-		log.setClientType(clientType);
+		log.setClientType(loginUser.getClientType());
+		log.setClientVersion(loginUser.getClientVersion());
 		objectDao.save(log);
-	
 	}
+	
 	public Date getLastDateByOpetType(String operationType){
 		if(StringUtils.isBlank(operationType))
 			return null;
Index: forgon-core/src/main/java/com/forgon/log/action/LogAction.java
===================================================================
diff -u -r15765 -r15864
--- forgon-core/src/main/java/com/forgon/log/action/LogAction.java	(.../LogAction.java)	(revision 15765)
+++ forgon-core/src/main/java/com/forgon/log/action/LogAction.java	(.../LogAction.java)	(revision 15864)
@@ -45,6 +45,6 @@
 		String model = StrutsParamUtils.getPraramValue("model", "");
 		String type = StrutsParamUtils.getPraramValue("type", "");
 		String description = StrutsParamUtils.getPraramValue("description", "");
-		appLogManager.saveLog(loginUser, model, type, description,Log.CLIENT_TYPE_PC);
+		appLogManager.saveLog(loginUser, model, type, description);
 	}
 }
Index: forgon-core/src/main/java/com/forgon/directory/vo/LoginUserData.java
===================================================================
diff -u -r15634 -r15864
--- forgon-core/src/main/java/com/forgon/directory/vo/LoginUserData.java	(.../LoginUserData.java)	(revision 15634)
+++ forgon-core/src/main/java/com/forgon/directory/vo/LoginUserData.java	(.../LoginUserData.java)	(revision 15864)
@@ -97,7 +97,31 @@
 	
 	//登陆模式
 	private String logonMode;
+	/**
+	 * 客户端类型
+	 */
+	private String clientType;
+	/**
+	 * 客户端程序版本
+	 */
+	private String clientVersion;
 
+	public String getClientType() {
+		return clientType;
+	}
+
+	public void setClientType(String clientType) {
+		this.clientType = clientType;
+	}
+
+	public String getClientVersion() {
+		return clientVersion;
+	}
+
+	public void setClientVersion(String clientVersion) {
+		this.clientVersion = clientVersion;
+	}
+
 	public String getLogonMode() {
 		return logonMode;
 	}
Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
===================================================================
diff -u -r15771 -r15864
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 15771)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 15864)
@@ -1044,7 +1044,7 @@
 			}
 		}
 		appLogManager.saveLog(AcegiHelper.getLoginUser(), "清洗模块", Log.TYPE_ADD,"清洗消毒扫描条码：" 
-		+ barcode + ",条码类型：" + barcodeType, Log.CLIENT_TYPE_ANDROID);
+		+ barcode + ",条码类型：" + barcodeType);
 		return retString;
 	}
 	
Index: ssts-web/src/main/webapp/openSystemMainPage.jsp
===================================================================
diff -u -r15564 -r15864
--- ssts-web/src/main/webapp/openSystemMainPage.jsp	(.../openSystemMainPage.jsp)	(revision 15564)
+++ ssts-web/src/main/webapp/openSystemMainPage.jsp	(.../openSystemMainPage.jsp)	(revision 15864)
@@ -3,9 +3,11 @@
 <%@ page import="com.forgon.security.service.*,com.forgon.directory.vo.LoginUserData,com.forgon.tools.SpringBeanManger,com.forgon.security.service.OperationManager"%>
 <%@page import="com.forgon.systemsetting.service.HttpOptionManager,com.forgon.disinfectsystem.common.*"%>
 <%@page import="com.forgon.disinfectsystem.basedatamanager.ipandorgunitmapping.service.IpAndOrgUnitMappingManager"%>
+<%@page import="com.forgon.log.model.Log" %>
 <%@page import="java.util.List"%>
 <%
 LoginUserData loginUserData = AcegiHelper.getLoginUser();
+loginUserData.setClientType(Log.CLIENT_TYPE_PC);
 session.setAttribute("openSelectOrgUnitWindow", "打开");  //决定要不要打切换科室的窗口
 if(loginUserData.getDirectOrgUnitCodesWhereUserBelong() != null && loginUserData.getDirectOrgUnitCodesWhereUserBelong().indexOf(";") > 0){
 	boolean flag = ((IpAndOrgUnitMappingManager)SpringBeanManger.getBean("ipAndOrgUnitMappingManager")).updateCurrentOrgUnit(loginUserData);  //此用户IP如果是经过配置过,那么就修改，没有就则不管
Index: forgon-core/src/main/java/com/forgon/directory/action/OrgUnitAction.java
===================================================================
diff -u -r15767 -r15864
--- forgon-core/src/main/java/com/forgon/directory/action/OrgUnitAction.java	(.../OrgUnitAction.java)	(revision 15767)
+++ forgon-core/src/main/java/com/forgon/directory/action/OrgUnitAction.java	(.../OrgUnitAction.java)	(revision 15864)
@@ -285,7 +285,7 @@
 					orgUnitManager.updateOldData(orgUnit.getOrgUnitCoding(), oldOrgUnit.getName(), orgUnit.getName());
 					appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_BASEDATA, "U",
 							"组织机构[" + oldOrgUnit.getName() + "]修改名称为[" + orgUnit.getName() + "]科室编码为："
-									+ orgUnit.getOrgUnitCoding(),Log.CLIENT_TYPE_PC);
+									+ orgUnit.getOrgUnitCoding());
 				}
 				//返回条码、供页面打印
 				HttpServletResponse response = StrutsParamUtils.getResponse();