Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java =================================================================== diff -u -r33276 -r33287 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 33276) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 33287) @@ -11011,12 +11011,13 @@ String personInCharge = getFirstPersonIncharge(invoices.stream().map(p->p.getId().toString()).collect(Collectors.toSet()).toArray(new String[0])); batchPrintInvoiceVo.setPersonInCharge(StringTools.defaultString(personInCharge)); if(invoices.get(0).getInvoicePlan() != null){ - //如果打印出来的单据是按照科室合并的,存在多个申请单号,则在打印出来的单据上显示多个申请单号,用逗号分隔;按申请单合并,则只会有一个申请单流水号 - String invoicePlanSerialNumbers = getInvoicePlanSerialNumbersByInvoice(invoices); - batchPrintInvoiceVo.setApplicationSerialNumber(invoicePlanSerialNumbers); + batchPrintInvoiceVo.setApplicationSerialNumber(invoices.get(0).getInvoicePlan().getSerialNumber()); batchPrintInvoiceVo.setSubmitTime(invoices.get(0).getInvoicePlan().getSubmitTime()); batchPrintInvoiceVo.setHandleDepart(invoices.get(0).getInvoicePlan().getHandleDepart()); } + //如果打印出来的单据是按照科室合并的,存在多个申请单号,则在打印出来的单据上显示多个申请单号,用逗号分隔;按申请单合并,则只会有一个申请单流水号ZJYY-76 + String applicationSerialNumbers = getInvoicePlanSerialNumbersByInvoice(invoices); + batchPrintInvoiceVo.setApplicationSerialNumbers(applicationSerialNumbers); Map> tousseGroupPrintDataMap = null; if(CssdUtils.isDgszyyProject()){ tousseGroupPrintDataMap = loadToussePrintData_dgszyy(invoices, tousseGroupIds,invoiceTousseInstances,printedInvoiceItemIds); @@ -11095,7 +11096,9 @@ List invoicePlanSerialNumberList = new ArrayList(); for (Invoice invoice : invoices) { if(invoice.getInvoicePlan() != null){ - invoicePlanSerialNumberList.add(invoice.getInvoicePlan().getSerialNumber()); + if(!invoicePlanSerialNumberList.contains(invoice.getInvoicePlan().getSerialNumber())){ + invoicePlanSerialNumberList.add(invoice.getInvoicePlan().getSerialNumber()); + } } } return StringTools.join(invoicePlanSerialNumberList, ","); Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/vo/BatchPrintInvoiceVo.java =================================================================== diff -u -r31214 -r33287 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/vo/BatchPrintInvoiceVo.java (.../BatchPrintInvoiceVo.java) (revision 31214) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/vo/BatchPrintInvoiceVo.java (.../BatchPrintInvoiceVo.java) (revision 33287) @@ -32,6 +32,10 @@ * 申请单编号 */ private String applicationSerialNumber; + /** + * 申请单编号,多个申请单号,用逗号分隔; + */ + private String applicationSerialNumbers; private String remark2; private String applicationTime; private String hospitalNumber; @@ -110,6 +114,12 @@ public void setApplicationSerialNumber(String applicationSerialNumber) { this.applicationSerialNumber = applicationSerialNumber; } + public String getApplicationSerialNumbers() { + return applicationSerialNumbers; + } + public void setApplicationSerialNumbers(String applicationSerialNumbers) { + this.applicationSerialNumbers = applicationSerialNumbers; + } public String getRemark2() { return remark2; }