Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterileloading/dwr/table/SterileLoadingTableManager.java =================================================================== diff -u -r16833 -r17223 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterileloading/dwr/table/SterileLoadingTableManager.java (.../SterileLoadingTableManager.java) (revision 16833) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterileloading/dwr/table/SterileLoadingTableManager.java (.../SterileLoadingTableManager.java) (revision 17223) @@ -20,6 +20,7 @@ import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseInstanceManager; import com.forgon.log.model.Log; import com.forgon.log.service.LogManager; +import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.json.JSONUtil; /** @@ -33,6 +34,7 @@ private SterileLoadingManager sterileLoadingManager; private LogManager appLogManager; + private ObjectDao objectDao; public void setAppLogManager(LogManager appLogManager) { this.appLogManager = appLogManager; @@ -50,6 +52,10 @@ this.tousseInstanceManager = tousseInstanceManager; } + public void setObjectDao(ObjectDao objectDao) { + this.objectDao = objectDao; + } + /** * 灭菌装载的条码扫描(灭菌筐条码、器械包实例条码、虚拟篮筐条码、器械包实例条码段、虚拟篮筐条码段等)调用的方法 * @param barcodes 灭菌筐条码、器械包实例条码、虚拟篮筐条码、器械包实例条码段、虚拟篮筐条码段等.条码段的中间用逗号分隔 @@ -302,8 +308,9 @@ return json.toString(); } //判断篮筐中是否有未发货(已灭菌)的器械包,如果有则进行提示 - if(CollectionUtils.isNotEmpty(tousseInstanceManager.getTousseInstanceBySql("where po.status='" + TousseInstance.STATUS_STERILED - + "' and po.reviewBasket_id in (select id from ReviewedBasket where container.id='" + container.getId() + "'))"))){ + if(objectDao.countBySql("select count(0) from "+ TousseInstance.class.getSimpleName() + +" po where po.status='" + TousseInstance.STATUS_STERILED + + "' and po.reviewBasket_id in (select id from ReviewedBasket where container_id=" + container.getId() + ")") > 0){ JSONUtil.addProperty(json, "returnType", "scanBasketFoundNotDeliverTousseInContainer");//扫描篮筐时发现有未发货的器械包 JSONUtil.addProperty(json, "containerName", container.getContainerName()); JSONUtil.addProperty(json, "basketBarcode", container.getBarcode());