Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r15680 -r15682
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 15680)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 15682)
@@ -83,7 +83,6 @@
 import com.forgon.disinfectsystem.entity.packing.ReviewedBasket;
 import com.forgon.disinfectsystem.entity.printinvoiceconfig.PrintInvoiceConfig;
 import com.forgon.disinfectsystem.entity.recyclingapplication.RecyclingApplication;
-import com.forgon.disinfectsystem.entity.sterilizationmanager.foreignproxydisinfection.ForeignProxyDisinfection;
 import com.forgon.disinfectsystem.entity.sterilizationmanager.foreignproxydisinfection.ForeignProxyItem;
 import com.forgon.disinfectsystem.entity.sterilizationmanager.proxydisinfection.ProxyDisinfection;
 import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationRecord;
@@ -117,11 +116,10 @@
 import com.forgon.tools.date.DateTools;
 import com.forgon.tools.db.DatabaseUtil;
 import com.forgon.tools.db.InitDbConnection;
-import com.forgon.tools.hibernate.ObjectDao;
+import com.forgon.tools.hibernate.BasePoManagerImpl;
 import com.forgon.tools.json.GsonUtil;
 import com.forgon.tools.json.JSONUtil;
 import com.forgon.tools.string.StringTools;
-import com.forgon.tools.util.ForgonIntegerUtils;
 import com.forgon.tools.util.SqlUtils;
 import com.google.gson.Gson;
 import com.google.gson.JsonArray;
@@ -133,11 +131,13 @@
  * @author WangYi 2012-3-5
  */
 
-public class InvoiceManagerImpl implements InvoiceManager {
+public class InvoiceManagerImpl extends BasePoManagerImpl<Invoice> implements InvoiceManager {
+	public InvoiceManagerImpl() {
+		super(Invoice.class);
+	}
+
 	private final Logger logger = Logger.getLogger(this.getClass());
 
-	private ObjectDao objectDao;
-
 	private BarcodeManager barcodeManager;
 
 	private TousseInstanceManager tousseInstanceManager;
@@ -207,10 +207,6 @@
 		this.dateQueryAdapter = dateQueryAdapter;
 	}
 
-	public void setObjectDao(ObjectDao objectDao) {
-		this.objectDao = objectDao;
-	}
-
 	public void setBarcodeManager(BarcodeManager barcodeManager) {
 		this.barcodeManager = barcodeManager;
 	}
@@ -7213,4 +7209,16 @@
 		return jsonObj;
 		
 	}
+
+	@Override
+	public String getFirstAssistant(String[] ids) {
+		String idsStr = StringUtils.join(ids, ",");
+		String where = String.format(" po.id in (%s) and po.assistantSender is not null "
+				+"and po.assistantSender <> '' order by po.sendTime desc", idsStr);
+		Invoice invoice = getFirst(where);
+		if(invoice != null){
+			return invoice.getAssistantSender();
+		}
+		return null;
+	}
 }
\ No newline at end of file
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManager.java
===================================================================
diff -u -r15403 -r15682
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManager.java	(.../InvoiceManager.java)	(revision 15403)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManager.java	(.../InvoiceManager.java)	(revision 15682)
@@ -17,12 +17,13 @@
 import com.forgon.disinfectsystem.invoicemanager.vo.InvoiceStaticsVo;
 import com.forgon.disinfectsystem.invoicemanager.vo.WaitSignGoodsSummary;
 import com.forgon.disinfectsystem.recyclingapplication.vo.ApplicationGoodsVo;
+import com.forgon.tools.hibernate.BasePoManager;
 import com.google.gson.JsonObject;
 
 /**
  * @author WangYi 2012-3-5
  */
-public interface InvoiceManager {
+public interface InvoiceManager extends BasePoManager<Invoice> {
 
 	public void saveInvoice(Invoice invoice);
 
@@ -187,4 +188,10 @@
 	 * @return
 	 */
 	public JSONObject isRoutine(String tousseBarcodes);
+	/**
+	 * 获取发货单中,第一张核对员不为空的单，把核对员信息返回。如果都为空,则返回null
+	 * @param ids 发货单id的集合
+	 * @return
+	 */
+	public String getFirstAssistant(String[] ids);
 }
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
===================================================================
diff -u -r15678 -r15682
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 15678)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 15682)
@@ -1196,8 +1196,10 @@
 					Invoice invoice = invoiceManager.getInvoiceById(idStrs[0]);
 					map.put("hospitalNumber", StringTools.defaultString(invoice.getHospitalNumber()));
 					map.put("sourceWarehouseName", StringTools.defaultString(invoice.getSourceWarehouseName()));
-					map.put("assistantSender", StringTools.defaultString(invoice.getAssistantSender()));
+//					map.put("assistantSender", StringTools.defaultString(invoice.getAssistantSender()));
 				}
+				//获取第一张核对人不为空的单,把核对员打到单上
+				map.put("assistantSender", StringTools.defaultIfBlank(invoiceManager.getFirstAssistant(idStrs),""));
 				tousseList = invoiceManager.loadToussePrintData(idStrs);
 				disinfectGoodslist = invoiceManager
 						.getDisinfectGoodsPrintData(idStrs);