Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/TousseInstanceInfoManagerImpl.java
===================================================================
diff -u -r25572 -r25573
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/TousseInstanceInfoManagerImpl.java	(.../TousseInstanceInfoManagerImpl.java)	(revision 25572)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/TousseInstanceInfoManagerImpl.java	(.../TousseInstanceInfoManagerImpl.java)	(revision 25573)
@@ -102,10 +102,10 @@
 			if(null!=ti.getInvoicePlanID()){
 			    InvoicePlan ip = (InvoicePlan) objectDao.getByProperty(InvoicePlan.class.getSimpleName(), "id", ti.getInvoicePlanID());
                 if(null!=ip){
-                    invoicePlanJSON.put("invoice_applicationTime", ip.getApplicationTimeStr()==null?"":ip.getApplicationTimeStr()); //申请时间
-                    invoicePlanJSON.put("iinvoice_SerialNum", ti.getInvoicePlanSerialNum()==null?"":ti.getInvoicePlanSerialNum());//申请单号
-                    invoicePlanJSON.put("invoice__applicant", ip.getApplicant()==null?"":ip.getApplicant());//申请人
-                    invoicePlanJSON.put("invoice_Type", ip.getType()==null?"":ip.getType()); //申请单类型 
+                    invoicePlanJSON.put("applicationTime", ip.getApplicationTimeStr()==null?"":ip.getApplicationTimeStr()); //申请时间
+                    invoicePlanJSON.put("serialNum", ti.getInvoicePlanSerialNum()==null?"":ti.getInvoicePlanSerialNum());//申请单号
+                    invoicePlanJSON.put("applicant", ip.getApplicant()==null?"":ip.getApplicant());//申请人
+                    invoicePlanJSON.put("type", ip.getType()==null?"":ip.getType()); //申请单类型 
                 } 
 			}
 			
@@ -123,7 +123,8 @@
 				recyclingRecordJSON.put("reOperator", recyclingRecord.getOperator());//回收记录_清点人
 				recyclingRecordJSON.put("reUser", recyclingRecord.getRecyclingUser());//回收记录_回收人
 				recyclingRecordJSON.put("reType", recyclingRecord.getRecyclingApplicationType());//回收记录_回收类型
-				recyclingRecordJSON.put("reTime", ForgonDateUtils.safelyFormatDate(recyclingRecord.getRecyclingTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, ""));//回收记录_回收时间
+				//回收记录_回收时间
+				recyclingRecordJSON.put("reTime", ForgonDateUtils.safelyFormatDate(recyclingRecord.getRecyclingTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, ""));
 				recyclingRecordJSON.put("reDept", recyclingRecord.getDepart()); //回收记录_回收科室
 				//tousseInstanceInfoTab.js的显示的：回收记录追溯信息，有上一个包实例的信息
 				if(lastUseRecord != null){
@@ -133,20 +134,21 @@
 				}
 			}
 			
-            //3、二次回收记录（(非外来器械)）
-            JSONObject recyclingItemJSON = new JSONObject();
-            RecyclingRecord recyclingItem = invoiceManager.getlastTousseRecyclingRecordByBarcode(ti.getBarcode());
-            if(null!=recyclingItem){
-                recyclingItemJSON.put("recycling_operator", recyclingItem.getOperator());//清点人
-                recyclingItemJSON.put("recycling_recyclingUser", recyclingItem.getRecyclingUser());//回收人
-                recyclingItemJSON.put("recycling_type", recyclingItem.getRecyclingApplicationType());//回收类型
-                recyclingItemJSON.put("recycling_time", ForgonDateUtils.safelyFormatDate(recyclingItem.getRecyclingTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, ""));//回收时间
-                recyclingItemJSON.put("recycling_dept", recyclingItem.getDepart());//回收科室
+            //3、二次回收记录（非外来器械)
+            JSONObject recyclingRecord2JSON = new JSONObject();
+            RecyclingRecord recycling2 = invoiceManager.getlastTousseRecyclingRecordByBarcode(ti.getBarcode());
+            if(null!=recycling2){
+                recyclingRecord2JSON.put("reOperator", recycling2.getOperator());//清点人
+                recyclingRecord2JSON.put("reUser", recycling2.getRecyclingUser());//回收人
+                recyclingRecord2JSON.put("reType", recycling2.getRecyclingApplicationType());//回收类型
+                //回收时间
+                recyclingRecord2JSON.put("reTime", ForgonDateUtils.safelyFormatDate(recycling2.getRecyclingTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, ""));
+                recyclingRecord2JSON.put("reDept", recycling2.getDepart());//回收科室
                 //tousseInstanceInfoTab.js的显示的：回收记录追溯信息，有上一个包实例的信息
 				if(lastUseRecord != null){
-					recyclingRecordJSON.put("lastUseRecordOperator2", lastUseRecord.getOperator()); //回收记录_操作员
-					recyclingRecordJSON.put("lastUseRecordCircuitNurse2", lastUseRecord.getCircuitNurse()); //回收记录_巡回护士
-					recyclingRecordJSON.put("lastUseRecordOperationRoom2", lastUseRecord.getOperationRoom()); //回收记录_手术间
+					recyclingRecord2JSON.put("lastUseRecordOperator", lastUseRecord.getOperator()); //回收记录_操作员
+					recyclingRecord2JSON.put("lastUseRecordCircuitNurse", lastUseRecord.getCircuitNurse()); //回收记录_巡回护士
+					recyclingRecord2JSON.put("lastUseRecordOperationRoom", lastUseRecord.getOperationRoom()); //回收记录_手术间
 				}
             }
             
@@ -179,20 +181,20 @@
 			}
 			
 			//5、外来器械二次回收
-			JSONObject secondRecyclingRecordJSON = new JSONObject();
+			JSONObject ftRecyclingRecord2JSON = new JSONObject();
 			//6、外来器械二次清洗 
-			JSONArray secondWashAndDisinfectRecordInfoJSONArray = new JSONArray();
+			JSONArray ftWashAndDisinfectRecordInfo2JSONArray = new JSONArray();
 			//外来器械二次回收与二次清洗
 			if(ti.getTousseDefinition().isForeignOrSplitTousse()){
 				//外来器械二次回收
 				RecyclingRecord secondRecyclingRecord = ti.getForeignTousseSecondRecyclingRecord(objectDao);
 				if(secondRecyclingRecord != null){
-					secondRecyclingRecordJSON.put("reOperator", secondRecyclingRecord.getOperator());//外来器械二次回收_清点人
-					secondRecyclingRecordJSON.put("reUser", secondRecyclingRecord.getRecyclingUser()); //外来器械 二次回收_回收人 
-					secondRecyclingRecordJSON.put("reType", secondRecyclingRecord.getRecyclingApplicationType());//外来器械二次回收_回收类型
-					//外来器械二次回收_回收时间
-					secondRecyclingRecordJSON.put("reTime", ForgonDateUtils.safelyFormatDate(secondRecyclingRecord.getRecyclingTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, ""));
-					secondRecyclingRecordJSON.put("reDept", secondRecyclingRecord.getDepart()); //外来器械二次回收_科室
+					ftRecyclingRecord2JSON.put("reOperator", secondRecyclingRecord.getOperator());//外来器械_二次回收_清点人
+					ftRecyclingRecord2JSON.put("reUser", secondRecyclingRecord.getRecyclingUser()); //外来器械 二次回收_回收人 
+					ftRecyclingRecord2JSON.put("reType", secondRecyclingRecord.getRecyclingApplicationType());//外来器械_二次回收_回收类型
+					//外来器械_二次回收_回收时间
+					ftRecyclingRecord2JSON.put("reTime", ForgonDateUtils.safelyFormatDate(secondRecyclingRecord.getRecyclingTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, ""));
+					ftRecyclingRecord2JSON.put("reDept", secondRecyclingRecord.getDepart()); //外来器械_二次回收_科室
 					
 				}
 				List<ClassifyBasket> secondWashClassifyBasketList =
@@ -205,33 +207,34 @@
 								classifyBasket.getWashAndDisinfectRecords();
 						if(CollectionUtils.isNotEmpty(washAndDisinfectRecordList)){
 							for (WashAndDisinfectRecord washAndDisinfectRecord : washAndDisinfectRecordList) {
-								obj.put("washRecordID", washAndDisinfectRecord.getId());//外来器械二次清洗 _清洗记录id
+								obj.put("washRecordID", washAndDisinfectRecord.getId());//外来器械_二次清洗_清洗记录id
 								obj.put("washDataAmount", washAndDisinfectRecord.getWashDataAmount());
-								obj.put("disinfectIdentification", washAndDisinfectRecord.getDisinfectIdentification()); //外来器械二次清洗 _清洗机名称
-								obj.put("disinfectProgram", washAndDisinfectRecord.getDisinfectProgram()); //外来器械二次清洗 _清洗程序
-								obj.put("washOperator", washAndDisinfectRecord.getOperator());//外来器械二次清洗 _操作员
-								obj.put("startDate", washAndDisinfectRecord.getStartDateStr());//外来器械二次清洗 _开始时间
-								obj.put("endDate", washAndDisinfectRecord.getEndDateStr());//外来器械二次清洗 _结束时间
-								obj.put("washBasket", classifyBasket.getContainerName()); //外来器械二次清洗 _清洗篮筐
-								obj.put("position", classifyBasket.getPosition()); //外来器械二次清洗 _位置
-								obj.put("personInCharge", classifyBasket.getPersonInCharge()); //外来器械二次清洗_责任人
-								secondWashAndDisinfectRecordInfoJSONArray.add(obj);
+								obj.put("disinfectIdentification", washAndDisinfectRecord.getDisinfectIdentification()); //外来器械_二次清洗_清洗机名称
+								obj.put("disinfectProgram", washAndDisinfectRecord.getDisinfectProgram()); //外来器械_二次清洗_清洗程序
+								obj.put("washOperator", washAndDisinfectRecord.getOperator());//外来器械_二次清洗_操作员
+								obj.put("startDate", washAndDisinfectRecord.getStartDateStr());//外来器械_二次清洗_开始时间
+								obj.put("endDate", washAndDisinfectRecord.getEndDateStr());//外来器械_二次清洗_结束时间
+								obj.put("washBasket", classifyBasket.getContainerName()); //外来器械_二次清洗_清洗篮筐
+								obj.put("position", classifyBasket.getPosition()); //外来器械_二次清洗_位置
+								obj.put("personInCharge", classifyBasket.getPersonInCharge()); //外来器械_二次清洗_责任人
+								ftWashAndDisinfectRecordInfo2JSONArray.add(obj);
 							}
 						}
 					}
 				}
 			}
 			
-			//7、 装配记录
+			//7、装配记录
 			JSONObject packingRecordJSON = new JSONObject();
 			Long packingRecord_id = ti.getPackingRecord_id();
 			if (DatabaseUtil.isPoIdValid(packingRecord_id)) {
 				PackingRecord packingRecord = (PackingRecord)objectDao.getByProperty(PackingRecord.class.getSimpleName(), "id", packingRecord_id);
 				if (packingRecord != null) {
-					packingRecordJSON.put("wrapper", packingRecord.getWrapper());
+					packingRecordJSON.put("wrapper", packingRecord.getWrapper());//装配记录_包装人
 					//tousseInstanceInfoTab.js的显示的装配追溯信息是器械实例的信息
 					packingRecordJSON.put("operator", ti.getOperator());//装配记录_配包人
-					packingRecordJSON.put("packTime",  ForgonDateUtils.safelyFormatDate(ti.getOperationTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, ""));//装配记录_装配时间
+					//装配记录_装配时间
+					packingRecordJSON.put("packTime",  ForgonDateUtils.safelyFormatDate(ti.getOperationTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, ""));
 					packingRecordJSON.put("tempPackageType", ti.getPackageType()); //装配记录_包装类型
 					packingRecordJSON.put("sterilingType", ti.getSterilingType());//装配记录_灭菌程序
 				}
@@ -260,11 +263,11 @@
 			if(CollectionUtils.isNotEmpty(list)){
 				for (TousseOperation tousseOperation : list) {
 					JSONObject obj = new JSONObject();
-					obj.put("operator", tousseOperation.getOperator());
-					obj.put("operationTime", tousseOperation.getOperationTimeStr());
-					obj.put("destLocation", tousseOperation.getDestLocation());
-					obj.put("destDepart", tousseOperation.getDestDepart());
-					obj.put("operation", tousseOperation.getOperation());
+					obj.put("operator", tousseOperation.getOperator());//操作人
+					obj.put("operationTime", tousseOperation.getOperationTimeStr());//操作时间
+					obj.put("destLocation", tousseOperation.getDestLocation());//操作位置
+					obj.put("destDepart", tousseOperation.getDestDepart());//操作科室
+					obj.put("operation", tousseOperation.getOperation());//操作类型
 					tousseOperationJsonArray.add(obj);
 				}
 			}
@@ -417,10 +420,10 @@
 			Map<String, Object> map = new HashMap<String, Object>();
 			map.put("invoicePlan", invoicePlanJSON);//申请记录
 			map.put("recyclingRecord", recyclingRecordJSON);//回收记录
-			map.put("recyclingItem", recyclingItemJSON);//二次回收(非外来器械)
+			map.put("secondRecyclingRecord", recyclingRecord2JSON);//二次回收(非外来器械)
 			map.put("washAndDisinfectRecordInfos", washAndDisinfectRecordInfoJsonArray);//清洗记录
-			map.put("secondRecyclingRecord", secondRecyclingRecordJSON);//外来器械二次回收
-			map.put("secondWashAndDisinfectRecordInfos", secondWashAndDisinfectRecordInfoJSONArray);//外来器械二次清洗 
+			map.put("foreignTousseSecondRecyclingRecord", ftRecyclingRecord2JSON);//外来器械二次回收
+			map.put("foreignTousseSecondWashAndDisinfectRecordInfos", ftWashAndDisinfectRecordInfo2JSONArray);//外来器械二次清洗 
 			map.put("packingRecord", packingRecordJSON);//装配记录
 			map.put("washTransitionRecord", washTransitionRecordJSON);//清洗交接记录
 			map.put("tousseOperations", tousseOperationJsonArray);//流转记录