Index: ssts-web/src/main/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java =================================================================== diff -u -r17936 -r17955 --- ssts-web/src/main/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java (.../CSSDTestDataProcess.java) (revision 17936) +++ ssts-web/src/main/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java (.../CSSDTestDataProcess.java) (revision 17955) @@ -2477,6 +2477,7 @@ tousseDefinition2.setIsApplyEntireTousse("是"); tousseDefinition2.setIsRecycling(TousseDefinition.STR_YES); tousseDefinition2.setIsPacking(TousseDefinition.STR_NO); + tousseDefinition2.setIsReview(TousseDefinition.STR_NO); tousseDefinition2.setIsTraceable(TousseDefinition.STR_NO); tousseDefinition2.setTaskGroup("术科组"); tousseDefinition2.setTousseType(TousseDefinition.PACKAGE_TYPE_DISINFECTION); @@ -2586,24 +2587,27 @@ List tdList = objectDao.findBySql(TousseDefinition.class.getSimpleName(), "where forDisplay=true"); for(TousseDefinition td : tdList){ - //测试供应室 - CssdHandleTousses cssdHandleToussesForCssd = new CssdHandleTousses(); - cssdHandleToussesForCssd.setOrgUnitCode(Constants.ORG_UNIT_CODE_CSSD); - cssdHandleToussesForCssd.setOrgUnitName(Constants.ORG_UNIT_NAME_CSSD); - cssdHandleToussesForCssd.setTaskGroup(td.getTaskGroup()); - cssdHandleToussesForCssd.setTousseDefinitionId(td.getAncestorID()); - cssdHandleToussesForCssd.setTousseName(td.getName()); - objectDao.save(cssdHandleToussesForCssd); - - //测试手术室 - CssdHandleTousses cssdHandleToussesForOr = new CssdHandleTousses(); - cssdHandleToussesForOr.setOrgUnitCode(Constants.ORG_UNIT_CODE_OR); - cssdHandleToussesForOr.setOrgUnitName(Constants.ORG_UNIT_NAME_OR); - cssdHandleToussesForOr.setTaskGroup(td.getTaskGroup()); - cssdHandleToussesForOr.setTousseDefinitionId(td.getAncestorID()); - cssdHandleToussesForOr.setTousseName(td.getName()); - objectDao.save(cssdHandleToussesForOr); - + //只对器械包、消毒物品、敷料包配置供应室处理器械包的数据,其它类型不用配置 + if(td.isInsideTousse() || td.isDisinfection() || td.isDressing()){ + //测试供应室 + CssdHandleTousses cssdHandleToussesForCssd = new CssdHandleTousses(); + cssdHandleToussesForCssd.setOrgUnitCode(Constants.ORG_UNIT_CODE_CSSD); + cssdHandleToussesForCssd.setOrgUnitName(Constants.ORG_UNIT_NAME_CSSD); + cssdHandleToussesForCssd.setTaskGroup(td.getTaskGroup()); + cssdHandleToussesForCssd.setTousseDefinitionId(td.getAncestorID()); + cssdHandleToussesForCssd.setTousseName(td.getName()); + objectDao.save(cssdHandleToussesForCssd); + + //测试手术室 + CssdHandleTousses cssdHandleToussesForOr = new CssdHandleTousses(); + cssdHandleToussesForOr.setOrgUnitCode(Constants.ORG_UNIT_CODE_OR); + cssdHandleToussesForOr.setOrgUnitName(Constants.ORG_UNIT_NAME_OR); + cssdHandleToussesForOr.setTaskGroup(td.getTaskGroup()); + cssdHandleToussesForOr.setTousseDefinitionId(td.getAncestorID()); + cssdHandleToussesForOr.setTousseName(td.getName()); + objectDao.save(cssdHandleToussesForOr); + + } } } @@ -2918,6 +2922,7 @@ tousseDefinition.setIsCleanedEntirely("是"); tousseDefinition.setIsRecycling(TousseDefinition.STR_YES); tousseDefinition.setIsPacking(TousseDefinition.STR_NO); + tousseDefinition.setIsReview(TousseDefinition.STR_NO); tousseDefinition.setIsTraceable(TousseDefinition.STR_NO); tousseDefinition.setTaskGroup("术科组"); tousseDefinition.setTousseType(TousseDefinition.PACKAGE_TYPE_DISINFECTION);