Index: forgon-core/src/main/java/com/forgon/keyvalue/model/KeyValue.java
===================================================================
diff -u -r23492 -r36471
--- forgon-core/src/main/java/com/forgon/keyvalue/model/KeyValue.java	(.../KeyValue.java)	(revision 23492)
+++ forgon-core/src/main/java/com/forgon/keyvalue/model/KeyValue.java	(.../KeyValue.java)	(revision 36471)
@@ -5,8 +5,10 @@
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
@@ -23,6 +25,19 @@
 @DynamicUpdate(true)
 @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
 public class KeyValue {
+	
+	/**
+	 * 发货单签收人限制范围(SZSLGZXYY-18)
+	 */
+	public static final String SIGN_USER_SCOPE_KEY = "signUserLimitScope";
+	/**
+	 * 发货单签收人限制范围的值:仅限本科室签收
+	 */
+	public static final String SIGN_USER_SCOPE_CURRENT_DEPART = "仅限本科室签收";
+	/**
+	 * 发货单签收人限制范围的值:全部科室用户可签收
+	 */
+	public static final String SIGN_USER_SCOPE_ALL_DEPART = "全部科室用户可签收";
 
 	public static final String DOMAIN_SEPARATOR = ".";
 
Index: ssts-web/src/main/java/com/forgon/disinfectsystem/mobileClient/action/MobileClientSettingAction.java
===================================================================
diff -u -r13557 -r36471
--- ssts-web/src/main/java/com/forgon/disinfectsystem/mobileClient/action/MobileClientSettingAction.java	(.../MobileClientSettingAction.java)	(revision 13557)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/mobileClient/action/MobileClientSettingAction.java	(.../MobileClientSettingAction.java)	(revision 36471)
@@ -10,8 +10,11 @@
 import org.apache.struts2.convention.annotation.Namespace;
 import org.apache.struts2.convention.annotation.ParentPackage;
 
+import com.forgon.keyvalue.model.KeyValue;
+import com.forgon.keyvalue.model.KeyValue.KeyValueScope;
 import com.forgon.keyvalue.service.KeyValueManager;
 import com.forgon.tools.StrutsParamUtils;
+import com.forgon.tools.StrutsResponseUtils;
 
 @ParentPackage(value = "default")
 @Namespace(value = "/disinfectSystem")
@@ -39,33 +42,25 @@
 			takePhoto = 1;
 		}
 		keyValueManager.saveIntValue_TRANS_REQUIRED(TAKE_PHOTO_KEY, takePhoto);
+		//发货单签收人限制范围 SZSLGZXYY-18
+		String signUserLimitScope = StrutsParamUtils.getPraramValue(KeyValue.SIGN_USER_SCOPE_KEY, KeyValue.SIGN_USER_SCOPE_CURRENT_DEPART);
+		keyValueManager.saveStringValue_TRANS_REQUIRED(KeyValueScope.KeyValueScope_Project,KeyValue.SIGN_USER_SCOPE_KEY, signUserLimitScope);
 		success &= true;
-		try {
-			HttpServletResponse response = StrutsParamUtils.getResponse();
-			response.setCharacterEncoding("utf-8");
-			JSONObject obj = new JSONObject();
-			obj.put("success", success);
-			response.getWriter().write(obj.toString());
-			response.getWriter().close();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
+		JSONObject obj = new JSONObject();
+		obj.put("success", success);
+		StrutsResponseUtils.output(obj);
 	}
 	public void load(){
 		boolean success = true;
 		int exitLoginTime = keyValueManager.getIntValue(EXIT_LOGIN_TIME_KEY, 0);
 		int takePhoto = keyValueManager.getIntValue(TAKE_PHOTO_KEY, 1);
-		try {
-			HttpServletResponse response = StrutsParamUtils.getResponse();
-			response.setCharacterEncoding("utf-8");
-			JSONObject obj = new JSONObject();
-			obj.put("success", success);
-			obj.put(EXIT_LOGIN_TIME_KEY, exitLoginTime);
-			obj.put(TAKE_PHOTO_KEY, takePhoto);
-			response.getWriter().write(obj.toString());
-			response.getWriter().close();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
+		//发货单签收人限制范围(SZSLGZXYY-18)
+		String signUserLimitScope = keyValueManager.getStringValue(KeyValue.SIGN_USER_SCOPE_KEY, KeyValue.SIGN_USER_SCOPE_CURRENT_DEPART);
+		JSONObject obj = new JSONObject();
+		obj.put("success", success);
+		obj.put(EXIT_LOGIN_TIME_KEY, exitLoginTime);
+		obj.put(TAKE_PHOTO_KEY, takePhoto);
+		obj.put(KeyValue.SIGN_USER_SCOPE_KEY, signUserLimitScope);
+		StrutsResponseUtils.output(obj);
 	}
 }
Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
===================================================================
diff -u -r36452 -r36471
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 36452)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 36471)
@@ -201,6 +201,7 @@
 import com.forgon.java_websocket.core.JavaWebSocketServer;
 import com.forgon.java_websocket.model.PushRecord;
 import com.forgon.java_websocket.service.PushRecordManager;
+import com.forgon.keyvalue.model.KeyValue;
 import com.forgon.keyvalue.service.KeyValueManager;
 import com.forgon.log.model.Log;
 import com.forgon.log.service.LogManager;
@@ -5873,13 +5874,20 @@
 	 */
 	public String searchUsersByOrgUnitCoding(JSONObject params){
 		String orgUnitCoding = params.optString("orgUnitCoding", "");
+		String keyWord = params.optString("keyWord", "");
 		if(StringUtils.isBlank(orgUnitCoding)){
 			return JSONUtil.buildErrorMsgJsonResult("缺失参数orgUnitCoding");
 		}
 		JSONObject resultObj = null;
 		try {
+			String[] searchOrgUnitCodingCondition = new String[]{orgUnitCoding};
+			if(CssdUtils.getSystemSetConfigByNameBool("enableDisplaysTheItemInformationOfPDAInvoice")){
+				if(StringUtils.equals(KeyValue.SIGN_USER_SCOPE_ALL_DEPART,keyValueManager.getStringValue(KeyValue.SIGN_USER_SCOPE_KEY, KeyValue.SIGN_USER_SCOPE_CURRENT_DEPART))){
+					searchOrgUnitCodingCondition = null;
+				}
+			}
 			//默认不查询已经停用用户FSSDERMYY-22
-			JSONArray allArray = userManager.searchUsers(null, new String[]{orgUnitCoding}, false);
+			JSONArray allArray = userManager.searchUsers(keyWord, searchOrgUnitCodingCondition, false);
 			resultObj = JSONUtil.buildJsonObject(true, allArray);
 		} catch (Exception e) {
 			e.printStackTrace();
Index: ssts-web/src/main/webapp/personalSetting/modifyExitLoginTime.jsp
===================================================================
diff -u -r29513 -r36471
--- ssts-web/src/main/webapp/personalSetting/modifyExitLoginTime.jsp	(.../modifyExitLoginTime.jsp)	(revision 29513)
+++ ssts-web/src/main/webapp/personalSetting/modifyExitLoginTime.jsp	(.../modifyExitLoginTime.jsp)	(revision 36471)
@@ -1,3 +1,4 @@
+<%@page import="com.forgon.keyvalue.model.KeyValue"%>
 <%@ page contentType="text/html; charset=UTF-8"%>
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="com.forgon.tools.SpringBeanManger" %>
@@ -11,8 +12,14 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link rel="stylesheet" href="${ctx}/styles/main.css" type="text/css" />
 <%@ include file="/common/includeExtJsAndCss.jsp"%>
+<script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx }/js/common.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="modifyExitLoginTime.js?version=${svnRevision}"></script>
+<script type="text/javascript">
+var currentDepart = '<%=KeyValue.SIGN_USER_SCOPE_CURRENT_DEPART %>';
+var allDepart = '<%=KeyValue.SIGN_USER_SCOPE_ALL_DEPART %>';
+var signUserLimitScopeKey = '<%=KeyValue.SIGN_USER_SCOPE_KEY %>';
+</script>
 <style type="text/css" media="all">
 .allow-float {clear: none!important;}
 .stop-float {clear: both!important;}
Index: ssts-web/src/main/webapp/personalSetting/modifyExitLoginTime.js
===================================================================
diff -u -r13557 -r36471
--- ssts-web/src/main/webapp/personalSetting/modifyExitLoginTime.js	(.../modifyExitLoginTime.js)	(revision 13557)
+++ ssts-web/src/main/webapp/personalSetting/modifyExitLoginTime.js	(.../modifyExitLoginTime.js)	(revision 36471)
@@ -12,6 +12,11 @@
 		data : [['0','否'], ['1','是']]
 	});
     
+    var signUserLimitScopeStore = new Ext.data.SimpleStore( {
+		fields : ['value'],
+		data : [[currentDepart], [allDepart]]
+	});
+    
     var formObj = new Ext.FormPanel({
         labelAlign: 'left',
         frame:true,
@@ -54,6 +59,22 @@
 				triggerAction : 'all',
 				anchor : '100%',
 				readOnly : true
+			},{
+				xtype : 'combo',
+				fieldLabel : '发货单签收人限制范围',
+				id : 'signUserLimitScope',
+				name : 'signUserLimitScope',
+				hidden : !sstsConfig.enableDisplaysTheItemInformationOfPDAInvoice,
+				width : 180,
+				valueField : 'value',
+				displayField : 'value',
+				store : signUserLimitScopeStore,
+				forceSelection : true,
+				mode : 'local',
+				editable:false,
+				triggerAction : 'all',
+				anchor : '100%',
+				readOnly : true
 			}]
 		}],
 
@@ -78,6 +99,7 @@
 				var obj = Ext.decode(response.responseText);
 				Ext.getCmp('exitLoginTime').setRawValue(obj.exitLoginTime);
 				Ext.getCmp('takePhoto').setValue(obj.takePhoto);
+				Ext.getCmp('signUserLimitScope').setValue(obj[signUserLimitScopeKey]);
 			},
 			failure : function(response, options) {
 				showResult(response.responseText);
Index: forgon-core/src/main/java/com/forgon/security/service/UserManagerImpl.java
===================================================================
diff -u -r36246 -r36471
--- forgon-core/src/main/java/com/forgon/security/service/UserManagerImpl.java	(.../UserManagerImpl.java)	(revision 36246)
+++ forgon-core/src/main/java/com/forgon/security/service/UserManagerImpl.java	(.../UserManagerImpl.java)	(revision 36471)
@@ -442,26 +442,25 @@
 		
 		sql += orderBySql;
 		
-		ResultSet resultSet = objectDao.executeSql(sql);
-		if (resultSet != null) {
-			try {
-				while (resultSet.next()) {
-					
-					JSONObject obj = new JSONObject();
-					obj.put("id", resultSet.getLong("id"));
-					obj.put("fullName", resultSet.getString("fullName"));
-					obj.put("name", resultSet.getString("name"));
-					obj.put("orgUnitName", needDepart?resultSet.getString("orgUnitName"):"");
-					obj.put("barcode", resultSet.getString("barcode"));
-					
-					array.add(obj);
+		ResultSet resultSet = null;
+		try {
+			resultSet = objectDao.executeSql(sql);
+			while (resultSet.next()) {
+				
+				JSONObject obj = new JSONObject();
+				obj.put("id", resultSet.getLong("id"));
+				obj.put("fullName", resultSet.getString("fullName"));
+				obj.put("name", resultSet.getString("name"));
+				obj.put("orgUnitName", needDepart?resultSet.getString("orgUnitName"):"");
+				obj.put("barcode", resultSet.getString("barcode"));
+				
+				array.add(obj);
 
-				}
-			} catch (SQLException e) {
-				e.printStackTrace();
-			}finally {
-				DatabaseUtil.closeResultSetAndStatement(resultSet);
 			}
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}finally {
+			DatabaseUtil.closeResultSetAndStatement(resultSet);
 		}
 		return array;
 	}