Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js
===================================================================
diff -u -r22809 -r23081
--- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js	(.../dataSource.js)	(revision 22809)
+++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js	(.../dataSource.js)	(revision 23081)
@@ -196,6 +196,14 @@
 		displayName: '失效日期',
 		textForPreview: '2016-09-17'
 	}),new ObjectDataSourceProperty({
+		propName: 'sterileDateTime2',
+		displayName: '灭菌日期2',
+		textForPreview: '2016-09-10 12:00'
+	}),new ObjectDataSourceProperty({
+		propName: 'expirationDateTime2',
+		displayName: '失效日期2',
+		textForPreview: '2016-09-17 23:50'
+	}),new ObjectDataSourceProperty({
 		propName: 'sterilizationUser',
 		displayName: '灭菌员',
 		textForPreview: '张三'
Index: ssts-web/src/main/webapp/js/common.js
===================================================================
diff -u -r22891 -r23081
--- ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 22891)
+++ ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 23081)
@@ -30,6 +30,26 @@
 	});
 	
 }
+function setStartDate2(extObject, datefieldId) {
+	
+	extObject.Ajax.request({
+		url : WWWROOT + '/system/serverTimeAction!getServerDateTime2.do',
+//		params : {dateformat : format},
+		success : function(response, options) {
+			var result = extObject.decode(response.responseText);
+			if(result.success){
+				var timeInMillis = result.timeInMillis;
+				var date = new Date(0);
+				date.setUTCMilliseconds(timeInMillis);
+				extObject.getCmp(datefieldId).setValue(date);
+			}
+		},
+        failure : function(response, options) {
+            alert('获取服务器时间失败');
+        }
+	});
+	
+}
 
 /**
  * 设置时间控件的值，如果datefieldValue没值，则取服务器的当前时间（注意如果是取服务器的当前时间，则该请求为同步请求，此时调用此方法的页面需要有dwr环境，和ServerTimeTableManager类）
Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js
===================================================================
diff -u -r22844 -r23081
--- ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 22844)
+++ ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 23081)
@@ -1751,21 +1751,21 @@
 	    	        	rowHeight : 20,
 	    	        	//position : ["50","1%","96%","6.0cm"],
 	    	        	fontSize:12,
-	    	        	position : ["1.9cm","0.2cm","1550px","18.5cm"],
+	    	        	position : ["1.9cm","0.2cm","1100px","18.5cm"],
 	    	        	headRepeat : true,
 	    	        	donotPrintTotal:true,//不打印合计
 	    	        	columns : [
-	    	        	            {header : "科室", dataIndex : 'depart', width : 200, align : 'center'},
-	    	        	            {header : "供应商", dataIndex : 'supplierName', width : 200, align : 'center'},
+	    	        	            {header : "科室", dataIndex : 'depart', width : '160px', align : 'center'},
+	    	        	            {header : "供应商", dataIndex : 'supplierName', width : '160px', align : 'center'},
 	    	        	            //{header : "出库仓库", dataIndex : 'warehouseName', width : 60, align : 'center'},
-	    	        	            {header : "器械包", dataIndex : 'tousseName', width : 200, align : 'center'},
-	    	        	            {header : "拆包名称", dataIndex : 'splitTousseName', width : 200, align : 'center'},
-	    	        	            {header : "数量", dataIndex : 'amount', width : 60, align : 'center'},
-	    	        	            {header : "配包人", dataIndex : 'packer', width : 60, align : 'center'},
-	    	        	            {header : "审核人", dataIndex : 'reviewer', width : 60, align : 'center'},
-	    	        	            {header : "装配时间", dataIndex : 'packTimeStr', width : 100, align : 'center'},
-	    	        	            {header : "材料汇总", dataIndex : 'foreignMaterialsAmount', width : 200, align : 'center'},
-	    	        	            {header : "医生", dataIndex : 'doctor', width : 100, align : 'center'}
+	    	        	            {header : "器械包", dataIndex : 'tousseName', width : '160px', align : 'center'},
+	    	        	            {header : "拆包名称", dataIndex : 'splitTousseName', width : '160px', align : 'center'},
+	    	        	            {header : "数量", dataIndex : 'amount', width : '50px', align : 'center'},
+	    	        	            {header : "配包人", dataIndex : 'packer', width : '50px', align : 'center'},
+	    	        	            {header : "审核人", dataIndex : 'reviewer', width : '50px', align : 'center'},
+	    	        	            {header : "装配时间", dataIndex : 'packTimeStr', width : '80px', align : 'center'},
+	    	        	            {header : "材料汇总", dataIndex : 'foreignMaterialsAmount', width : '160px', align : 'center'},
+	    	        	            {header : "医生", dataIndex : 'doctor', width : '70px', align : 'center'}
 	    	        	        ]
 	    	        }
 }
Index: ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js
===================================================================
diff -u -r22814 -r23081
--- ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js	(.../directPacking.js)	(revision 22814)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js	(.../directPacking.js)	(revision 23081)
@@ -1333,11 +1333,12 @@
 //				value : new Date,
 				readOnly : true,
 				allowBlank : sstsConfig.hideSterileDate,
-				format : 'Y-m-d',
+				format : 'Y-m-d H:i',
 				anchor : '100%',
 				listeners : {
 					render : function() {
-						setStartDate(Ext, 'yyyy/MM/dd', 'disinfectionDate');  //（设置灭菌日期，取服务器时间 cjr）
+//						setStartDate(Ext, 'yyyy/MM/dd', 'disinfectionDate');  //（设置灭菌日期，取服务器时间 cjr）
+						setStartDate2(Ext, 'disinfectionDate');
 					}
 				}
 			}]
@@ -1470,7 +1471,8 @@
 				//保留当前值,不处理
 			}else if(sstsConfig.disinfectionDateProcessTypeInDirectPackingView==2){
 				//设置回页面进入时的值，就是当天
-				setStartDate(Ext, 'yyyy/MM/dd', 'disinfectionDate');  //（设置灭菌日期，取服务器时间 cjr）
+//				setStartDate(Ext, 'yyyy/MM/dd', 'disinfectionDate');  //（设置灭菌日期，取服务器时间 cjr）
+				setStartDate2(Ext, 'disinfectionDate');
 			}else{
 				//非法值,不处理吧
 			}
Index: ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js
===================================================================
diff -u -r22662 -r23081
--- ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js	(.../rePrintBarcodeWin.js)	(revision 22662)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js	(.../rePrintBarcodeWin.js)	(revision 23081)
@@ -142,7 +142,9 @@
 				{name : 'includedTousseAmount'},
 				{name : 'reduceDescription'},
 				{name : 'damageDescription'},
-				{name : 'haveUnSupplementMaterials'}
+				{name : 'haveUnSupplementMaterials'},
+				{name : 'sterileDateTime2'},
+				{name : 'expirationDateTime2'}
 			]
 		}),
 		listeners:{