Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/showFullImg.jsp
===================================================================
diff -u -r36909 -r36977
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/showFullImg.jsp	(.../showFullImg.jsp)	(revision 36909)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/showFullImg.jsp	(.../showFullImg.jsp)	(revision 36977)
@@ -75,6 +75,10 @@
 			if(imageType == '灭菌器参数'){
 				img = this.default_params.WWWROOT+'/disinfectSystem/baseData/showImageAction!getSterilizerRecordPic.do?sterilizationRecordId=' + objId
 			}
+
+			if(imageType == '聚力康清洗数据图片' || imageType == '聚力康灭菌数据图片'){
+				img = this.default_params.WWWROOT+'/disinfectSystem/baseData/showImageAction!getJLKTousseInstanceBatchNumPic.do?tousseInstanceId=' + objId + '&page=' + page + '&imageType=' + encodeURIComponent(imageType)
+			}
 			return img;
 		},
 		setImgInitWH:function(){
Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js
===================================================================
diff -u -r36454 -r36977
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js	(.../tousseInstanceInfoTab.js)	(revision 36454)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js	(.../tousseInstanceInfoTab.js)	(revision 36977)
@@ -701,6 +701,7 @@
 				items:[
 					new top.Ext.grid.GridPanel({
 						id : 'washRecord',
+						hidden:true,
 						store : new Ext.data.Store({
 							reader : new Ext.data.JsonReader({
 								fields : [
@@ -746,6 +747,84 @@
 						viewConfig: {
 					        forceFit:true
 						}
+					}),//GDSRMYY-571:清洗记录改进第三方
+					new top.Ext.FormPanel({
+						id : 'washRecord2',
+						hidden:true,
+						frame : true,
+						labelSeparator : '：',
+						bodyStyle : 'padding:5px 5px 0px 50px',
+						labelAlign : 'right',
+						height:278,
+						items : [{
+							layout : 'column',
+							items : [{
+								xtype:'hidden',//生物监测结果
+								id:'biologyResultJLK',
+								name:'biologyResultJLK'
+							},{
+								xtype:'hidden',//化学监测结果
+								id:'chemistryResultJLK',
+								name:'chemistryResultJLK'
+							},{
+								layout : 'form',
+								columnWidth : .5,
+								cls:'edit-part2-labelwidth',
+								items : [{
+									id : 'disinfectIdentificationJLK',
+									name : 'disinfectIdentificationJLK',
+									xtype : 'textfield',
+									fieldLabel : '清洗机名称',
+									anchor : '100%',
+									readOnly : true,
+									cls : 'fieldReadOnlyNoRemove'
+								}]
+							}, {
+								layout : 'form',
+								columnWidth : .5,
+								cls:'edit-part2-labelwidth',
+								items : [{
+									id : 'washOperatorJLK',
+									name : 'washOperatorJLK',
+									xtype : 'textfield',
+									fieldLabel : '清洗操作人',
+									anchor : '100%',
+									readOnly : true,
+									cls : 'fieldReadOnlyNoRemove'
+								}]
+							},{
+								layout : 'form',
+								columnWidth : .5,
+								cls:'edit-part2-labelwidth',
+								items : [{
+									id : 'washBatchJLK',
+									name : 'washBatchJLK',
+									xtype : 'textfield',
+									fieldLabel : '清洗批次',
+									anchor : '100%',
+									readOnly : true,
+									cls : 'fieldReadOnlyNoRemove'
+								}]
+							}, {
+								layout : 'form',
+								columnWidth : .5,
+								id : 'showWashBatchInfoButton',
+								hidden:true,
+								items : [{
+									xtype:'hidden',
+									id:'washBatchImgCount',
+									name:'washBatchImgCount'
+								},{
+									xtype : 'button',
+									text : '查看批次信息',
+									handler : function (){
+										var washBatchImgCount = top.Ext.getCmp('washBatchImgCount').getValue();
+										openFullSizeWindowWithName(WWWROOT + '/disinfectsystem/touchScreen/recycle/showFullImg.jsp?page=1&count='+washBatchImgCount+'&objId='+id+'&tousseName=&imageType='+encodeURIComponent('聚力康清洗数据图片'),true,'全屏显示图片');
+									}
+								}]
+							}]
+						}],
+						buttons : [this.cancelButton]
 					})
 				]
 			},{
@@ -1337,7 +1416,39 @@
 						}]
 					},{
 						layout : 'form',
+						columnWidth : .3,
+						cls:'edit-part2-labelwidth',
+						hidden:true,
+						id:'sterilizationBatchJLKBox',
+						items : [{	
+							id : 'sterilizationBatchJLK',
+							name : 'sterilizationBatchJLK',
+							xtype : 'textfield',
+							fieldLabel : '灭菌批次',
+							anchor : '100%',
+							readOnly : true,
+							cls : 'fieldReadOnlyNoRemove'
+						}]
+					}, {
+						layout : 'form',
 						columnWidth : .5,
+						id : 'showSterilizationBatchInfoButton',
+						hidden:true,
+						items : [{
+							xtype:'hidden',
+							id:'sterilizationBatchImgCount',
+							name:'sterilizationBatchImgCount'
+						},{
+							xtype : 'button',
+							text : '查看批次信息',
+							handler : function (){
+								var sterilizationBatchImgCount = top.Ext.getCmp('sterilizationBatchImgCount').getValue();
+								openFullSizeWindowWithName(WWWROOT + '/disinfectsystem/touchScreen/recycle/showFullImg.jsp?page=1&count='+sterilizationBatchImgCount+'&objId='+id+'&tousseName=&imageType='+encodeURIComponent('聚力康灭菌数据图片'),true,'全屏显示图片');
+							}
+						}]
+					},{
+						layout : 'form',
+						columnWidth : .5,
 						cls:'edit-part2-labelwidth',
 						items : [{	
 							id : 'biologyResult',
@@ -1365,6 +1476,38 @@
 						layout : 'form',
 						columnWidth : .5,
 						cls:'edit-part2-labelwidth',
+						id:'bioMonitorBeginDatetimeJLKBox',
+						labelWidth:130,
+						hidden:true,
+						items : [{	
+							id : 'bioMonitorBeginDatetimeJLK',
+							name : 'bioMonitorBeginDatetimeJLK',
+							xtype : 'textfield',
+							fieldLabel : '生物监测开始时间',
+							anchor : '100%',
+							readOnly : true,
+							cls : 'fieldReadOnlyNoRemove'
+						}]
+					},{
+						layout : 'form',
+						columnWidth : .5,
+						cls:'edit-part2-labelwidth',
+						id:'bioMonitorEndDatetimeJLKBox',
+						labelWidth:130,
+						hidden:true,
+						items : [{	
+							id : 'bioMonitorEndDatetimeJLK',
+							name : 'bioMonitorEndDatetimeJLK',
+							xtype : 'textfield',
+							fieldLabel : '生物监测结束时间',
+							anchor : '100%',
+							readOnly : true,
+							cls : 'fieldReadOnlyNoRemove'
+						}]
+					},{
+						layout : 'form',
+						columnWidth : .5,
+						cls:'edit-part2-labelwidth',
 						bodyStyle : 'padding:0px 0px 0px 50px',
 						items : [{
 							xtype : 'button',
@@ -1640,6 +1783,21 @@
 									readOnly : true,
 									cls : 'fieldReadOnlyNoRemove'
 								}]
+							},{
+								layout : 'form',
+								columnWidth : .5,
+								cls:'edit-part2-labelwidth',
+								id:'deliveryDeptNameJLKBox',
+								hidden:true,
+								items : [{
+									id : 'deliveryDeptNameJLK',
+									name : 'deliveryDeptNameJLK',
+									xtype : 'textfield',
+									fieldLabel : '发货科室名称',
+									anchor : '100%',
+									readOnly : true,
+									cls : 'fieldReadOnlyNoRemove'
+								}]
 							}]
 						}],
 						buttons : [this.cancelButton]
@@ -2437,24 +2595,52 @@
 	                        top.Ext.getCmp('lastUseRecordOperationRoom2').setValue(lastUserecord?lastUserecord.operationRoom:'');  //上一个包实例使用记录手术间  
 						}
 						
-						//清洗记录
+						//GDSRMYY-571:清洗记录改进第三方
 						var washRecordInfoArray = result.washAndDisinfectRecordInfoJSONs;
-						for(var j = 0;j < washRecordInfoArray.length ; j++){
-							var washRecordInfo = washRecordInfoArray[j];
-							var washRecordData = new Ext.data.Record({
-								washRecordID : washRecordInfo.washRecordID,  //清洗记录_清洗记录id
-								disinfectIdentification : washRecordInfo.disinfectIdentification,  //清洗记录_清洗机名称
-								disinfectProgram : washRecordInfo.disinfectProgram,  //清洗记录_清洗程序
-								washBasket : washRecordInfo.washBasket,  //清洗记录_清洗篮筐
-								washOperator : washRecordInfo.washOperator,  //清洗记录_操作员
-								personInCharge : washRecordInfo.personInCharge,  //清洗记录_责任人
-								position : washRecordInfo.position,  //清洗记录_位置
-								startDate : washRecordInfo.startDate,  //清洗记录_开始时间
-								endDate : washRecordInfo.endDate,  //清洗记录_结束时间
-								washDataAmount : washRecordInfo.washDataAmount  ,//清洗记录_清洗参数
-								hasWashAndDisinfectPictures : washRecordInfo.hasWashAndDisinfectPictures //按钮，打开清洗记录拍照的图片
+						if(result.dataSource && result.dataSource !== ''){
+							top.Ext.getCmp('washRecord2').show();
+							top.Ext.getCmp('washRecord').hide();
+							top.Ext.getCmp('disinfectIdentificationJLK').setValue(result.disinfectIdentificationJLK);
+							top.Ext.getCmp('washOperatorJLK').setValue(result.washOperatorJLK);
+							top.Ext.getCmp('washBatchJLK').setValue(result.washBatchJLK);
+							top.Ext.getCmp('biologyResultJLK').setValue(result.biologyResultJLK);
+							top.Ext.getCmp('chemistryResultJLK').setValue(result.chemistryResultJLK);
+							Ext.Ajax.request({
+								url : WWWROOT + '/disinfectSystem/baseData/showImageAction!getJLKTousseInstanceBatchNumPicTotalPage.do',
+								params : {tousseInstanceId : result.tousseInstance.id,imageType:'聚力康清洗数据图片'},
+								success : function(response, options) {
+									var res = Ext.decode(response.responseText);
+									var success = res.success;
+									if (success) {
+										if(res.pageNum == 0){
+											top.Ext.getCmp('showWashBatchInfoButton').hide();
+										}else {
+											top.Ext.getCmp('showWashBatchInfoButton').show();
+											top.Ext.getCmp('washBatchImgCount').setValue(res.pageNum);
+										}
+									}
+								}
 							});
-							top.Ext.getCmp('washRecord').getStore().add(washRecordData);
+						}else {
+							top.Ext.getCmp('washRecord').show();
+							top.Ext.getCmp('washRecord2').hide();
+							for(var j = 0;j < washRecordInfoArray.length ; j++){
+								var washRecordInfo = washRecordInfoArray[j];
+								var washRecordData = new Ext.data.Record({
+									washRecordID : washRecordInfo.washRecordID,  //清洗记录_清洗记录id
+									disinfectIdentification : washRecordInfo.disinfectIdentification,  //清洗记录_清洗机名称
+									disinfectProgram : washRecordInfo.disinfectProgram,  //清洗记录_清洗程序
+									washBasket : washRecordInfo.washBasket,  //清洗记录_清洗篮筐
+									washOperator : washRecordInfo.washOperator,  //清洗记录_操作员
+									personInCharge : washRecordInfo.personInCharge,  //清洗记录_责任人
+									position : washRecordInfo.position,  //清洗记录_位置
+									startDate : washRecordInfo.startDate,  //清洗记录_开始时间
+									endDate : washRecordInfo.endDate,  //清洗记录_结束时间
+									washDataAmount : washRecordInfo.washDataAmount  ,//清洗记录_清洗参数
+									hasWashAndDisinfectPictures : washRecordInfo.hasWashAndDisinfectPictures //按钮，打开清洗记录拍照的图片
+								});
+								top.Ext.getCmp('washRecord').getStore().add(washRecordData);
+							}
 						}
 
 						//清洗交接记录
@@ -2499,7 +2685,7 @@
 						}
 						
 						
-						//发货记录
+						//GDSRMYY-571:发货改进第三方
 						var invoiceInfo = result.invoice;
 						if(invoiceInfo){
 							top.Ext.getCmp('serialNum3').setValue(invoiceInfo.serialNumber);  //发货记录_流水号
@@ -2516,6 +2702,10 @@
 								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);
+							}
 						}
 						// 二次发货
 						var invoiceInfo2 = result.invoice2;
@@ -2620,7 +2810,7 @@
 					}
 					
 					
-					//灭菌记录
+					//GDSRMYY-571:灭菌记录改进第三方
 					top.Ext.getCmp('sterilizationRecordID').setValue(result.sterilizationRecordID);  //灭菌记录_灭菌记录id（隐藏域）
 					if(result.sterilizationRecordID != 0){
 						top.Ext.getCmp('sterilizerRecordAmounts').setValue(result.sterilizerRecordAmounts);  //灭菌记录_灭菌记录数量（隐藏域）
@@ -2642,6 +2832,32 @@
 						if(foreignTousseApplicationJSON){
 							top.Ext.getCmp('foreignTousseApplicationReturnTime').setValue(foreignTousseApplicationJSON.returnTime);//灭菌记录_外来器械归还时间
 						}
+						if(result.dataSource && result.dataSource !== ''){
+							top.Ext.getCmp('sterilizationBatchJLKBox').show();
+							top.Ext.getCmp('sterilizationBatchJLK').setValue(result.sterilizationBatchJLK);
+							top.Ext.getCmp('biologyResult').setValue(result.biologyResultJLK);
+							top.Ext.getCmp('chemistryResult').setValue(result.chemistryResultJLK);
+							top.Ext.getCmp('bioMonitorBeginDatetimeJLKBox').show();
+							top.Ext.getCmp('bioMonitorBeginDatetimeJLK').setValue(result.bioMonitorBeginDatetimeJLK);
+							top.Ext.getCmp('bioMonitorEndDatetimeJLKBox').show();
+							top.Ext.getCmp('bioMonitorEndDatetimeJLK').setValue(result.bioMonitorEndDatetimeJLK);
+							Ext.Ajax.request({
+								url : WWWROOT + '/disinfectSystem/baseData/showImageAction!getJLKTousseInstanceBatchNumPicTotalPage.do',
+								params : {tousseInstanceId : result.tousseInstance.id,imageType:'聚力康灭菌数据图片'},
+								success : function(response, options) {
+									var res = Ext.decode(response.responseText);
+									var success = res.success;
+									if (success) {
+										if(res.pageNum == 0){
+											top.Ext.getCmp('showSterilizationBatchInfoButton').hide();
+										}else {
+											top.Ext.getCmp('showSterilizationBatchInfoButton').show();
+											top.Ext.getCmp('sterilizationBatchImgCount').setValue(res.pageNum);
+										}
+									}
+								}
+							});
+						}
 					}
 
 					//库位记录