Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js
===================================================================
diff -u -r36977 -r36980
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js	(.../tousseInstanceInfoTab.js)	(revision 36977)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js	(.../tousseInstanceInfoTab.js)	(revision 36980)
@@ -2687,24 +2687,51 @@
 						
 						//GDSRMYY-571:发货改进第三方
 						var invoiceInfo = result.invoice;
-						if(invoiceInfo){
-							top.Ext.getCmp('serialNum3').setValue(invoiceInfo.serialNumber);  //发货记录_流水号
-							top.Ext.getCmp('depart3').setValue(invoiceInfo.depart);  //发货记录_申请科室
-							top.Ext.getCmp('applicant').setValue(invoiceInfo.applicant);  //发货记录_申请人
-							if(invoiceInfo.applicationTime != null){
-								top.Ext.getCmp('applicationTime2').setValue(Ext.util.Format.date(new Date(invoiceInfo.applicationTime.time), 'Y-m-d H:i:s'));  //发货记录_申请时间
+						if(result.dataSource && result.dataSource !== ''){
+							var serialNumber = invoiceInfo?invoiceInfo.serialNumber:'';
+							var depart = invoiceInfo?invoiceInfo.depart:'';
+							var applicant = invoiceInfo?invoiceInfo.applicant:'';
+							var applicationTime = invoiceInfo?invoiceInfo.applicationTime:null;
+							var sendTime = invoiceInfo?invoiceInfo.sendTime:null;
+							var signedDate = invoiceInfo?invoiceInfo.signedDate:null;
+							var sender = invoiceInfo?invoiceInfo.sender:'';
+							var signedUser = invoiceInfo?invoiceInfo.signedUser:'';
+							top.Ext.getCmp('serialNum3').setValue(serialNumber);  //发货记录_流水号
+							top.Ext.getCmp('depart3').setValue(depart);  //发货记录_申请科室
+							top.Ext.getCmp('applicant').setValue(applicant);  //发货记录_申请人
+							if(applicationTime != null){
+								top.Ext.getCmp('applicationTime2').setValue(Ext.util.Format.date(new Date(applicationTime.time), 'Y-m-d H:i:s'));  //发货记录_申请时间
 							}
-							if(invoiceInfo.sendTime != null){
-								top.Ext.getCmp('sendTime').setValue(Ext.util.Format.date(new Date(invoiceInfo.sendTime.time), 'Y-m-d H:i:s'));  //发货记录_发货时间
+							if(sendTime != null){
+								top.Ext.getCmp('sendTime').setValue(Ext.util.Format.date(new Date(sendTime.time), 'Y-m-d H:i:s'));  //发货记录_发货时间
 							}
-							top.Ext.getCmp('sender').setValue(invoiceInfo.sender);  //发货记录_发货员
-							if(instance.signedDate != null){
-								top.Ext.getCmp('receiptingTime').setValue(Ext.util.Format.date(new Date(instance.signedDate.time), 'Y-m-d H:i:s'));  //发货记录_签收时间
+							top.Ext.getCmp('sender').setValue(sender);  //发货记录_发货员
+							if(signedDate != null){
+								top.Ext.getCmp('receiptingTime').setValue(Ext.util.Format.date(new Date(signedDate.time), 'Y-m-d H:i:s'));  //发货记录_签收时间
 							}
-							top.Ext.getCmp('receiptor').setValue(instance.signedUser);  //发货记录_签收人
-							if(result.dataSource && result.dataSource !== ''){
-								top.Ext.getCmp('deliveryDeptNameJLKBox').show();
-								top.Ext.getCmp('deliveryDeptNameJLK').setValue(result.deliveryDeptNameJLK);
+							top.Ext.getCmp('receiptor').setValue(signedUser);  //发货记录_签收人
+							top.Ext.getCmp('deliveryDeptNameJLKBox').show();
+							top.Ext.getCmp('deliveryDeptNameJLK').setValue(result.deliveryDeptNameJLK);
+						}else {
+							if(invoiceInfo){
+								top.Ext.getCmp('serialNum3').setValue(invoiceInfo.serialNumber);  //发货记录_流水号
+								top.Ext.getCmp('depart3').setValue(invoiceInfo.depart);  //发货记录_申请科室
+								top.Ext.getCmp('applicant').setValue(invoiceInfo.applicant);  //发货记录_申请人
+								if(invoiceInfo.applicationTime != null){
+									top.Ext.getCmp('applicationTime2').setValue(Ext.util.Format.date(new Date(invoiceInfo.applicationTime.time), 'Y-m-d H:i:s'));  //发货记录_申请时间
+								}
+								if(invoiceInfo.sendTime != null){
+									top.Ext.getCmp('sendTime').setValue(Ext.util.Format.date(new Date(invoiceInfo.sendTime.time), 'Y-m-d H:i:s'));  //发货记录_发货时间
+								}
+								top.Ext.getCmp('sender').setValue(invoiceInfo.sender);  //发货记录_发货员
+								if(instance.signedDate != null){
+									top.Ext.getCmp('receiptingTime').setValue(Ext.util.Format.date(new Date(instance.signedDate.time), 'Y-m-d H:i:s'));  //发货记录_签收时间
+								}
+								top.Ext.getCmp('receiptor').setValue(instance.signedUser);  //发货记录_签收人
+								if(result.dataSource && result.dataSource !== ''){
+									top.Ext.getCmp('deliveryDeptNameJLKBox').show();
+									top.Ext.getCmp('deliveryDeptNameJLK').setValue(result.deliveryDeptNameJLK);
+								}
 							}
 						}
 						// 二次发货
@@ -2812,7 +2839,7 @@
 					
 					//GDSRMYY-571:灭菌记录改进第三方
 					top.Ext.getCmp('sterilizationRecordID').setValue(result.sterilizationRecordID);  //灭菌记录_灭菌记录id（隐藏域）
-					if(result.sterilizationRecordID != 0){
+					if(result.dataSource && result.dataSource !== ''){
 						top.Ext.getCmp('sterilizerRecordAmounts').setValue(result.sterilizerRecordAmounts);  //灭菌记录_灭菌记录数量（隐藏域）
 						top.Ext.getCmp('sterilizationParaType').setValue(result.sterilizationParaType); 
 						top.Ext.getCmp('sterilizerName').setValue(instance.sterilizerName);  //灭菌记录_灭菌炉
@@ -2858,6 +2885,28 @@
 								}
 							});
 						}
+					}else {
+						if(result.sterilizationRecordID != 0){
+							top.Ext.getCmp('sterilizerRecordAmounts').setValue(result.sterilizerRecordAmounts);  //灭菌记录_灭菌记录数量（隐藏域）
+							top.Ext.getCmp('sterilizationParaType').setValue(result.sterilizationParaType); 
+							top.Ext.getCmp('sterilizerName').setValue(instance.sterilizerName);  //灭菌记录_灭菌炉
+							top.Ext.getCmp('sterilizationType').setValue(instance.sterilingType);  //灭菌记录_灭菌程序
+							top.Ext.getCmp('frequency').setValue(instance.sterileFrequency);  //灭菌记录_炉次
+							top.Ext.getCmp('sterilizationUser').setValue(instance.sterilizationUser);  //灭菌记录_灭菌员
+							top.Ext.getCmp('sterilizationFinishConfirm').setValue(result.sterilizationFinishConfirm);  //灭菌记录_灭菌确认人
+							top.Ext.getCmp('startDate').setValue(instance.sterileStartTime);  //灭菌记录_开始时间
+							top.Ext.getCmp('endDate').setValue(instance.sterileEndTime);  //灭菌记录_结束时间
+							top.Ext.getCmp('sterilizationBasket').setValue(instance.sterilizationBasket);  //灭菌记录_灭菌确认人灭菌篮筐
+							top.Ext.getCmp('sterilizationPosition').setValue(result.sterilizationPosition);  //灭菌记录_灭菌位置
+							top.Ext.getCmp('cycleCounter').setValue(result.cycleCounter);  //灭菌记录_循环次数
+							top.Ext.getCmp('biologyResult').setValue(result.biologyResult);  //灭菌记录_生物监测结果
+							top.Ext.getCmp('chemistryResult').setValue(result.chemistryResult);  //灭菌记录_化学监测结果
+							//外来器械申请单
+							var foreignTousseApplicationJSON = result.foreignTousseApplicationJSON;
+							if(foreignTousseApplicationJSON){
+								top.Ext.getCmp('foreignTousseApplicationReturnTime').setValue(foreignTousseApplicationJSON.returnTime);//灭菌记录_外来器械归还时间
+							}
+						}
 					}
 
 					//库位记录