Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java =================================================================== diff -u -r16011 -r16127 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java (.../TousseInstanceAction.java) (revision 16011) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java (.../TousseInstanceAction.java) (revision 16127) @@ -636,7 +636,7 @@ try { JSONArray jsonArray = new JSONArray(); List tousses = - tousseInstanceManager.getAllReviewedTousseInstanceWithOutBasket(acegiHelper.getCurrentOrgUnitCode(), null, null); + tousseInstanceManager.getAllReviewedTousseInstanceWithOutBasket(acegiHelper.getCurrentOrgUnitCode(), null, null , 100); //将set转换成list,按id降序排序 List tousseList = new ArrayList(); Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r16079 -r16127 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 16079) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 16127) @@ -592,7 +592,7 @@ * 今天审核的未入筐器械包 */ public List getAllReviewedTousseInstanceWithOutBasket( - String orgUnitCode , String beginDate , String endDate){ + String orgUnitCode , String beginDate , String endDate , Integer amount){ String sql = " where po.status = '" + TousseInstance.STATUS_REVIEWED + "' and reviewBasket_id is null"; if(StringUtils.isNotBlank(beginDate)){ @@ -610,7 +610,7 @@ } @SuppressWarnings("unchecked") List list = objectDao.findBySql( - TousseInstance.class.getSimpleName(), sql); + TousseInstance.class.getSimpleName(), sql,0 , 100,null); return list; } @@ -621,7 +621,7 @@ public List getTodayReviewedTousseInstanceWithOutBasket( String orgUnitCode) { String todayStr = DateTools.getCurrentDayByFormat("yyyy-MM-dd"); - return getAllReviewedTousseInstanceWithOutBasket(orgUnitCode , todayStr, todayStr); + return getAllReviewedTousseInstanceWithOutBasket(orgUnitCode , todayStr, todayStr , null); } /** Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java =================================================================== diff -u -r16079 -r16127 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java (.../TousseInstanceManager.java) (revision 16079) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java (.../TousseInstanceManager.java) (revision 16127) @@ -82,10 +82,11 @@ * @param orgUnitCode * @param beginDate * @param endDate + * @param amount 数量 * @return */ public List getAllReviewedTousseInstanceWithOutBasket( - String orgUnitCode , String beginDate , String endDate); + String orgUnitCode , String beginDate , String endDate , Integer amount); /** * 根据科室编码和器械包名称,获取今天审核未入灭菌篮筐的器械包