Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingRecord.java
===================================================================
diff -u -r20991 -r21331
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingRecord.java	(.../PackingRecord.java)	(revision 20991)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingRecord.java	(.../PackingRecord.java)	(revision 21331)
@@ -46,6 +46,22 @@
 	 */
 	private String packer;
 	/**
+	 * 审核人
+	 */
+	private String reviewer;
+	/**
+	 * 供应商
+	 */
+	private String supplierName;
+	/**
+	 * 医生
+	 */
+	private String doctor;
+	/**
+	 * 外来器械材料数量
+	 */
+	private String foreignMaterialsAmount;
+	/**
 	 * 装配时间
 	 */
 	private Date packTime;
@@ -54,6 +70,10 @@
 	 */
 	private String tousseName;
 	/**
+	 * 拆包名称
+	 */
+	private String splitTousseName;
+	/**
 	 * 包定义id
 	 */
 	private Long tousseDefinitionId;
@@ -123,6 +143,38 @@
 		this.packer = packer;
 	}
 
+	public String getReviewer() {
+		return reviewer;
+	}
+
+	public void setReviewer(String reviewer) {
+		this.reviewer = reviewer;
+	}
+
+	public String getSupplierName() {
+		return supplierName;
+	}
+
+	public String getDoctor() {
+		return doctor;
+	}
+
+	public void setSupplierName(String supplierName) {
+		this.supplierName = supplierName;
+	}
+
+	public void setDoctor(String doctor) {
+		this.doctor = doctor;
+	}
+
+	public String getForeignMaterialsAmount() {
+		return foreignMaterialsAmount;
+	}
+
+	public void setForeignMaterialsAmount(String foreignMaterialsAmount) {
+		this.foreignMaterialsAmount = foreignMaterialsAmount;
+	}
+
 	public Date getPackTime() {
 		return packTime;
 	}
@@ -139,6 +191,14 @@
 		this.tousseName = tousseName;
 	}
 	
+	public String getSplitTousseName() {
+		return splitTousseName;
+	}
+
+	public void setSplitTousseName(String splitTousseName) {
+		this.splitTousseName = splitTousseName;
+	}
+
 	public Long getTousseDefinitionId() {
 		return tousseDefinitionId;
 	}
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r21330 -r21331
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 21330)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 21331)
@@ -1925,7 +1925,7 @@
 	}
 	
 	@Override
-	public List<PackingRecord> loadTodayPackingRecord(String taskGroup,String tousseName,String orgUnitName,int firstIndex,int maxResults,String orderField){
+	public List<PackingRecord> loadTodayPackingRecord(String taskGroup,String tousseName,String orgUnitName,String tousseBarcode,int firstIndex,int maxResults,String orderField){
 		String sql = "where po.taskGroup = '" + taskGroup + "'";
 		if (StringUtils.isNotBlank(tousseName)) {
 			sql += " and po.tousseName like '%" + tousseName.trim() + "%' ";
@@ -1939,6 +1939,9 @@
 		sql += " and po.packTime between "
 				+ dateQueryAdapter.dateAdapter(startDate) + " and "
 				+ dateQueryAdapter.dateAdapter(endDate);
+		if (StringUtils.isNotBlank(tousseBarcode)) {
+			sql += String.format(" and po.id in (select packingRecord_id from %s where barcode='%s' and packingRecord_id is not null) " , TousseInstance.class.getSimpleName(),tousseBarcode);
+		}
 		return objectDao.findBySql(PackingRecord.class.getSimpleName(), sql,
 				firstIndex, maxResults, orderField);
 	}
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/PackingTableManager.java
===================================================================
diff -u -r20353 -r21331
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/PackingTableManager.java	(.../PackingTableManager.java)	(revision 20353)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/PackingTableManager.java	(.../PackingTableManager.java)	(revision 21331)
@@ -311,6 +311,7 @@
 		String orgUnitName = sqlWhereParamMap.get("orgUnit");
 		String startDate = sqlWhereParamMap.get("startDateSearch");
 		String endDate = sqlWhereParamMap.get("endDateSearch");
+		String tousseBarcode = sqlWhereParamMap.get("tousseBarcode");
 
 		String sql = " where po.orgUnitCoding = '"
 				+ AcegiHelper.getLoginUser()
@@ -352,6 +353,9 @@
 					+ dateQueryAdapter.dateAdapter(nowDate) + " and "
 					+ dateQueryAdapter.dateAdapter(tomorrow);
 		}
+		if (StringUtils.isNotBlank(tousseBarcode)) {
+			sql += String.format(" and po.id in (select packingRecord_id from %s where barcode='%s' and packingRecord_id is not null) " , TousseInstance.class.getSimpleName(),tousseBarcode);
+		}
 
 		return gridManager.renderGrid(parameterMap,
 				PackingRecord.class.getSimpleName(), sql,
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java
===================================================================
diff -u -r20708 -r21331
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java	(.../PackingAction.java)	(revision 20708)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java	(.../PackingAction.java)	(revision 21331)
@@ -598,11 +598,12 @@
 		String taskGroup = StrutsParamUtils.getPraramValue("taskGroup", null);
 		String tousseName = StrutsParamUtils.getPraramValue("tousseName", null);
 		String orgUnitName = StrutsParamUtils.getPraramValue("orgUnit", null);
+		String tousseBarcode = StrutsParamUtils.getPraramValue("tousseBarcode", null);
 		int page = Integer.parseInt(""+StrutsParamUtils.getPraramLongValue("page", 1L));
 		int maxResults = Integer.parseInt(""+StrutsParamUtils.getPraramLongValue("limit", 20L));
 		int firstIndex = (page-1) * maxResults;
 		String orderField = "id desc";
-		List<PackingRecord> records = packingManager.loadTodayPackingRecord(taskGroup, tousseName,orgUnitName,firstIndex, maxResults, orderField);
+		List<PackingRecord> records = packingManager.loadTodayPackingRecord(taskGroup, tousseName,orgUnitName,tousseBarcode,firstIndex, maxResults, orderField);
 		int totalAmount = packingManager.loadTodayPackingRecordTotalAmount(taskGroup);
 		JSONObject obj = new JSONObject();
 		obj.put("items", records);
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java
===================================================================
diff -u -r20793 -r21331
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java	(.../PackingManager.java)	(revision 20793)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java	(.../PackingManager.java)	(revision 21331)
@@ -137,7 +137,7 @@
 	public void createWashedClassifyBasketPackingTask();
 	
 	public int loadTodayPackingRecordTotalAmount(String taskGroup);
-	public List<PackingRecord> loadTodayPackingRecord(String taskGroup,String tousseName,String orgUnitName,int firstIndex,int maxResults,String orderField);
+	public List<PackingRecord> loadTodayPackingRecord(String taskGroup,String tousseName,String orgUnitName,String tousseBarcode,int firstIndex,int maxResults,String orderField);
 	/**
 	 * 器械包审核
 	 * @param idsStr 器械包实例编号串,用分号分隔
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
===================================================================
diff -u -r21241 -r21331
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 21241)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 21331)
@@ -247,6 +247,13 @@
 				departCodes, applyDate, tousseType);
 		Set<String> disposableGoodsTypeSet = buildDisposableGoodsTypeSet(disposableGoodsType);
 		filterEmptyInvoicePlan(invoicePlans);
+		// test
+		List<Long> ids = new LinkedList<Long>();
+		for (InvoicePlan invoicePlan : invoicePlans) {
+			ids.add(invoicePlan.getId());
+		}
+		String idsStr = StringUtils.join(ids,",");
+		// test
 		filterInvoicePlanByDisposableGoodsType(config,invoicePlans,disposableGoodsTypeSet);
 		Collection<InvoicePlanVo> resultCol = new ArrayList<InvoicePlanVo>();
 		for (final InvoicePlan invoicePlan : invoicePlans) {
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
===================================================================
diff -u -r21304 -r21331
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java	(.../TousseInstance.java)	(revision 21304)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java	(.../TousseInstance.java)	(revision 21331)
@@ -1667,6 +1667,13 @@
 	public Boolean getHaveUnSupplementMaterials() {
 		return haveUnSupplementMaterials;
 	}
+	@Transient
+	public boolean safelyGetHaveUnSupplementMaterials() {
+		if(haveUnSupplementMaterials == null){
+			return false;
+		}
+		return haveUnSupplementMaterials;
+	}
 
 	public void setHaveUnSupplementMaterials(Boolean haveUnSupplementMaterials) {
 		this.haveUnSupplementMaterials = haveUnSupplementMaterials;