Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/taskGroup/service/TaskGroupManager.java =================================================================== diff -u -r16631 -r16719 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/taskGroup/service/TaskGroupManager.java (.../TaskGroupManager.java) (revision 16631) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/taskGroup/service/TaskGroupManager.java (.../TaskGroupManager.java) (revision 16719) @@ -26,6 +26,10 @@ */ public TaskGroup getTaskGroup(String taskGroupName); + /** + * 获取系统上的所有任务组 + * @return + */ public List findAllTaskGroup(); public List findTaskGroupByDepartCode(String departCode); Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java =================================================================== diff -u -r16673 -r16719 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java (.../TousseDefinitionAction.java) (revision 16673) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java (.../TousseDefinitionAction.java) (revision 16719) @@ -961,6 +961,9 @@ StrutsResponseUtils.output(array); } + /** + * 根据处理科室获取其的所有任务组 + */ public void getTaskGroupName() { // List list = httpOptionManager // .getHttpOptionTextById(HttpOption.SYSTENSETTING_TASKGROUP); @@ -1756,6 +1759,10 @@ } } + /** + * 获取系统上的所有的器械包的处理科室(包括但不限于一级供应室、二级供应室) + * @return + */ public String getHandlerDeparts() { SupplyRoomConfig firstSupplyRoom = supplyRoomConfigManager .getFirstSupplyRoomConfig(); Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/taskGroup/service/TaskGroupManagerImpl.java =================================================================== diff -u -r16631 -r16719 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/taskGroup/service/TaskGroupManagerImpl.java (.../TaskGroupManagerImpl.java) (revision 16631) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/taskGroup/service/TaskGroupManagerImpl.java (.../TaskGroupManagerImpl.java) (revision 16719) @@ -44,6 +44,11 @@ public TaskGroup getTaskGroup(String taskGroupName) { return (TaskGroup) objectDao.getByProperty(TaskGroup.class.getSimpleName(), "taskGroupName", taskGroupName); } + + /** + * 获取系统上的所有任务组 + * @return + */ @SuppressWarnings("unchecked") public List findAllTaskGroup() { return objectDao.findAllObjects(TaskGroup.class.getSimpleName());