Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java =================================================================== diff -u -r20056 -r20057 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 20056) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 20057) @@ -1315,7 +1315,6 @@ } } JSONArray jsonArray = JSONArray.fromObject(quickRecyclingList); -// System.out.println(jsonArray.toString()); StrutsResponseUtils.output(jsonArray); if(StringUtils.isNotBlank(ids)){ Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java =================================================================== diff -u -r19986 -r20057 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java (.../InvoicePlanManager.java) (revision 19986) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java (.../InvoicePlanManager.java) (revision 20057) @@ -174,7 +174,12 @@ * @param invoicePlan */ public void computeAndSetPrintStatus(InvoicePlan invoicePlan); - + /** + * 获取快速回收的待回收申请项。申请单回收状态为待回收和部分回收的。外来器械包申请单不处理。isThereIdentificationCard为是的也不处理。expressRecycling不为是的也过滤掉 + * @param supplyRoomType 供应室类型。实际上没有用 + * @param handleDepartCodings 处理科室,目前调用的地方也是传空,实际上没用 + * @return + */ public List getExpressRecyclingTousse(int supplyRoomType, String handleDepartCodings); /** * 发货计划列表扫描科室条码或者单号条码,打开对应的发货单。先按条码找科室,找不到科室就按流水号找申请单