Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r27414 -r27422 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 27414) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 27422) @@ -6879,7 +6879,7 @@ TousseInstance.class.getSimpleName(),DepartmentStock.class.getSimpleName(),TousseDefinition.class.getSimpleName(), departCode, SqlUtils.getStringFieldInLargeCollectionsPredicate("td.name", tousseNameSet), TousseInstance.STATUS_RECYCLED, TousseInstance.STATUS_DISINFECTED, TousseInstance.STATUS_USED, TousseInstance.STATUS_SIGNED, tiDateSql); //已签收的数量(基数管理页面的库存数量),库存的科室编码=收货科室编码 String sigendSql = String.format(" select count(*) amount,'%s' status,td.name tousseName from %s ti inner join %s i on i.id=ti.invoice_id inner join %s td on td.id =ti.tousseDefinition_id inner join %s ds on ds.tousseDefinition_id=ti.tousseDefinition_id " - + " where tousseFixedBarcode=0 and i.departCoding=ds.departCoding and i.departCoding='%s' and ( td.isCommonTousse is null or td.isCommonTousse !=1) and comboTousseInstanceId is null and ti.status='%s' %s and %s group by td.name", + + " where tousseFixedBarcode=0 and i.departCoding=ds.departCoding and i.departCoding='%s' and comboTousseInstanceId is null and ti.status='%s' %s and %s group by td.name", TousseInstance.STATUS_SIGNED, TousseInstance.class.getSimpleName(), Invoice.class.getSimpleName(),