Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
===================================================================
diff -u -r34722 -r34832
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 34722)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 34832)
@@ -174,6 +174,8 @@
 		{ name: 'validUntil' },
 		{ name: 'showTousseName' },
 		{ name: 'tousseType' },
+		{ name: 'settleAccountDeptCodeUseRecord' },
+		{ name: 'settleAccountDeptNameUseRecord' },
 		{ name: 'foreignTousseApp_id' },
 		{ name: 'urgentLevel' },
 		{ name: 'urgentLevelForUseRecord' },
@@ -271,9 +273,10 @@
 	{ name: 'barcode' },
 	{ name: 'tousseDefinitionName' },
 	{ name: 'showTousseName' },
+	{ name: 'settleAccountDeptCodeUseRecord' },
+	{ name: 'settleAccountDeptNameUseRecord' },
 	{ name: 'packageType' },
 	{ name: 'validUntil' },
-	{ name: 'showTousseName' },
 	{ name: 'idCardUseAmount' },
 	{ name: 'amount' },
 	{ name: 'batchNo' },
@@ -359,6 +362,12 @@
 						showResult('条码为' + goodsInfo.barcode + '的物品已在当前扫描物品里！');
 						return;
 					}
+					var settleAccountDeptCodeUseRecord = '';
+					var settleAccountDeptNameUseRecord = '';
+					if(top.Ext.getCmp('departNameOfpatient')){
+						settleAccountDeptNameUseRecord = top.Ext.getCmp('departNameOfpatient').getRawValue() || '';
+						settleAccountDeptCodeUseRecord = top.Ext.getCmp('departCodeOfpatient').getValue() || '';
+					}
 					//高值耗材(非一次性物品的高值耗材)
 					var record = new addTousseInstance({
 						id: goodsInfo.id,
@@ -368,6 +377,8 @@
 						batchNo: goodsInfo.batchNo,
 						showTousseName: goodsInfo.showTousseName,
 						packageType: '',
+						settleAccountDeptCodeUseRecord : settleAccountDeptCodeUseRecord,
+						settleAccountDeptNameUseRecord: settleAccountDeptNameUseRecord,
 						validUntil: goodsInfo.validUntil,
 						tousseType: goodsInfo.tousseType,
 						goodsType: goodsInfo.goodsType,
@@ -672,6 +683,13 @@
 						validPatientInfo(arr);
 					}
 
+					var settleAccountDeptCodeUseRecord = '';
+					var settleAccountDeptNameUseRecord = '';
+					if(top.Ext.getCmp('departNameOfpatient')){
+						settleAccountDeptNameUseRecord = top.Ext.getCmp('departNameOfpatient').getRawValue() || '';
+						settleAccountDeptCodeUseRecord = top.Ext.getCmp('departCodeOfpatient').getValue() || '';
+					}
+
 					if (goodsInfo.tousseType != '一次性物品' && goodsInfo.tousseType != '高值耗材') {
 						var validTime = goodsInfo.validUntil;
 						var currentTime = Ext.util.Format.date(new Date(),
@@ -707,6 +725,8 @@
 										urgentLevel: goodsInfo.urgentLevel,
 										hospitalNumber: goodsInfo.hospitalNumber,
 										clinicNumber: goodsInfo.clinicNumber,
+										settleAccountDeptCodeUseRecord : settleAccountDeptCodeUseRecord,
+										settleAccountDeptNameUseRecord: settleAccountDeptNameUseRecord,
 										patient: goodsInfo.patient
 									});
 									useItemsStore.insert(0, record);
@@ -731,6 +751,8 @@
 												amount: subTousse.amount,
 												tousseDefinitionName: subTousse.showTousseName,
 												showTousseName: subTousse.showTousseName,
+												settleAccountDeptCodeUseRecord : settleAccountDeptCodeUseRecord,
+												settleAccountDeptNameUseRecord: settleAccountDeptNameUseRecord,
 												comboTousseInstanceId: subTousse.comboTousseInstanceId,
 												urgentLevel: subTousse.urgentLevel
 											});
@@ -758,6 +780,8 @@
 							showTousseName: goodsInfo.showTousseName,
 							idCardUseAmount: goodsInfo.idCardUseAmount,
 							packageType: '',
+							settleAccountDeptCodeUseRecord : settleAccountDeptCodeUseRecord,
+							settleAccountDeptNameUseRecord: settleAccountDeptNameUseRecord,
 							validUntil: goodsInfo.validUntil,
 							tousseType: goodsInfo.tousseType,
 							goodsType: goodsInfo.goodsType,
@@ -786,6 +810,8 @@
 							showTousseName: goodsInfo.showTousseName,
 							idCardUseAmount: goodsInfo.idCardUseAmount,
 							packageType: '',
+							settleAccountDeptCodeUseRecord : settleAccountDeptCodeUseRecord,
+							settleAccountDeptNameUseRecord: settleAccountDeptNameUseRecord,
 							validUntil: goodsInfo.validUntil,
 							tousseType: goodsInfo.tousseType,
 							goodsType: goodsInfo.goodsType,
@@ -1890,8 +1916,23 @@
 		text: '保存',
 		hidden: id ? (fromDepartmentUseRecord ? SSTS_DepartmentUseRecord_Update : SSTS_UseRecord_Update) : (fromDepartmentUseRecord ? SSTS_DepartmentUseRecord_Create : SSTS_UseRecord_Create),
 		handler: function () {
-			top.Ext.getCmp("audited").setValue("");
-			doctorHavePermissionToUseTousse(this, useRecordWin, id, false, false, null, 1);
+			if(sstsConfig.enableTheSettlementDepartmentIsDepartOfPatientFunction){
+				if(top.Ext.getCmp('departNameOfpatient')){
+					var departNameOfpatient = top.Ext.getCmp('departNameOfpatient').getRawValue()
+					var that = this;
+					if(departNameOfpatient == ''){
+						top.Ext.MessageBox.confirm("请确认", '未填写“病人所在科室”，结算科室将按照XXXX进行结算，是否继续？',function (button, text) {
+							if ("yes" == button) {
+								top.Ext.getCmp("audited").setValue("");
+								doctorHavePermissionToUseTousse(that, useRecordWin, id, false, false, null, 1);
+							}
+						});
+					}
+				}
+			}else {
+				top.Ext.getCmp("audited").setValue("");
+				doctorHavePermissionToUseTousse(this, useRecordWin, id, false, false, null, 1);
+			}
 		}
 	};
 	var saveAndNewBtn = {
@@ -2128,11 +2169,41 @@
 		)
 	});
 
-	var tousseCm = new Ext.grid.ColumnModel([sm,
+	var tousseCm = new top.Ext.grid.ColumnModel([sm,
 		{ id: 'id', dataIndex: 'id', hidden: true },
 		{ header: "条码", dataIndex: 'barcode', width: 60, menuDisabled: true, renderer: renderTousseInstanceInfoShowFun },
 		{ header: "name", dataIndex: 'tousseDefinitionName', hidden: true, menuDisabled: true },
-		{ header: "名称", dataIndex: 'showTousseName', width: 150, menuDisabled: true, renderer: renderTousseInstanceNameForUrgent },
+		{ header: "名称", dataIndex: 'showTousseName', width: 100, menuDisabled: true, renderer: renderTousseInstanceNameForUrgent },
+		{
+			header: '结算科室',dataIndex: 'settleAccountDeptNameUseRecord', width: 100, hidden: (!sstsConfig.enableTheSettlementDepartmentIsDepartOfPatientFunction),
+			editor: new top.Ext.form.ComboBox({
+				xtype: 'combo',
+				valueField: 'name',
+				displayField: 'name',
+				queryParam: 'spell',
+				minChars: 0,
+				store: departJsonStore,
+				forceSelection: false,
+				lazyInit: true,
+				disabled:SSTS_UseRecord_Update,
+				triggerAction: 'all',
+				typeAhead: false,
+				allowBlank: true,
+				pageSize: 25,
+				listWidth:300,
+				anchor: '96%',
+				listeners:{
+					select: function (combo, record, index) {
+						var records = top.Ext.getCmp('tousseInstanceGrid').getSelectionModel().getSelections();
+						if(records[0]){
+							records[0].set('settleAccountDeptNameUseRecord',record.data.name)
+							records[0].set('settleAccountDeptCodeUseRecord',record.data.id)
+						}
+					}
+				}
+			}),
+			menuDisabled: true
+		},
 		{ header: "使用次数", dataIndex: 'idCardUseAmount', width: 50, hidden: sstsConfig.disableIdCard },
 		{
 			header: '加急', width: 60, hidden: (!sstsConfig.enableUrgentFunction),
@@ -3163,7 +3234,6 @@
 				store: useItemsStore,
 				cm: tousseCm,
 				width: tousseInstanceGridWidth,
-				autoExpandColumn: 'delAction',
 				frame: false,
 				viewConfig: {
 					forceFit: true,
Index: ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/config.js
===================================================================
diff -u -r34829 -r34832
--- ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/config.js	(.../config.js)	(revision 34829)
+++ ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/config.js	(.../config.js)	(revision 34832)
@@ -284,6 +284,8 @@
  colorChangeRuleOfInvoicPlanToSendGoodsList:2,
  //回收时是否显示普通器械包的植入物使用情况
  enableDisplaysTheImplantUsageOfTheTousseInRecycling:true,
+ //启用结算科室为病人所在科室
+ enableTheSettlementDepartmentIsDepartOfPatientFunction:true,
  //启用器械包进度条
  enableTousseStatusProgressBar:true
 }
\ No newline at end of file