Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/departmentgroup/action/DepartmentGroupAction.java
===================================================================
diff -u -r35616 -r37866
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/departmentgroup/action/DepartmentGroupAction.java	(.../DepartmentGroupAction.java)	(revision 35616)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/departmentgroup/action/DepartmentGroupAction.java	(.../DepartmentGroupAction.java)	(revision 37866)
@@ -54,6 +54,14 @@
 	public void saveDepartmentGroup() {
 		String message = "{success:true}";
 		try {
+			if(departmentGroup != null){
+				if(StringUtils.isBlank(departmentGroup.getHandleDepartCode())){
+					departmentGroup.setHandleDepartCode(null);
+				}
+				if(StringUtils.isBlank(departmentGroup.getHandleDepartName())){
+					departmentGroup.setHandleDepartName(null);
+				}
+			}
 			departmentGroupManager.saveDepartmentGroup(departmentGroup);
 			HttpServletResponse response = StrutsParamUtils.getResponse();
 			response.setCharacterEncoding("UTF-8");
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/departmentgroup/service/DepartmentGroupManager.java
===================================================================
diff -u -r35616 -r37866
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/departmentgroup/service/DepartmentGroupManager.java	(.../DepartmentGroupManager.java)	(revision 35616)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/departmentgroup/service/DepartmentGroupManager.java	(.../DepartmentGroupManager.java)	(revision 37866)
@@ -56,4 +56,9 @@
 	 * @param departmentGroup
 	 */
 	public void saveDepartmentGroup(DepartmentGroup departmentGroup);
+	/**
+	 * 获取属于当前处理科室或者没有所属处理科室的回收科室分组
+	 * @return
+	 */
+	public List<DepartmentGroup> getAllOfCurrentHandleDepartOrNoHaveHandleDepart();
 }
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recycledepartmentgroup/DepartmentGroup.java
===================================================================
diff -u -r35616 -r37866
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recycledepartmentgroup/DepartmentGroup.java	(.../DepartmentGroup.java)	(revision 35616)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recycledepartmentgroup/DepartmentGroup.java	(.../DepartmentGroup.java)	(revision 37866)
@@ -80,7 +80,14 @@
 	 * 提醒人员姓名，不保存到数据库(ZSRY-47)
 	 */
 	private String warningUserNames;
-	
+	/**
+	 * 处理科室编码
+	 */
+	private String handleDepartCode;
+	/**
+	 * 处理科室名称
+	 */
+	private String handleDepartName;
 	@Id
 	@GeneratedValue(strategy = GenerationType.AUTO)
 	public Long getId() {
@@ -182,6 +189,22 @@
 		this.warningUserNames = warningUserNames;
 	}
 	
+	public String getHandleDepartCode() {
+		return handleDepartCode;
+	}
+
+	public void setHandleDepartCode(String handleDepartCode) {
+		this.handleDepartCode = handleDepartCode;
+	}
+
+	public String getHandleDepartName() {
+		return handleDepartName;
+	}
+
+	public void setHandleDepartName(String handleDepartName) {
+		this.handleDepartName = handleDepartName;
+	}
+
 	@Transient
 	public String getWarningUserNames(ObjectDao objectDao) {
 		List<User> users = this.getWarningUser(objectDao);
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/departmentgroup/service/DepartmentGroupManagerImpl.java
===================================================================
diff -u -r35616 -r37866
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/departmentgroup/service/DepartmentGroupManagerImpl.java	(.../DepartmentGroupManagerImpl.java)	(revision 35616)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/departmentgroup/service/DepartmentGroupManagerImpl.java	(.../DepartmentGroupManagerImpl.java)	(revision 37866)
@@ -12,6 +12,7 @@
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 
+import com.forgon.directory.acegi.tools.AcegiHelper;
 import com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoringconfig.QualityMonitoringWarnUser;
 import com.forgon.disinfectsystem.entity.recycledepartmentgroup.DepartmentGroup;
 import com.forgon.disinfectsystem.entity.recycledepartmentgroup.DepartmentGroupWarnUser;
@@ -163,5 +164,12 @@
 			}
 		}
 	}
-
+	@Override
+	public List<DepartmentGroup> getAllOfCurrentHandleDepartOrNoHaveHandleDepart() {
+		String currentOrgUnitCode = AcegiHelper.getCurrentOrgUnitCode();
+		if(StringUtils.isBlank(currentOrgUnitCode)){
+			return new ArrayList<DepartmentGroup>();
+		}
+		return getByHql(" po.handleDepartCode='"+ currentOrgUnitCode +"' or po.handleDepartCode is null ");
+	}
 }