Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java =================================================================== diff -u -r20946 -r20960 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 20946) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 20960) @@ -5560,6 +5560,7 @@ String hql = "select ip.serialNumber from InvoicePlan ip where ip.type= '"+InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM +"'"; List serialNumbers = objectDao.findByHql(hql); //按时间,申请科室编码获得hrp同步单数据 + logger.info("申请科室编码:"+departCoding); List invoicePlanList = inventoryManager.findInvoicePlanByTimeAndDepartCoding(startDate,endDate,departCoding); //过滤已申请的单号 List invoicePlans = new ArrayList(); @@ -5641,37 +5642,13 @@ } //暂时没用的方法// - /** - * - * 根据Hrp申请明细的物质编码,名字规格过滤hrp申请单 - * @param invoicePlan - * @return - */ - private List FilterInvoicePlans1(Collection invoicePlan){ - long startTime = System.currentTimeMillis(); //获取开始时间 - //根据明细单过滤获得过滤后的申请单 - List firteredInvoicePlans = new ArrayList(); - for (HrpInvoicePlan hrpInvoicePlan : invoicePlan) { - String serialNumber = hrpInvoicePlan.getSerialNumber(); - //若过滤后明细单不为空则保留该申请单 - if(!findHrpTousseItemListByserialNumber(serialNumber).isEmpty()){ - firteredInvoicePlans.add(hrpInvoicePlan); - } - } - long endTime = System.currentTimeMillis(); //获取结束时间 - System.out.println("程序运行时间:" + (endTime - startTime)); - return firteredInvoicePlans; - } - @Override public Collection findInvoicePlanByTimeAndPage(Date startDate,Date endDate,int pagesize,int pagenumber) { //获得已申请单的单号 String hql = "select ip.serialNumber from InvoicePlan ip where ip.type= '"+InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM +"'"; List serialNumbers = objectDao.findByHql(hql); Collection invoicePlan = inventoryManager.findInvoicePlanByTimeAndPage(startDate, endDate, pagesize, pagenumber,serialNumbers) ; - //根据明细单过滤获得过滤后的申请单 - List firterInvoicePlan = FilterInvoicePlans1(invoicePlan); - return firterInvoicePlan; + return invoicePlan; } @Override @@ -5681,9 +5658,7 @@ List serialNumbers = objectDao.findByHql(hql); //int total = inventoryManager.findInvoicePlanTotalByTime(startDate, endDate,serialNumbers); List invoicePlan = inventoryManager.findInvoicePlanByTime(serialNumbers,startDate,endDate); - //根据明细单过滤获得过滤后的申请单 - List firterInvoicePlan = FilterInvoicePlans1(invoicePlan); - int total = firterInvoicePlan.size(); + int total = invoicePlan.size(); return total; } ///////////////////////////////////////////