Index: ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/formdefinition/service/FormDefinitionManagerImpl.java
===================================================================
diff -u -r18368 -r18510
--- ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/formdefinition/service/FormDefinitionManagerImpl.java	(.../FormDefinitionManagerImpl.java)	(revision 18368)
+++ ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/formdefinition/service/FormDefinitionManagerImpl.java	(.../FormDefinitionManagerImpl.java)	(revision 18510)
@@ -348,8 +348,11 @@
 		if(StringUtils.isNotBlank(formType)){
 			sql += " and formType = '" + formType + "'";
 		}
-		String orgUnitCoding = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig();
-		sql += " and departCodes like '%" + orgUnitCoding + "%'";
+		LoginUserData loginUserData = AcegiHelper.getLoginUser();
+		if(loginUserData != null && StringUtils.isNotBlank(loginUserData.getCurrentOrgUnitCode())){
+			String orgUnitCoding = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig();
+			sql += " and departCodes like '%" + orgUnitCoding + "%'";
+		}
 		sql += " group by formName";
 		return sql;
 	}
Index: ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/formdefinition/service/FormDefinitionManager.java
===================================================================
diff -u -r16971 -r18510
--- ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/formdefinition/service/FormDefinitionManager.java	(.../FormDefinitionManager.java)	(revision 16971)
+++ ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/formdefinition/service/FormDefinitionManager.java	(.../FormDefinitionManager.java)	(revision 18510)
@@ -37,6 +37,8 @@
 	
 	/**
 	 * 获取科室能使用的表单定义
+	 * 1.如果是临床科室的用户通过action调用此方法则返回为空
+	 * 2.如果是未登录的用户通过action调用此方法则返回为所有
 	 * @param formType
 	 * @return
 	 */