Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/dwr/table/InvoiceTableManager.java =================================================================== diff -u -r15631 -r17485 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/dwr/table/InvoiceTableManager.java (.../InvoiceTableManager.java) (revision 15631) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/dwr/table/InvoiceTableManager.java (.../InvoiceTableManager.java) (revision 17485) @@ -1,5 +1,6 @@ package com.forgon.disinfectsystem.invoicemanager.dwr.table; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; @@ -15,6 +16,8 @@ import com.forgon.component.grid.GridManager; import com.forgon.directory.acegi.tools.AcegiHelper; import com.forgon.directory.model.BarcodeDevice; +import com.forgon.directory.model.OrgUnit; +import com.forgon.directory.service.OrgUnitManager; import com.forgon.disinfectsystem.barcode.service.BarcodeManager; import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager; import com.forgon.disinfectsystem.diposablegoods.service.DiposableGoodBatchStockManager; @@ -36,9 +39,6 @@ import com.forgon.tools.MathTools; import com.forgon.tools.hibernate.ObjectDao; -import java.text.ParseException; -import java.text.SimpleDateFormat; - /** * @author WangYi 2012-3-5 */ @@ -59,6 +59,8 @@ private ObjectDao objectDao; + private OrgUnitManager orgUnitManager; + public void setDiposableGoodBatchStockManager( DiposableGoodBatchStockManager diposableGoodBatchStockManager) { this.diposableGoodBatchStockManager = diposableGoodBatchStockManager; @@ -94,6 +96,10 @@ this.objectDao = objectDao; } + public void setOrgUnitManager(OrgUnitManager orgUnitManager) { + this.orgUnitManager = orgUnitManager; + } + public void updateTousseDefinitionAmount() { invoiceManager.updateTousseDefinitionAmount(); } @@ -191,6 +197,20 @@ } return result; } + + public String getOrgByBarcode(String barcode) { + JSONObject obj = new JSONObject(); + OrgUnit orgUnit = orgUnitManager.getOrgUnitByBarcode(barcode); + if (orgUnit != null) { + obj.put("success", true); + obj.put("name", orgUnit.getName()); + obj.put("orgUnitCoding", orgUnit.getOrgUnitCoding()); + }else{ + obj.put("success", false); + obj.put("message", "无此科室!"); + } + return obj.toString(); + } public Invoice getInvoiceByTousseInstanceId(String tousseInstanceId) { return invoiceManager.getInvoiceByTousseInstanceId(tousseInstanceId);