Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
===================================================================
diff -u -r36238 -r36694
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js	(.../invoiceView.js)	(revision 36238)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js	(.../invoiceView.js)	(revision 36694)
@@ -471,7 +471,6 @@
 		isPatient = false;
 		isPatientHeight = 236;
 	}
-
 	invoiceStore.removeAll();
 	invoiceStore.on("beforeload", function (thiz, options) {
 		thiz.baseParams["id"] = id;
@@ -831,8 +830,23 @@
 					layout: 'form',
 					labelWidth: 70,
 					columnWidth: .5,
+					hidden: isPatient,
 					items: [{
 						xtype: 'textfield',
+						fieldLabel: '病人姓名',
+						maxLength: '41',
+						id: 'patientName',
+						name: 'patientName',
+						readOnly: true,
+						anchor: '99%',
+						cls: 'x-item-disabled'
+					}]
+				}, {
+					layout: 'form',
+					labelWidth: 70,
+					columnWidth: .5,
+					items: [{
+						xtype: 'textfield',
 						fieldLabel: '住院号',
 						maxLength: '41',
 						id: 'hospitalNumber',
@@ -841,9 +855,23 @@
 						anchor: '99%',
 						cls: 'x-item-disabled'
 					}]
-				},
-				{
+				}, {
 					layout: 'form',
+					labelWidth: 70,
+					columnWidth: .5,
+					hidden: isPatient,
+					items: [{
+						xtype: 'textfield',
+						fieldLabel: '诊疗号',
+						maxLength: '41',
+						id: 'clinicNumber',
+						name: 'clinicNumber',
+						readOnly: true,
+						anchor: '99%',
+						cls: 'x-item-disabled'
+					}]
+				},{
+					layout: 'form',
 					columnWidth: 1,
 					labelWidth: 70,
 					hidden: isPatient,
@@ -852,7 +880,6 @@
 						fieldLabel: '手术名称',
 						id: 'operationName',
 						name: 'operationName',
-						value: invoice.invoicePlan.operationName,
 						anchor: '99.5%',
 						height: 40,
 						cls: 'x-item-disabled',
@@ -867,28 +894,26 @@
 					hidden: isPatient,
 					items: [{
 						xtype: 'textfield',
-						fieldLabel: '病人姓名',
-						value: invoice.invoicePlan.patientName,
+						fieldLabel: '医生姓名',
 						maxLength: '41',
-						id: 'patientName',
-						name: 'patientName',
+						id: 'doctors',
+						name: 'doctors',
 						readOnly: true,
 						anchor: '99%',
 						cls: 'x-item-disabled'
 					}]
 				},
 				{
 					layout: 'form',
-					labelWidth: 70,
+					labelWidth: 90,
 					columnWidth: .5,
 					hidden: isPatient,
 					items: [{
 						xtype: 'textfield',
-						fieldLabel: '医生姓名',
-						value: invoice.invoicePlan.doctors,
+						fieldLabel: '病人所属科室',
 						maxLength: '41',
-						id: 'doctors',
-						name: 'doctors',
+						id: 'ascriptionDepartment',
+						name: 'ascriptionDepartment',
 						readOnly: true,
 						anchor: '99%',
 						cls: 'x-item-disabled'
@@ -905,7 +930,6 @@
 						maxLength: '41',
 						id: 'operatingRoom',
 						name: 'operatingRoom',
-						value: invoice.invoicePlan.operatingRoom,
 						readOnly: true,
 						anchor: '99%',
 						cls: 'x-item-disabled'
@@ -922,7 +946,6 @@
 						maxLength: '41',
 						id: 'consoleName',
 						name: 'consoleName',
-						value: invoice.invoicePlan.consoleName,
 						readOnly: true,
 						anchor: '99%',
 						cls: 'x-item-disabled'
@@ -1099,6 +1122,16 @@
 					top.Ext.getCmp('sender').setValue(cookieSender);
 				}
 			}
+			if(invoice.invoicePlan){
+				top.Ext.getCmp('patientName').setValue(invoice.invoicePlan.patientName);
+				top.Ext.getCmp('hospitalNumber').setValue(invoice.invoicePlan.hospitalNumber);
+				top.Ext.getCmp('clinicNumber').setValue(invoice.invoicePlan.clinicNumber);
+				top.Ext.getCmp('operationName').setValue(invoice.invoicePlan.operationName);
+				top.Ext.getCmp('doctors').setValue(invoice.invoicePlan.doctors);
+				top.Ext.getCmp('operatingRoom').setValue(invoice.invoicePlan.operatingRoom);
+				top.Ext.getCmp('consoleName').setValue(invoice.invoicePlan.consoleName);
+				top.Ext.getCmp('ascriptionDepartment').setValue(invoice.invoicePlan.ascriptionDepartment);
+			}
 		},
 		failure: function (form, action) {
 		}
Index: ssts-web/src/main/webapp/disinfectsystem/config/nfykdxnfyy/print/printConfig.js
===================================================================
diff -u -r33108 -r36694
--- ssts-web/src/main/webapp/disinfectsystem/config/nfykdxnfyy/print/printConfig.js	(.../printConfig.js)	(revision 33108)
+++ ssts-web/src/main/webapp/disinfectsystem/config/nfykdxnfyy/print/printConfig.js	(.../printConfig.js)	(revision 36694)
@@ -283,15 +283,15 @@
     	        	headRepeat : true,
     	        	columns : [
     	        	    {header : "序号", dataIndex : 'serialNumber', width : '5%', align : 'center', fontSize : 11},
-    	                {header : "名称", dataIndex : 'name', width : '28%', align : 'left', fontSize : 11},
-    	                {header : "规格", dataIndex : 'specification', width : '22%', align : 'center', fontSize : 11},
-//   	                {header : "包装规格", dataIndex : 'packageSpec', width : '15%', align : 'center', fontSize : 11},
+    	                {header : "名称", dataIndex : 'name', width : '13%', align : 'left', fontSize : 11},
+						{header : "病人姓名", dataIndex : 'patient', width : '9%', align : 'left', fontSize : 11},
+						{header : "住院号/诊疗号", dataIndex : 'clinicNumber', width : '13%', align : 'left', fontSize : 11},
+						{header : "病人所属科室", dataIndex : 'ascriptionDepartment', width : '12%', align : 'left', fontSize : 11},
+    	                {header : "规格", dataIndex : 'specification', width : '10%', align : 'center', fontSize : 11},
     	                {header : "单位", dataIndex : 'unit', width : '5%', align : 'center', fontSize : 11},
     	                {header : "数量", dataIndex : 'amount', width : '5%', align : 'right', fontSize : 11},
-//    	                {header : "批次/灭菌日期", dataIndex : 'batchNumber', width : 105, align : 'center', fontSize : 11},
-//    	                {header : "失效日期", dataIndex : 'expireDate', width : 85, align : 'center', fontSize : 11},
-    	                {header : "单价", dataIndex : 'price', width : '10%', align : 'right', fontSize : 11},
-    	                {header : "金额", dataIndex : 'totalPrice', width : '10%', align : 'right', fontSize : 11}
+    	                {header : "单价", dataIndex : 'price', width : '9%', align : 'right', fontSize : 11},
+    	                {header : "金额", dataIndex : 'totalPrice', width : '9%', align : 'right', fontSize : 11}
     	            ]
     	        }
 }
Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js
===================================================================
diff -u -r36627 -r36694
--- ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 36627)
+++ ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 36694)
@@ -845,8 +845,26 @@
 		// 打印物品内容行
 		var columnCount = myObj.goodsTable.columns.length;
 		var goodsArray = printSummaryObj.goods;
+		var patient = printSummaryObj.patient || '';
+		var hospitalNumber = printSummaryObj.hospitalNumber || '';
+		var clinicNumber = printSummaryObj.clinicNumber || '';
+		var ascriptionDepartment = printSummaryObj.ascriptionDepartment || '';
 		for (var k = 0; k < goodsArray.length; k++) {
 			var row = goodsArray[k];
+			if(patient !== ''){
+				row.patient = patient;
+			}
+			//NFYY-86：printConfig添加3个字段
+			if(hospitalNumber !== '' && clinicNumber !== ''){
+				row.clinicNumber = hospitalNumber+'/'+clinicNumber;
+			}else if(hospitalNumber !== '' && clinicNumber == ''){
+				row.clinicNumber = hospitalNumber;
+			}else if(hospitalNumber == '' && clinicNumber !== ''){
+				row.clinicNumber = clinicNumber;
+			}
+			if(ascriptionDepartment){
+				row.ascriptionDepartment = ascriptionDepartment;
+			}
 			tableHtml = appendTableRowString(tableHtml, myObj.goodsTable.rowHeight, myObj.goodsTable.fontSize);
 			for (var i = 0; i < columnCount; i++) {
 				var item = myObj.goodsTable.columns[i];