Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r30047 -r30048 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 30047) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 30048) @@ -8578,7 +8578,7 @@ + "inner join %s bd on bd.id=ti.id " + "where tousseFixedBarcode=0 %s " + "and td.name='%s' " - + "and comboTousseInstanceId is null " + //+ "and comboTousseInstanceId is null " + "and (ti.status='%s' or ti.status='%s') ", TousseInstance.class.getSimpleName(), TousseDefinition.class.getSimpleName(), @@ -8594,7 +8594,8 @@ + "inner join %s gs on gs.tousseDefinitionId = ancestor.id " + "inner join %s bd on bd.id=ti.id " + "where tousseFixedBarcode=0 and i.departCoding=gs.orgUnitCode and i.departCoding='%s' " - + "and ( td.isCommonTousse is null or td.isCommonTousse !=1) and comboTousseInstanceId is null " + + "and ( td.isCommonTousse is null or td.isCommonTousse !=1) " + //+ "and comboTousseInstanceId is null " + "and td.name='%s' and (ti.status='%s' or ti.status='%s') ", TousseInstance.class.getSimpleName(), Invoice.class.getSimpleName(), @@ -8608,6 +8609,7 @@ try { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); rs = objectDao.executeSql(sql); + System.out.println(sql); while(rs.next()){ JSONObject obj = new JSONObject(); Long id = rs.getLong("id");