Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r28704 -r28746 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 28704) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 28746) @@ -6395,14 +6395,16 @@ throw new SystemException("参数recyclingRecordIds的值不能为空"); } JSONArray items = new JSONArray(); - JSONObject data = JSONUtil.buildJsonObject(true, items); List idList = (List) StringTools.parseToLongs(recyclingRecordIds, ","); List invoicePlanList = objectDao.getCollection(InvoicePlan.class.getSimpleName(), "id", idList); if(CollectionUtils.isEmpty(invoicePlanList)){ - return data; + return JSONUtil.buildJsonObject(true, items); } Map nameToAmount = new HashMap(); for (InvoicePlan ip : invoicePlanList) { + if(InvoicePlan.TYPE_FOREIGNTOUSSEAPPLIACTION.equals(ip.getType())){ + continue;//外来器械申请单不用打印 + } List tousseItems = ip.getApplicationItems(); if(CollectionUtils.isNotEmpty(tousseItems)){ for (TousseItem tousseItem : tousseItems) { @@ -6424,15 +6426,17 @@ } } } + if(MapUtils.isEmpty(nameToAmount)){ + return JSONUtil.buildJsonObject(true, items); + } Set> set = nameToAmount.entrySet(); for (Entry entry : set) { JSONObject json = new JSONObject(); json.put("tosseName", entry.getKey()); json.put("amount", entry.getValue()); items.add(json); } - data = JSONUtil.buildJsonObject(true, items); - return data; + return JSONUtil.buildJsonObject(true, items); } @Override public JSONObject getTousseItemSummaryByInvoicePlanIds2(