Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
===================================================================
diff -u -r26620 -r26776
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 26620)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 26776)
@@ -1028,6 +1028,7 @@
 					PackingRecord packingRecord = (PackingRecord)objectDao.getByProperty(PackingRecord.class.getSimpleName(), "id", packingRecord_id);
 					if (packingRecord != null) {
 						packingRecordJSON.put("wrapper", packingRecord.getWrapper());
+						packingRecordJSON.put("inspector", packingRecord.getInspector());
 					}
 				}
 				//清洗交接记录
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
===================================================================
diff -u -r26692 -r26776
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java	(.../TousseInstanceTableManager.java)	(revision 26692)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java	(.../TousseInstanceTableManager.java)	(revision 26776)
@@ -611,9 +611,58 @@
         }
 
 		String json = gridManager.converJsonString(totalResults, list, sql,TousseInstance.filterProperties);
+		// 设置装配器械检查员
+		json = setInspector(json);
 		return json;
 	}
 	
+	/**
+	 * 设置装配时的器械监察员(售后-东莞市中医院ASSDGSZYY-61)
+	 * @param json 
+	 */
+	private String setInspector(String json) {
+		JSONObject jsonObject = JSONObject.fromObject(json);
+		if(jsonObject == null){
+			return null;
+		}
+		JSONArray jsonArray = jsonObject.getJSONArray("rows");
+		if (jsonArray == null || jsonArray.size() == 0) {
+			return null;
+		}
+		Set<String> idds = new HashSet<String>();
+		for (int i = 0; i < jsonArray.size(); i++) {
+			JSONObject obj = jsonArray.getJSONObject(i);
+			if (obj != null) {
+				if (StringUtils.isNotBlank(obj.getString("packingRecord_id"))) {
+					idds.add(obj.getString("packingRecord_id"));
+				}
+			}			
+		}
+		Map<String,String> map = new HashMap<String, String>();
+		if (CollectionUtils.isNotEmpty(idds)) {
+			String sql = String.format(" select po.id, po.inspector from PackingRecord po where (1=1) and %s ", SqlUtils.getNonStringFieldInLargeCollectionsPredicate("po.id", idds));
+			ResultSet resultSet = objectDao.executeSql(sql.toString());
+			try {
+				while(resultSet.next()) {
+					String packingRecordId = resultSet.getString(1);
+					String inspector = resultSet.getString(2);
+					map.put(packingRecordId, inspector);
+				}
+			} catch (SQLException e) {
+				e.printStackTrace();
+			}finally {
+				DatabaseUtil.closeResultSetAndStatement(resultSet);
+			}
+			for (int i = 0; i < jsonArray.size(); i++) {
+				JSONObject obj = jsonArray.getJSONObject(i);
+				String inspector = map.get(obj.getString("packingRecord_id"));
+				jsonArray.getJSONObject(i).put("inspector", inspector);
+			}
+			return jsonObject.toString();
+		}
+		return null;
+	}
+
 	private void setIdNumber(List<Object> list){
 		Set<Long> idds = new HashSet<Long>();
 		if(list == null){