Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java =================================================================== diff -u -r29323 -r29406 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java (.../InvoiceAction.java) (revision 29323) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java (.../InvoiceAction.java) (revision 29406) @@ -1038,6 +1038,24 @@ invoicePlanJSON.put("iinvoice_SerialNum", ip.getSerialNumber()==null?"":ip.getSerialNumber()); invoicePlanJSON.put("invoice__applicant", ip.getApplicant()==null?"":ip.getApplicant()); invoicePlanJSON.put("invoice_Type", ip.getType()==null?"":ip.getType()); + TousseItem tousseItem = null; + List applicationItems = ip.getApplicationItems(); + TousseDefinition td = ti.getTousseDefinition(); + if(CollectionUtils.isNotEmpty(applicationItems) && td != null){ + for (TousseItem item : applicationItems) { + Long tdId = item.getTousseDefinitionId(); + if(tdId != null && tdId.longValue() == td.getId().longValue()){ + tousseItem = item; + break; + } + } + } + // 预备回收图片和视频关联TousseItem + invoicePlanJSON.put("tousseItemId", tousseItem==null?"":tousseItem.getId()); + // 预回收记录信息 + invoicePlanJSON.put("prepareRecycleOperator", ip.getPrepareRecycleOperator()); + invoicePlanJSON.put("prepareRecycleComfirmor", ip.getPrepareRecycleComfirmor()); + invoicePlanJSON.put("prepareRecycleDateTime", ip.getPrepareRecycleDateTime() == null ? "" : DateTools.getFormatDateStr(ip.getPrepareRecycleDateTime(), "yyyy-MM-dd HH:mm:ss")); if(ip instanceof ForeignProxyDisinfection){ if(StringUtils.isBlank(ti.getOperator())){ // DGSDBZXYY-83 外部代理灭菌包,器械包信息里面的装配记录的配包人没有显示出来