Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r26424 -r26450
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 26424)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 26450)
@@ -4729,13 +4729,25 @@
 			recyclingTime = null;
 		}
 		invoice.setInvoicePlanType(invoicePlanType);
-		invoice.setDepart(depart);
 		invoice.setDepartCoding(departCoding);
-		invoice.setSettleAccountsDepart(settleAccountsDepart);
+		if(StringUtils.isBlank(depart) && StringUtils.isNotBlank(departCoding)){
+			OrgUnit orgUnitOfDepart = orgUnitManager.getByCode(departCoding);
+			if(orgUnitOfDepart != null){
+				depart = orgUnitOfDepart.getName();
+			}
+		}
+		invoice.setDepart(depart);
 		invoice.setSettleAccountsDepartCoding(settleAccountsDepartCoding);
+		if(StringUtils.isBlank(settleAccountsDepart) && StringUtils.isNotBlank(settleAccountsDepartCoding)){
+			OrgUnit settleOrgUnit = orgUnitManager.getByCode(settleAccountsDepartCoding);
+			if(settleOrgUnit != null){
+				settleAccountsDepart = settleOrgUnit.getName();
+			}
+		}
+		invoice.setSettleAccountsDepart(settleAccountsDepart);
 		
 		Set<TousseInstance> tousseInstancesToUpdate = submitInvoiceContext
-				.getTousseInstancesToUpdate();		
+				.getTousseInstancesToUpdate();
 		for (InvoiceItem invoiceItem : invoiceItems) {
 			// 先保存invoiceItem，以后需要invoiceItemID
 			objectDao.save(invoiceItem);