Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java =================================================================== diff -u -r14278 -r14313 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java (.../ImportBasedataManagerImpl.java) (revision 14278) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java (.../ImportBasedataManagerImpl.java) (revision 14313) @@ -30,6 +30,7 @@ import com.forgon.attachfile.service.AttachFileManager; import com.forgon.directory.acegi.tools.AcegiHelper; import com.forgon.directory.model.BarcodeDevice; +import com.forgon.directory.model.CssdHandleTousses; import com.forgon.directory.model.OrgUnit; import com.forgon.directory.service.OrgUnitManager; import com.forgon.disinfectsystem.basedatamanager.cleanmethod.service.CleanMethodManager; @@ -1403,6 +1404,18 @@ tousseDefinition.setAncestorID(tousseDefinition.getId()); if(isNewTousse){ tousseDefinitionManager.addCssdHandleToussesConfig(tousseDefinition); + }else{ + //如果优先处理科室发生修改且供应室处理器械包配置未配置该包的处理科室,则新增对应供应室处理器械包配置 + CssdHandleTousses cssdHandleTousses = + (CssdHandleTousses)objectDao.getBySql(CssdHandleTousses.class.getSimpleName(), + " where tousseDefinitionId = " + tousseDefinition.getAncestorID() + " and orgUnitCode = '" + tousseDefinition.getHandlerDepartCode() + "'"); + if(cssdHandleTousses == null){ + tousseDefinitionManager.addCssdHandleToussesConfig(tousseDefinition); + }else{ + //否则更新任务组 + cssdHandleTousses.setTaskGroup(tousseDefinition.getTaskGroup()); + objectDao.saveOrUpdate(cssdHandleTousses); + } } successCount++; materialInstanceList = null; @@ -1831,6 +1844,18 @@ tousseDefinition.setAncestorID(tousseDefinition.getId()); if(isNewTousse){ tousseDefinitionManager.addCssdHandleToussesConfig(tousseDefinition); + }else{ + //如果优先处理科室发生修改且供应室处理器械包配置未配置该包的处理科室,则新增对应供应室处理器械包配置 + CssdHandleTousses cssdHandleTousses = + (CssdHandleTousses)objectDao.getBySql(CssdHandleTousses.class.getSimpleName(), + " where tousseDefinitionId = " + tousseDefinition.getAncestorID() + " and orgUnitCode = '" + tousseDefinition.getHandlerDepartCode() + "'"); + if(cssdHandleTousses == null){ + tousseDefinitionManager.addCssdHandleToussesConfig(tousseDefinition); + }else{ + //否则更新任务组 + cssdHandleTousses.setTaskGroup(tousseDefinition.getTaskGroup()); + objectDao.saveOrUpdate(cssdHandleTousses); + } } successCount++; }