Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r16246 -r16250
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 16246)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 16250)
@@ -3045,11 +3045,6 @@
 		return jsonObject;
 	}
 	
-	/**
-	 * 此器械包的所有再生材料的"id"和"isImplant"两个属性的Map
-	 * @param td
-	 * @return
-	 */
 	private Map<Long, String> findMaterialIsImplantGoods(TousseDefinition td){
 		Map<Long, String> map = new HashMap<Long, String>();
 		if(td != null && td.getMaterialInstances() != null){
@@ -3065,7 +3060,6 @@
 	
 	/**
 	 * 
-	 * 
 	 */
 	private String buildForeignTousseSplitPackages(PackingTask task,SupplyRoomConfig sysConfig,String packageType){
 		if(task == null){
@@ -3284,7 +3278,7 @@
 				urgentAmountJson.put("currentUrgentAmount", Integer.parseInt(urgentAmountStr));
 			}
 
-			List<PackingTask> packingTasks = query.list();  //得到本次的所有装配任务
+			List<PackingTask> packingTasks = query.list();
 			Set<Long> recyclingRecordIds = new HashSet<Long>();
 			for (PackingTask packingTask : packingTasks) {
 				logger.debug("装配任务packingTask[id=" + packingTask.getId() + "],tousseName=" + packingTask.getTousseDefinition().getName()+ "], [待装配数量=" + packingTask.getUnPackAmount() + "]");
@@ -3294,7 +3288,7 @@
 					 }
 				}
 			}
-			Map<Long,RecyclingRecord> idToRecyclingRecordMap = new HashMap<Long, RecyclingRecord>();  //本次的所有装配任务对应的回收记录
+			Map<Long,RecyclingRecord> idToRecyclingRecordMap = new HashMap<Long, RecyclingRecord>();
 			if(!recyclingRecordIds.isEmpty()){
 				String recyclingRecordSql = String.format(" where %s", SqlUtils.getNonStringFieldInCollectionsPredicate("po.id", recyclingRecordIds));
 				List<RecyclingRecord> recyclingRecordList = objectDao.findBySql(RecyclingRecord.class.getSimpleName(), recyclingRecordSql);
@@ -3346,7 +3340,7 @@
 				// 更新包数量（主要是消毒物品、自定义包、外来包按材料统计）
 				updateTousseWorkloadStaticsAmount(td);
 				String tousseName = td.getName();
-				if (td.isForeignTousse() || td.isCustomTousse() || td.isDisinfection()) {  //外来器械包、自定义器械包、消毒物品这三个名字需要外加"下划线和申请单id"
+				if (td.isForeignTousse() || td.isCustomTousse() || td.isDisinfection()) {
 					tousseName += ("_" + td.getInvoicePlanID());
 				}
 				packingTaskMap.put(tousseName, packingTask);
@@ -4354,42 +4348,27 @@
 				String basketBarcodes = currentPackingTask.getBasketBarcode();
 				if (StringUtils.isNotBlank(basketBarcodes)) {
 					String sql = String
-							.format("select distinct b.id classifybasketId,b.personInCharge personInCharge,b.personInChargeCode personInChargeCode "
-									+ "from classifybasket b ,classifieditem i "
-									+ "where b.id = i.classifybasket_id and b.containerbarcode in ('%s') and i.recyclingrecordid = %s ",
+							.format("select distinct b.id from classifybasket b ,classifieditem i where "
+									+ "b.id = i.classifybasket_id and b.containerbarcode in ('%s') and i.recyclingrecordid = %s ",
 									basketBarcodes.replaceAll(";", "','"),
 									currentPackingTask.getSourceId());
 					ResultSet rs = objectDao.executeSql(sql);
-					Set<String> classifybasketIdSet = new HashSet<String>();  //用Set能实现去重的效果（cjr）
-					Set<String> personInChargeSet = new HashSet<String>();
-					Set<String> personInChargeCodeSet = new HashSet<String>();
+					List<String> li = new ArrayList<String>();
 					try {
 						while (rs.next()) {
-							String classifyBasketId = StringUtils.defaultString(rs.getString("classifybasketId"));
-							String personInCharge = StringUtils.defaultString(rs.getString("personInCharge"));
-							String personInChargeCode = StringUtils.defaultString(rs.getString("personInChargeCode"));
-							
-							classifybasketIdSet.add(classifyBasketId);
-							personInChargeSet.add(personInCharge);
-							personInChargeCodeSet.add(personInChargeCode);
+							String classifyBasketId = rs.getString(1);
+							li.add(classifyBasketId);
 						}
 					} catch (SQLException e) {
 						e.printStackTrace();
 					} finally {
 						DatabaseUtil.closeResultSetAndStatement(rs);
 					}
-					if (classifybasketIdSet.size() > 0) {  //清洗篮筐id
-						String[] classifybasketIdArray = classifybasketIdSet.toArray(new String[classifybasketIdSet.size()]);
-						tousseInstance.setClassifyBasketIds(StringUtils.join(classifybasketIdArray, ";"));
+					if (li.size() > 0) {
+						String[] idArray = li.toArray(new String[li.size()]);
+						tousseInstance.setClassifyBasketIds(StringUtils.join(
+								idArray, ";"));
 					}
-					if (personInChargeSet.size() > 0) {  //清洗责任人
-						String[] personInChargeSetArray = personInChargeSet.toArray(new String[personInChargeSet.size()]);
-						tousseInstance.setWashPersonInCharge(StringUtils.join(personInChargeSetArray, ";"));
-					}
-					if (personInChargeCodeSet.size() > 0) {  //清洗责任人编码
-						String[] personInChargeCodeSetArray = personInChargeCodeSet.toArray(new String[personInChargeCodeSet.size()]);
-						tousseInstance.setWashPersonInChargeCode(StringUtils.join(personInChargeCodeSetArray, ";"));
-					}
 				}
 			}
 		}
@@ -4871,8 +4850,6 @@
 		tousseInstance.setWashStartTime(originalTousseInstance.getWashStartTime());
 		tousseInstance.setWashEndTime(originalTousseInstance.getWashEndTime());
 		tousseInstance.setClassifyBasketIds(originalTousseInstance.getClassifyBasketIds());
-		tousseInstance.setWashPersonInCharge(originalTousseInstance.getWashPersonInCharge());  //清洗责任人（cjr）
-		tousseInstance.setWashPersonInChargeCode(originalTousseInstance.getWashPersonInChargeCode());
 		tousseInstance.setPackingRecord_id(originalTousseInstance.getPackingRecord_id());
 		tousseInstance.setForeignTousseApp_id(originalTousseInstance.getForeignTousseApp_id());
 		tousseInstance.setInvoicePlanID(originalTousseInstance.getInvoicePlanID());
Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
===================================================================
diff -u -r16246 -r16250
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js	(.../tousseInstanceView.js)	(revision 16246)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js	(.../tousseInstanceView.js)	(revision 16250)
@@ -88,8 +88,7 @@
 		{header : "状态",width : 80,dataIndex : 'status'},
 		{header : "位置",width : 80,dataIndex : 'locationForDisplay'},
 		{header : "所属仓库",width : 80,dataIndex : 'wareHouseName'},
-//		{header : "清洗人",width : 60,dataIndex : 'washOperator',sortable: false},
-		{header : "清洗人",width : 120,dataIndex : 'washPersonInCharge',sortable: false},
+		{header : "清洗人",width : 60,dataIndex : 'washOperator',sortable: false},
 		{header : "清洗时间",width : 125,dataIndex : 'washStartTime',sortable: false},
 		{header : "失效日期",width : 80,dataIndex : 'validUntil',renderer : checkDate},
 		{header : "预警日期",hidden : true,width : 80,dataIndex : 'warningUntil',renderer : myDateFormat},
@@ -124,8 +123,7 @@
 	    {name : 'stockBarcode'},
 	    {name : 'sterilingType'},
 	    {name : 'validUntil'},
-//	    {name : 'washOperator'},
-	    {name : 'washPersonInCharge'},
+	    {name : 'washOperator'},
 	    {name : 'washStartTime'},
 	    {name : 'packageType'},
 	    {name : 'reviewTime'},
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
===================================================================
diff -u -r16246 -r16250
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java	(.../TousseInstance.java)	(revision 16246)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java	(.../TousseInstance.java)	(revision 16250)
@@ -267,17 +267,7 @@
 	public static final String ROUTINE_NO = "否";
 	private String isRoutine;  //是否常规发货,默认是常规发货（这里的不常规指的是：正在做"生物监测"时就把这个器械包发货了）
 	
-	/**
-	 * 清洗责任人
-	 */
-	private String washPersonInCharge;
 	
-	/**
-	 * 清洗责任人编码
-	 */
-	private String washPersonInChargeCode;
-	
-	
 	public static final String[] filterProperties = { "handler",
 			"hibernateLazyInitializer", "fieldHandler", "materialInstances",
 			"sterilizationRecords", "isUploadImage", "isUploadVideo", "images",
@@ -1109,24 +1099,6 @@
 		this.isRoutine = isRoutine;
 	}
 	
-	public String getWashPersonInCharge() {
-		return washPersonInCharge;
-	}
-
-	public void setWashPersonInCharge(String washPersonInCharge) {
-		this.washPersonInCharge = washPersonInCharge;
-	}
-
-	public String getWashPersonInChargeCode() {
-		return washPersonInChargeCode;
-	}
-
-	public void setWashPersonInChargeCode(String washPersonInChargeCode) {
-		this.washPersonInChargeCode = washPersonInChargeCode;
-	}
-
-
-
 	public static final Comparator<TousseInstance> TousseInstanceBarcodeComparator = new Comparator<TousseInstance>() {
 		@Override
 		public int compare(TousseInstance o1, TousseInstance o2) {