Index: ssts-web/src/main/java/test/forgon/constant/Constants.java =================================================================== diff -u -r18645 -r19516 --- ssts-web/src/main/java/test/forgon/constant/Constants.java (.../Constants.java) (revision 18645) +++ ssts-web/src/main/java/test/forgon/constant/Constants.java (.../Constants.java) (revision 19516) @@ -67,9 +67,9 @@ */ public static final String TASKGROUP_SHOUSHUQIXIEZU= "手术器械组"; /** - * 手术器械组 + * 临床器械组 */ - public static final String TASKGROUP_LINCHUANGQIXIEZU= "手术器械组"; + public static final String TASKGROUP_LINCHUANGQIXIEZU= "临床器械组"; /** * 条码常量 * @author kzh Index: ssts-web/src/main/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java =================================================================== diff -u -r19501 -r19516 --- ssts-web/src/main/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java (.../CSSDTestDataProcess.java) (revision 19501) +++ ssts-web/src/main/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java (.../CSSDTestDataProcess.java) (revision 19516) @@ -1827,7 +1827,7 @@ /** *

初始化供应室服务临床科室配置

- * 1、一级供应室可以服务所有二级供应室、所有申请科室的器械包和一次性物品的申请
+ * 1、一级供应室可以服务“自己”、“所有二级供应室”、“所有申请科室”的器械包和一次性物品的申请
* 2、二级供应室可以服务所有申请科室的器械包和一次性物品的申请 * */ @@ -1839,6 +1839,7 @@ //一级供应室 for (OrgUnit fristSupplyRoom : allFristSupplyRoom) { List temp = new ArrayList(); + temp.addAll(allFristSupplyRoom); temp.addAll(allSecondSupplyRoom); temp.addAll(allApplyDepartment); for (OrgUnit ou : temp) { @@ -2680,7 +2681,7 @@ CssdHandleTousses cssdHandleToussesForOr = new CssdHandleTousses(); cssdHandleToussesForOr.setOrgUnitCode(Constants.ORG_UNIT_CODE_OR); cssdHandleToussesForOr.setOrgUnitName(Constants.ORG_UNIT_NAME_OR); - cssdHandleToussesForOr.setTaskGroup(td.getTaskGroup()); + cssdHandleToussesForOr.setTaskGroup(Constants.TASKGROUP_SHOUSHUQIXIEZU); cssdHandleToussesForOr.setTousseDefinitionId(td.getAncestorID()); cssdHandleToussesForOr.setTousseName(td.getName()); objectDao.save(cssdHandleToussesForOr);