Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java =================================================================== diff -u -r26759 -r26763 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 26759) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 26763) @@ -3385,6 +3385,7 @@ // 拆分器械包的器械包定义集合(包含原来的器械包定义) List diveTousseDefinitionList = new ArrayList(); diveTousseDefinitionList = tousseDefinitionManager.getByProperty("parentID", td.getId()); + diveTousseDefinitionList.add(td); // 外来器械申请单 ForeignTousseApplication foreignTousseApplication = (ForeignTousseApplication) tousseItem.getInvoicePlan(); // 根据供应商名称获取供应商信息 @@ -3420,9 +3421,10 @@ // 优先取清洗责任人,清洗责任人为空,则取清洗操作人 washOperatorList.add(StringUtils.isNotBlank(washPersonInCharge)?washPersonInCharge:operator); } - rs.close(); } catch (SQLException e) { e.printStackTrace(); + } finally { + DatabaseUtil.closeResultSetAndStatement(rs); } // 去除重复的清洗人名称 washOperatorList = new ArrayList(new HashSet(washOperatorList)); @@ -3431,7 +3433,6 @@ } // 根据器械包实例获取装配人、审核人、发货员、灭菌员(北京垂杨柳外来器械申请单打印) if (CollectionUtils.isNotEmpty(diveTousseDefinitionList)) { - diveTousseDefinitionList.add(td); List operatorList = new ArrayList(); List reviewerList = new ArrayList(); List invoiceSenderList = new ArrayList();