Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java =================================================================== diff -u -r13416 -r13453 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java (.../SterilizationRecord.java) (revision 13416) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java (.../SterilizationRecord.java) (revision 13453) @@ -83,7 +83,7 @@ // 器械包 @JsonIgnore - private List tousseInstanceList; + private List tousseInstanceList = new ArrayList(); // 容器 @JsonIgnore Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r13442 -r13453 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 13442) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 13453) @@ -351,7 +351,8 @@ + "t.orgUnitCoding, t.orgUnitName, t.foreignProxyItem_Id, t.proxyDisinfection_Id " + "from tousseinstance t, barcodedevice b , cssdHandleTousses tt , TousseDefinition td " + "where t.id = b.id and tt.tousseDefinitionId=t.toussedefinition_id and t.tousseDefinition_id=td.id and t.reviewBasket_id =" - + reviewedBasket.getId(); + + reviewedBasket.getId() + + " and t.status <> '" + TousseInstance.STATUS_DISCARD + "'"; if(StringUtils.isNotBlank(taskGroup)){ sql += String.format(" and tt.taskGroup = '%s'", taskGroup);