Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
===================================================================
diff -u -r41434 -r41458
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 41434)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 41458)
@@ -453,15 +453,15 @@
 							}
 						}
 					} else if(useRecordTiSettlementDepart == '主刀医生核算科室和病人所在科室' && sstsConfig.enableTheSettlementDepartmentIsDepartOfPatientFunction){
-						if(goodsInfo.doctorAccountDepartCode && goodsInfo.doctorAccountDepartCode !== ''){
+						if(goodsInfo.doctorAccountDepart && goodsInfo.doctorAccountDepart !== ''){
 							settleAccountDeptNameUseRecord = goodsInfo.doctorAccountDepart;
 							settleAccountDeptCodeUseRecord = goodsInfo.doctorAccountDepartCode;
 						}else {
 							if (top.Ext.getCmp('doctorAccountDepart')) {
 								settleAccountDeptNameUseRecord = top.Ext.getCmp('doctorAccountDepart').getRawValue() || '';
 								settleAccountDeptCodeUseRecord = top.Ext.getCmp('doctorAccountDepartCode').getValue() || '';
 							}
-							if(settleAccountDeptNameUseRecord == '' || settleAccountDeptCodeUseRecord == ''){
+							if(settleAccountDeptNameUseRecord == ''){
 								if (top.Ext.getCmp('departNameOfpatient')) {
 									settleAccountDeptNameUseRecord = top.Ext.getCmp('departNameOfpatient').getRawValue() || '';
 									settleAccountDeptCodeUseRecord = top.Ext.getCmp('departCodeOfpatient').getValue() || '';
@@ -925,15 +925,15 @@
 							}
 						}
 					} else if(useRecordTiSettlementDepart == '主刀医生核算科室和病人所在科室' && sstsConfig.enableTheSettlementDepartmentIsDepartOfPatientFunction){
-						if(goodsInfo.doctorAccountDepartCode && goodsInfo.doctorAccountDepartCode !== ''){
+						if(goodsInfo.doctorAccountDepart && goodsInfo.doctorAccountDepart !== ''){
 							settleAccountDeptNameUseRecord = goodsInfo.doctorAccountDepart;
 							settleAccountDeptCodeUseRecord = goodsInfo.doctorAccountDepartCode;
 						}else {
 							if (top.Ext.getCmp('doctorAccountDepart')) {
 								settleAccountDeptNameUseRecord = top.Ext.getCmp('doctorAccountDepart').getRawValue() || '';
 								settleAccountDeptCodeUseRecord = top.Ext.getCmp('doctorAccountDepartCode').getValue() || '';
 							}
-							if(settleAccountDeptNameUseRecord == '' || settleAccountDeptCodeUseRecord == ''){
+							if(settleAccountDeptNameUseRecord == ''){
 								if (top.Ext.getCmp('departNameOfpatient')) {
 									settleAccountDeptNameUseRecord = top.Ext.getCmp('departNameOfpatient').getRawValue() || '';
 									settleAccountDeptCodeUseRecord = top.Ext.getCmp('departCodeOfpatient').getValue() || '';
Index: ssts-web/src/main/webapp/buttjoint/useRecord/useRecordViewForm.js
===================================================================
diff -u -r41434 -r41458
--- ssts-web/src/main/webapp/buttjoint/useRecord/useRecordViewForm.js	(.../useRecordViewForm.js)	(revision 41434)
+++ ssts-web/src/main/webapp/buttjoint/useRecord/useRecordViewForm.js	(.../useRecordViewForm.js)	(revision 41458)
@@ -423,15 +423,15 @@
 							}
 						}
 					} else if(useRecordTiSettlementDepart == '主刀医生核算科室和病人所在科室' && sstsConfig.enableTheSettlementDepartmentIsDepartOfPatientFunction){
-						if(goodsInfo.doctorAccountDepartCode && goodsInfo.doctorAccountDepartCode !== ''){
+						if(goodsInfo.doctorAccountDepart && goodsInfo.doctorAccountDepart !== ''){
 							settleAccountDeptNameUseRecord = goodsInfo.doctorAccountDepart;
 							settleAccountDeptCodeUseRecord = goodsInfo.doctorAccountDepartCode;
 						}else {
 							if (top.Ext.getCmp('doctorAccountDepart')) {
 								settleAccountDeptNameUseRecord = top.Ext.getCmp('doctorAccountDepart').getRawValue() || '';
 								settleAccountDeptCodeUseRecord = top.Ext.getCmp('doctorAccountDepartCode').getValue() || '';
 							}
-							if(settleAccountDeptNameUseRecord == '' || settleAccountDeptCodeUseRecord == ''){
+							if(settleAccountDeptNameUseRecord == ''){
 								if (top.Ext.getCmp('departNameOfpatient')) {
 									settleAccountDeptNameUseRecord = top.Ext.getCmp('departNameOfpatient').getRawValue() || '';
 									settleAccountDeptCodeUseRecord = top.Ext.getCmp('departCodeOfpatient').getValue() || '';
Index: ssts-web/src/main/webapp/buttjoint/useRecord/useRecordView.jsp
===================================================================
diff -u -r39615 -r41458
--- ssts-web/src/main/webapp/buttjoint/useRecord/useRecordView.jsp	(.../useRecordView.jsp)	(revision 39615)
+++ ssts-web/src/main/webapp/buttjoint/useRecord/useRecordView.jsp	(.../useRecordView.jsp)	(revision 41458)
@@ -104,9 +104,6 @@
 	<operation:authorize ifAnyGranted="SSTS_UseRecord_OperationRoomAllowBlank">
 		SSTS_UseRecord_OperationRoomAllowBlank = false;
 	</operation:authorize>
-	if(!sstsConfig.enableUseRecordMustFilledInTheOperationRoomFunction){
-		SSTS_UseRecord_OperationRoomAllowBlank = true;
-	} 
 
 	//手术状态：准备手术
 	var OPERATION_STATUS_PRE_OPERATION = '<%=UseRecord.OPERATION_STATUS_PRE_OPERATION %>';
Index: ssts-web/src/main/webapp/buttjoint/useRecord/useRecordForm.js
===================================================================
diff -u -r41456 -r41458
--- ssts-web/src/main/webapp/buttjoint/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 41456)
+++ ssts-web/src/main/webapp/buttjoint/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 41458)
@@ -188,15 +188,15 @@
 									}
 								}
 							}else if(useRecordTiSettlementDepart == '主刀医生核算科室和病人所在科室' && sstsConfig.enableTheSettlementDepartmentIsDepartOfPatientFunction){
-								if(goodsInfo.doctorAccountDepartCode && goodsInfo.doctorAccountDepartCode !== ''){
+								if(goodsInfo.doctorAccountDepart && goodsInfo.doctorAccountDepart !== ''){
 									settleAccountDeptNameUseRecord = goodsInfo.doctorAccountDepart;
 									settleAccountDeptCodeUseRecord = goodsInfo.doctorAccountDepartCode;
 								}else {
 									if (Ext4.getCmp('doctorAccountDepart')) {
 										settleAccountDeptNameUseRecord = Ext4.getCmp('doctorAccountDepart').getRawValue() || '';
 										settleAccountDeptCodeUseRecord = Ext4.getCmp('doctorAccountDepartCode').getValue() || '';
 									}
-									if(settleAccountDeptNameUseRecord == '' || settleAccountDeptCodeUseRecord == ''){
+									if(settleAccountDeptNameUseRecord == ''){
 										if (Ext4.getCmp('departNameOfpatient')) {
 											settleAccountDeptNameUseRecord = Ext4.getCmp('departNameOfpatient').getRawValue() || '';
 											settleAccountDeptCodeUseRecord = Ext4.getCmp('departCodeOfpatient').getValue() || '';
@@ -475,7 +475,12 @@
 		remarkAllowBlank = allowBlankObj.remark;
 	}else {
 		//SZSDSRMYY-208：登记使用记录必须填写手术间
-		operationRoomAllowBlank = SSTS_UseRecord_OperationRoomAllowBlank
+		if(!sstsConfig.enableUseRecordMustFilledInTheOperationRoomFunction){
+			operationRoomAllowBlank = true;
+		}else {
+			operationRoomAllowBlank = SSTS_UseRecord_OperationRoomAllowBlank
+		}
+		
 	}
 
 	//ZJYY-80:使用记录字段别名设置