Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js
===================================================================
diff -u -r33274 -r34875
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js	(.../useRecordView.js)	(revision 33274)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js	(.../useRecordView.js)	(revision 34875)
@@ -19,6 +19,7 @@
 		method: 'POST'
 	}),
 	reader: new Ext.data.JsonReader({
+		totalProperty: 'totalCount',
 		root: 'data'
 	},
 		[{ name: 'id', mapping: 'id' }, { name: 'name', mapping: 'name' }])
Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
===================================================================
diff -u -r34833 -r34875
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 34833)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 34875)
@@ -1831,7 +1831,31 @@
 }
 
 //GYEY-776：判断“手术医生”是否有权限使用
-function doctorHavePermissionToUseTousse(that, useRecordWin, id, createNew, includeReview, reviewUseRecordForm, btnType) {
+function doctorHavePermissionToUseTousse(that, useRecordWin, id, createNew, includeReview, reviewUseRecordForm, btnType,isEmpty) {
+	if(sstsConfig.enableTheSettlementDepartmentIsDepartOfPatientFunction){
+		if(!isEmpty){
+			var tousseInstanceGrid = top.Ext.getCmp("tousseInstanceGrid");
+			var isNull = false;
+			for (var i = 0; i < tousseInstanceGrid.getStore().getCount(); i++) {
+				var record = tousseInstanceGrid.getStore().getAt(i);
+				var settleAccountDeptNameUseRecord = record.get('settleAccountDeptNameUseRecord') || '';
+				if (settleAccountDeptNameUseRecord == '') {
+					isNull = true;
+					break;
+				}
+			}
+			if(isNull){
+				top.Ext.MessageBox.confirm("请确认", '存在器械包的结算科室的值为空，将按照当前科室进行结算，是否继续？',function (button, text) {
+					if ("yes" == button) {
+						doctorHavePermissionToUseTousse(that, useRecordWin, id, createNew, includeReview, reviewUseRecordForm, btnType, true);
+					}
+				});
+			}else {
+				doctorHavePermissionToUseTousse(that, useRecordWin, id, createNew, includeReview, reviewUseRecordForm, btnType, true);
+			}
+			return;
+		}
+	}
 	if (sstsConfig.enableTousseOfExclusiveDoctorFunction) {
 		var doctorName = top.Ext.getCmp('doctorName').getValue();
 		if (doctorName == '') {
@@ -1916,23 +1940,8 @@
 		text: '保存',
 		hidden: id ? (fromDepartmentUseRecord ? SSTS_DepartmentUseRecord_Update : SSTS_UseRecord_Update) : (fromDepartmentUseRecord ? SSTS_DepartmentUseRecord_Create : SSTS_UseRecord_Create),
 		handler: function () {
-			if(sstsConfig.enableTheSettlementDepartmentIsDepartOfPatientFunction){
-				if(top.Ext.getCmp('departNameOfpatient')){
-					var departNameOfpatient = top.Ext.getCmp('departNameOfpatient').getRawValue()
-					var that = this;
-					if(departNameOfpatient == ''){
-						top.Ext.MessageBox.confirm("请确认", '存在器械包的结算科室的值为空，将按照当前科室进行结算，是否继续？',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);
-			}
+			top.Ext.getCmp("audited").setValue("");
+			doctorHavePermissionToUseTousse(this, useRecordWin, id, false, false, null, 1);
 		}
 	};
 	var saveAndNewBtn = {