Index: ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java =================================================================== diff -u -r14536 -r14804 --- ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java (.../SupplyRoomControlManagerImpl.java) (revision 14536) +++ ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java (.../SupplyRoomControlManagerImpl.java) (revision 14804) @@ -199,15 +199,15 @@ +" left join ClassifyBasket cb on cb.id = cw.ClassifyBasket_ID" +" left join ClassifiedItem ci on cb.id = ci.classifybasket_id " +" where wr.orgUnitCoding = '"+orgUnitCoding+"'" - +" and (ci.itemType = '器械包' or ci.itemType = '材料')" + +" and (ci.itemType = '器械包' or ci.itemType = '材料' or ci.itemType = '"+TousseDefinition.PACKAGE_TYPE_DISINFECTION+"')" +" and wr.recordCreateDate between " + dateQueryAdapter.dateAdapter(statDate) +" and " + dateQueryAdapter.dateAdapter(endDate); if(StringUtils.isNotBlank(tousseName)){ if(TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(tousseType)){ - whereSql += " and ci.tousseNameForMaterial like '%" + tousseName + "%'"; + whereSql += " and (ci.tousseNameForMaterial like '%" + tousseName + "%' or (ci.itemType = '"+TousseDefinition.PACKAGE_TYPE_DISINFECTION+"' and ci.name = '"+tousseName+"'))"; }else{ whereSql += " and ci.name = '"+tousseName+"'"; }