Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r37411 -r37439 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 37411) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 37439) @@ -9919,7 +9919,7 @@ SqlUtils.getNonStringFieldInLargeCollectionsPredicate("ti.wareHouseId", wareHouseIds), SqlUtils.getNonStringFieldInLargeCollectionsPredicate("ti.wareHouseId2", wareHouseIds)); } - sql = String.format("select ti.id,ti.signedDate,ti.signedUser,bd.barcode,ti.validUntil, ti.invoiceSender, ti.invoiceSendTime, ou.name depart " + sql = String.format("select ti.sterileFrequency,ti.sterilizerName,ti.sterileEndTime,ti.id,ti.signedDate,ti.signedUser,bd.barcode,ti.validUntil, ti.invoiceSender, ti.invoiceSendTime, ou.name depart " + "from %s ti " + "inner join %s td on td.id =ti.tousseDefinition_id " + "inner join %s bd on bd.id=ti.id " @@ -9935,7 +9935,7 @@ wareHouseIdSql, tousseName, TousseInstance.STATUS_STERILED, TousseInstance.STATUS_DISINFECTED, TousseInstance.STATUS_SHIPPED); }else{ - sql = String.format("select ti.id,ti.signedDate,ti.signedUser,bd.barcode,ti.validUntil, ti.invoiceSender, ti.invoiceSendTime, ou.name depart " + sql = String.format("select ti.sterileFrequency,ti.sterilizerName,ti.sterileEndTime ,ti.id,ti.signedDate,ti.signedUser,bd.barcode,ti.validUntil, ti.invoiceSender, ti.invoiceSendTime, ou.name depart " + "from %s ti " + "inner join %s i on i.id = ti.invoice_id " + "inner join %s td on td.id =ti.tousseDefinition_id " @@ -9984,6 +9984,9 @@ obj.put("barcode", barcode); obj.put("invoiceSender", invoiceSender); obj.put("depart", depart); + obj.put("sterilizerName", rs.getString("sterilizerName")); + obj.put("sterileFrequency", rs.getString("sterileFrequency")); + obj.put("sterileEndTime", rs.getString("sterileEndTime")); array.add(obj); } } catch (Exception e) {